external-systems 0.102.0__tar.gz → 0.103.0rc2__tar.gz

{external_systems-0.102.0 → external_systems-0.103.0rc2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: external-systems
-Version: 0.102.0
+Version: 0.103.0rc2
 Summary: A Python library for interacting with Foundry Sources
 License: Apache-2.0
 Keywords: Palantir,Foundry,Sources,Compute Modules,Python Functions,Transforms

{external_systems-0.102.0 → external_systems-0.103.0rc2}/external_systems/_version.py

@@ -16,4 +16,4 @@
 # The version is set during the publishing step (since we can't know the version in advance)
 # using the autorelease bot
 
-__version__ = "0.102.0"
+__version__ = "0.103.0-rc2"

{external_systems-0.102.0 → external_systems-0.103.0rc2}/external_systems/sources/_sources.py

@@ -29,7 +29,6 @@ from ._connections import HttpsConnection
 from ._proxies import create_proxy_session
 from ._refreshable import DefaultSessionCredentialsManager, Refreshable, RefreshHandler
 from ._sockets import create_socket
-from ._utils import read_file
 
 log = logging.getLogger(__name__)
 
@@ -82,24 +81,49 @@ class Source:
 
     @cached_property
     def _ca_bundle_path(self) -> Optional[str]:
-        if self._source_parameters.server_certificates is None:
-            return None
+        """
+        Returns the path to the CA bundle file with all custom CA certificates defined in the Source.
 
-        new_ca_contents = []
+        Precedence of which CA bundle to use:
+        1. Custom CA bundle path (if provided assumes PEM format)
+        2. Requests CA bundle path
+        3. Temporary file
+        """
 
-        # If a custom CA bundle path is provided, use it.
-        # Otherwise, use the requests CA bundle path if it is set.
-        ca_bundle_path = (
-            self._custom_ca_bundle_path
-            if self._custom_ca_bundle_path is not None
-            else os.environ.get("REQUESTS_CA_BUNDLE")
-        )
+        provided_ca_bundle_path = self._custom_ca_bundle_path or os.environ.get("REQUESTS_CA_BUNDLE")
+
+        if not self._source_parameters.server_certificates:
+            return provided_ca_bundle_path
 
-        # Copy the CA bundle contents to the new CA bundle file.
-        if ca_bundle_path:
-            new_ca_contents.append(read_file(ca_bundle_path))
+        # Certificates from the Source to add to the CA bundle
+        server_certificates = list(self._source_parameters.server_certificates.values())
+
+        # If no provided CA bundle path, create a temporary file with only the server certificates
+        if not provided_ca_bundle_path:
+            with NamedTemporaryFile(delete=False, mode="w") as ca_bundle_file:
+                ca_bundle_file.write(os.linesep.join(server_certificates) + os.linesep)
+                return ca_bundle_file.name
+
+        # See https://docs.python.org/3/library/os.html#os.access for why we don't use os.access
+        # First try appending the server certificates to the provided CA bundle path
+        try:
+            with open(provided_ca_bundle_path, "a") as provided_ca_bundle_file:
+                provided_ca_bundle_file.write(os.linesep.join(server_certificates) + os.linesep)
+                return provided_ca_bundle_path
+        except PermissionError:
+            log.warning("PermissionError when writing to provided CA bundle path, falling back to temporary file.")
+
+        # Second try reading the provided CA bundle path and appending all content to the new CA bundle
+        new_ca_contents = []
+        try:
+            with open(provided_ca_bundle_path) as provided_ca_bundle_file:
+                new_ca_contents.append(provided_ca_bundle_file.read())
+        except PermissionError:
+            log.warning(
+                "PermissionError when reading from provided CA bundle path, falling back to temporary file with only the Source defined certificates."
+            )
 
-        # Add all CAs for the source
+        # Finally, if no permissions to read or write to the provided CA bundle path, create a temporary file with only the Source defined certificates
         for required_ca in self._source_parameters.server_certificates.values():
             new_ca_contents.append(required_ca)
 

{external_systems-0.102.0 → external_systems-0.103.0rc2}/external_systems/sources/_utils.py

@@ -23,8 +23,3 @@ def has_expiration_property(source_credentials: SourceCredentials) -> bool:
     """
 
     return hasattr(source_credentials, "expiration")
-
-
-def read_file(path: str) -> str:
-    with open(path) as file:
-        return file.read()

{external_systems-0.102.0 → external_systems-0.103.0rc2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "external-systems"
-version = "0.102.0"
+version = "0.103.0-rc2"
 description = "A Python library for interacting with Foundry Sources"
 authors = ["Palantir Technologies, Inc."]
 license = "Apache-2.0"