Add certFile and certKeyFile to SoapStubAdapter

ddraganov · ddraganov · commit 2bbfb6262caf · 2024-04-05T13:34:54.000+03:00
SoapStubAdapter uses the schemeArgs dictionary to pass HTTPConnection and HTTPSConnection parameters around.
However, with the planned Python 3.12 changes, some parameters will no longer be supported.
This changes adds certFile and certKeyFile as SoapStubAdapter class attributes and updates the current consumers.
diff --git a/pyVim/connect.py b/pyVim/connect.py
@@ -1,5 +1,7 @@
 #############################################################
-# Copyright (c) 2005-2024 VMware, Inc.  All rights reserved.
+# Copyright (c) 2005-2024 Broadcom. All Rights Reserved.
+# The term "Broadcom" refers to Broadcom Inc.
+# and/or its subsidiaries.
 #############################################################
 
 # @file connect.py
@@ -132,8 +134,8 @@ def makeCertHokTokenLoginMethod(stsUrl, stsCert=None, ssl_context=None):
 
         def _doLogin(soapStub):
             from . import sso
-            cert = soapStub.schemeArgs['cert_file']
-            key = soapStub.schemeArgs['key_file']
+            cert = soapStub.certFile
+            key = soapStub.certKeyFile
             authenticator = sso.SsoAuthenticator(sts_url=stsUrl,
                                                  sts_cert=stsCert)
 
@@ -177,8 +179,8 @@ def makeCredBearerTokenLoginMethod(username,
 
         def _doLogin(soapStub):
             from . import sso
-            cert = soapStub.schemeArgs['cert_file']
-            key = soapStub.schemeArgs['key_file']
+            cert = soapStub.certFile
+            key = soapStub.certKeyFile
             authenticator = sso.SsoAuthenticator(sts_url=stsUrl,
                                                  sts_cert=stsCert)
             samlAssertion = authenticator.get_bearer_saml_assertion(
diff --git a/pyVmomi/SoapAdapter.py b/pyVmomi/SoapAdapter.py
@@ -1478,6 +1478,8 @@ def __init__(self,
         self.pool = []
         self.connectionPoolTimeout = connectionPoolTimeout
         self.lock = threading.Lock()
+        self.certFile = certFile
+        self.certKeyFile = certKeyFile
         self.schemeArgs = {}
         if sslContext:
             self.schemeArgs['context'] = sslContext
