Merge all changes from pre-3.0 develop branch

Author: Ickerday

.github/dependabot.yaml

@@ -8,4 +8,4 @@ updates:
   - package-ecosystem: "uv"
     directory: "/"
     schedule:
-      interval: "weekly"
+      interval: "weekly"

.github/workflows/release.yml

@@ -21,6 +21,7 @@ jobs:
           deps-group: release
       - name: Build packages for distribution
         run: uv build
+        run: uv build
       - name: Publish packages to PyPI
         uses: pypa/gh-action-pypi-publish@cef221092ed1bacb1cc03d23a2d87d1d172e277b
         with:

docs/conf.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-#
 # Splunk SDK for Python documentation build configuration file, created by
 # sphinx-quickstart on Fri Apr 13 12:28:15 2012.
 #

sitecustomize.py

@@ -1,6 +1,4 @@
-#!/usr/bin/env python
-#
-# Copyright © 2011-2024 Splunk, Inc.
+# Copyright © 2011-2026 Splunk, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"): you may
 # not use this file except in compliance with the License. You may obtain

splunklib/__init__.py

@@ -1,4 +1,4 @@
-# Copyright © 2011-2024 Splunk, Inc.
+# Copyright © 2011-2026 Splunk, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"): you may
 # not use this file except in compliance with the License. You may obtain

splunklib/binding.py

@@ -1,4 +1,4 @@
-# Copyright © 2011-2024 Splunk, Inc.
+# Copyright © 2011-2026 Splunk, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"): you may
 # not use this file except in compliance with the License. You may obtain
@@ -862,6 +862,158 @@ def post(
         response = self.http.post(path, all_headers, **query)
         return response
 
+    @_authentication
+    @_log_duration
+    def put(
+        self,
+        path_segment,
+        owner=None,
+        app=None,
+        sharing=None,
+        headers=None,
+        **query,
+    ):
+        """Performs a PUT operation from the REST path segment with the given object,
+        namespace and query.
+
+        This method is named to match the HTTP method. ``put`` makes at least
+        one round trip to the server, one additional round trip for each 303
+        status returned, and at most two additional round trips if
+        the ``autologin`` field of :func:`connect` is set to ``True``.
+
+        If *owner*, *app*, and *sharing* are omitted, this method uses the
+        default :class:`Context` namespace. All other keyword arguments are
+        included in the URL as query parameters.
+
+        If you provide a ``body`` argument to ``put``, it will be used as the PUT body,
+        and all other keyword arguments will be passed as GET-style arguments in the URL.
+
+        :raises AuthenticationError: Raised when the ``Context`` object is not
+             logged in.
+        :raises HTTPError: Raised when an error occurred in a PUT operation from
+             *path_segment*.
+        :param path_segment: A REST path segment.
+        :type path_segment: ``string``
+        :param owner: The owner context of the namespace (optional).
+        :type owner: ``string``
+        :param app: The app context of the namespace (optional).
+        :type app: ``string``
+        :param sharing: The sharing mode of the namespace (optional).
+        :type sharing: ``string``
+        :param headers: List of extra HTTP headers to send (optional).
+        :type headers: ``list`` of 2-tuples.
+        :param query: All other keyword arguments, which are used as query
+            parameters.
+        :param body: Parameters to be used in the put body. If specified,
+            any parameters in the query will be applied to the URL instead of
+            the body. If a dict is supplied, the key-value pairs will be form
+            encoded. If a string is supplied, the body will be passed through
+            in the request unchanged.
+        :type body: ``dict`` or ``str``
+        :return: The response from the server.
+        :rtype: ``dict`` with keys ``body``, ``headers``, ``reason``,
+                and ``status``
+
+        **Example**::
+
+            c = binding.connect(...)
+            # Call an HTTP endpoint, exposed as Custom Rest Endpoint in a Splunk App.
+            # PUT /servicesNS/-/app_name/custom_rest_endpoint
+            c.put(
+                 app="app_name",
+                 path_segment="custom_rest_endpoint",
+                 body=json.dumps({"key": "val"}),
+                 headers=[("Content-Type", "application/json")],
+            )
+        """
+        if headers is None:
+            headers = []
+
+        path = self.authority + self._abspath(
+            path_segment, owner=owner, app=app, sharing=sharing
+        )
+
+        logger.debug("PUT request to %s (body: %s)", path, mask_sensitive_data(query))
+        all_headers = headers + self.additional_headers + self._auth_headers
+        response = self.http.put(path, all_headers, **query)
+        return response
+
+    @_authentication
+    @_log_duration
+    def patch(
+        self,
+        path_segment,
+        owner=None,
+        app=None,
+        sharing=None,
+        headers=None,
+        **query,
+    ):
+        """Performs a PATCH operation from the REST path segment with the given object,
+        namespace and query.
+
+        This method is named to match the HTTP method. ``patch`` makes at least
+        one round trip to the server, one additional round trip for each 303
+        status returned, and at most two additional round trips if
+        the ``autologin`` field of :func:`connect` is set to ``True``.
+
+        If *owner*, *app*, and *sharing* are omitted, this method uses the
+        default :class:`Context` namespace. All other keyword arguments are
+        included in the URL as query parameters.
+
+        If you provide a ``body`` argument to ``patch``, it will be used as the PATCH body,
+        and all other keyword arguments will be passed as GET-style arguments in the URL.
+
+        :raises AuthenticationError: Raised when the ``Context`` object is not
+             logged in.
+        :raises HTTPError: Raised when an error occurred in a PATCH operation from
+             *path_segment*.
+        :param path_segment: A REST path segment.
+        :type path_segment: ``string``
+        :param owner: The owner context of the namespace (optional).
+        :type owner: ``string``
+        :param app: The app context of the namespace (optional).
+        :type app: ``string``
+        :param sharing: The sharing mode of the namespace (optional).
+        :type sharing: ``string``
+        :param headers: List of extra HTTP headers to send (optional).
+        :type headers: ``list`` of 2-tuples.
+        :param query: All other keyword arguments, which are used as query
+            parameters.
+        :param body: Parameters to be used in the patch body. If specified,
+            any parameters in the query will be applied to the URL instead of
+            the body. If a dict is supplied, the key-value pairs will be form
+            encoded. If a string is supplied, the body will be passed through
+            in the request unchanged.
+        :type body: ``dict`` or ``str``
+        :return: The response from the server.
+        :rtype: ``dict`` with keys ``body``, ``headers``, ``reason``,
+                and ``status``
+
+        **Example**::
+
+            c = binding.connect(...)
+            # Call an HTTP endpoint, exposed as Custom Rest Endpoint in a Splunk App.
+            # PATCH /servicesNS/-/app_name/custom_rest_endpoint
+            c.patch(
+                 app="app_name",
+                 path_segment="custom_rest_endpoint",
+                 body=json.dumps({"key": "val"}),
+                 headers=[("Content-Type", "application/json")],
+            )
+        """
+        if headers is None:
+            headers = []
+
+        path = self.authority + self._abspath(
+            path_segment, owner=owner, app=app, sharing=sharing
+        )
+
+        logger.debug("PATCH request to %s (body: %s)", path, mask_sensitive_data(query))
+        all_headers = headers + self.additional_headers + self._auth_headers
+        response = self.http.patch(path, all_headers, **query)
+        return response
+
     @_authentication
     @_log_duration
     def request(
@@ -1305,6 +1457,40 @@ def __init__(
         self.retries = retries
         self.retryDelay = retryDelay
 
+    def _prepare_request_body_and_url(self, url, headers, **kwargs):
+        """Helper function to prepare the request body and URL.
+
+        :param url: The URL.
+        :type url: ``string``
+        :param headers: A list of pairs specifying the headers for the HTTP request.
+        :type headers: ``list``
+        :param kwargs: Additional keyword arguments (optional).
+        :type kwargs: ``dict``
+        :returns: A tuple containing the updated URL, headers, and body.
+        :rtype: ``tuple``
+        """
+        if headers is None:
+            headers = []
+
+        # We handle GET-style arguments and an unstructured body. This is here
+        # to support the receivers/stream endpoint.
+        if "body" in kwargs:
+            # We only use application/x-www-form-urlencoded if there is no other
+            # Content-Type header present. This can happen in cases where we
+            # send requests as application/json, e.g. for KV Store.
+            if len([x for x in headers if x[0].lower() == "content-type"]) == 0:
+                headers.append(("Content-Type", "application/x-www-form-urlencoded"))
+
+            body = kwargs.pop("body")
+            if isinstance(body, dict):
+                body = _encode(**body).encode("utf-8")
+            if len(kwargs) > 0:
+                url = url + UrlEncoded("?" + _encode(**kwargs), skip_encode=True)
+        else:
+            body = _encode(**kwargs).encode("utf-8")
+
+        return url, headers, body
+
     def delete(self, url, headers=None, **kwargs):
         """Sends a DELETE request to a URL.
 
@@ -1379,26 +1565,52 @@ def post(self, url, headers=None, **kwargs):
             its structure).
         :rtype: ``dict``
         """
-        if headers is None:
-            headers = []
+        url, headers, body = self._prepare_request_body_and_url(url, headers, **kwargs)
+        message = {"method": "POST", "headers": headers, "body": body}
+        return self.request(url, message)
 
-        # We handle GET-style arguments and an unstructured body. This is here
-        # to support the receivers/stream endpoint.
-        if "body" in kwargs:
-            # We only use application/x-www-form-urlencoded if there is no other
-            # Content-Type header present. This can happen in cases where we
-            # send requests as application/json, e.g. for KV Store.
-            if len([x for x in headers if x[0].lower() == "content-type"]) == 0:
-                headers.append(("Content-Type", "application/x-www-form-urlencoded"))
+    def put(self, url, headers=None, **kwargs):
+        """Sends a PUT request to a URL.
 
-            body = kwargs.pop("body")
-            if isinstance(body, dict):
-                body = _encode(**body).encode("utf-8")
-            if len(kwargs) > 0:
-                url = url + UrlEncoded("?" + _encode(**kwargs), skip_encode=True)
-        else:
-            body = _encode(**kwargs).encode("utf-8")
-        message = {"method": "POST", "headers": headers, "body": body}
+        :param url: The URL.
+        :type url: ``string``
+        :param headers: A list of pairs specifying the headers for the HTTP
+            response (for example, ``[('Content-Type': 'text/cthulhu'), ('Token': 'boris')]``).
+        :type headers: ``list``
+        :param kwargs: Additional keyword arguments (optional). If the argument
+            is ``body``, the value is used as the body for the request, and the
+            keywords and their arguments will be URL encoded. If there is no
+            ``body`` keyword argument, all the keyword arguments are encoded
+            into the body of the request in the format ``x-www-form-urlencoded``.
+        :type kwargs: ``dict``
+        :returns: A dictionary describing the response (see :class:`HttpLib` for
+            its structure).
+        :rtype: ``dict``
+        """
+        url, headers, body = self._prepare_request_body_and_url(url, headers, **kwargs)
+        message = {"method": "PUT", "headers": headers, "body": body}
+        return self.request(url, message)
+
+    def patch(self, url, headers=None, **kwargs):
+        """Sends a PATCH request to a URL.
+
+        :param url: The URL.
+        :type url: ``string``
+        :param headers: A list of pairs specifying the headers for the HTTP
+            response (for example, ``[('Content-Type': 'text/cthulhu'), ('Token': 'boris')]``).
+        :type headers: ``list``
+        :param kwargs: Additional keyword arguments (optional). If the argument
+            is ``body``, the value is used as the body for the request, and the
+            keywords and their arguments will be URL encoded. If there is no
+            ``body`` keyword argument, all the keyword arguments are encoded
+            into the body of the request in the format ``x-www-form-urlencoded``.
+        :type kwargs: ``dict``
+        :returns: A dictionary describing the response (see :class:`HttpLib` for
+            its structure).
+        :rtype: ``dict``
+        """
+        url, headers, body = self._prepare_request_body_and_url(url, headers, **kwargs)
+        message = {"method": "PATCH", "headers": headers, "body": body}
         return self.request(url, message)
 
     def request(self, url, message, **kwargs):
@@ -1550,7 +1762,21 @@ def connect(scheme, host, port):
                 kwargs["cert_file"] = cert_file
 
             if not verify:
-                kwargs["context"] = ssl._create_unverified_context()  # nosemgrep
+                ctx = ssl._create_unverified_context()  # nosemgrep
+                # Support all ML-KEM key exchange algorithms, by default OpenSSL only
+                # includes the X25519MLKEM768 from all of the below listed MLKEM key
+                # exchanges.
+                #
+                # set_groups method is only available with Python 3.15, but Splunk comes
+                # with patched python that includes set_groups on 3.9 and 3.13, thus we
+                # check for the existence of set_groups, not the python version.
+                if hasattr(ctx, "set_groups"):
+                    ctx.set_groups(  # pyright: ignore[reportUnknownMemberType, reportAttributeAccessIssue]
+                        "X25519MLKEM768:SecP256r1MLKEM768:SecP384r1MLKEM1024:"
+                        + "MLKEM512:MLKEM768:MLKEM1024:"
+                        + "X25519:secp256r1:X448:secp384r1:secp521r1:ffdhe2048:ffdhe3072"
+                    )
+                kwargs["context"] = ctx
             elif context:
                 # verify is True in elif branch and context is not None
                 kwargs["context"] = context