Fix regression caused by transport.TLS not being set to True on the t…

…lsmemorybios transport (#77)
michael-lazar · Oct 16, 2023 · cfeb17e · cfeb17e
1 parent 8282cac
commit cfeb17e
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 ### Unreleased
 
+### v0.10.1 (2023-10-16)
+
+#### Fixes
+
+- Fixed regression that prevented TLS client certificates and other
+  TLS environment variables from being initialized.
+
 ### v0.10.0 (2023-10-15)
 
 #### Features

diff --git a/jetforce/__version__.py b/jetforce/__version__.py
@@ -1 +1 @@
-__version__ = "0.10.0"
+__version__ = "0.10.1"
diff --git a/jetforce/protocol.py b/jetforce/protocol.py
@@ -215,7 +215,12 @@ def build_environ(self) -> EnvironDict:
             "SERVER_PROTOCOL": "GEMINI",
             "SERVER_SOFTWARE": f"jetforce/{__version__}",
         }
-        if not self.transport.TLS:
+
+        try:
+            cert = self.transport.getPeerCertificate()
+        except AttributeError:
+            # We're not using a TLS-enabled transport, we can skip
+            # all of the TLS environment initialization below.
             return environ
 
         conn = self.transport.getHandle()
@@ -230,7 +235,6 @@ def build_environ(self) -> EnvironDict:
             }
         )
 
-        cert = self.transport.getPeerCertificate()
         if cert:
             x509_cert = cert.to_cryptography()
             cert_data = inspect_certificate(x509_cert)

diff --git a/setup.py b/setup.py
@@ -10,7 +10,7 @@ def long_description() -> str:
 
 setuptools.setup(
     name="Jetforce",
-    version="0.10.0",
+    version="0.10.1",
     url="https://github.com/michael-lazar/jetforce",
     license="Other/Proprietary License",
     author="Michael Lazar",