add support for certificate pinning

jgarman · jgarman · commit c949ec63170c · 2017-08-28T17:12:02.000-04:00
diff --git a/src/cbapi/auth.py b/src/cbapi/auth.py
@@ -72,7 +72,7 @@ def get_credentials(self, profile=None):
 
         retval = {}
         for k, v in six.iteritems(default_profile):
-                retval[k] = self.credentials.get(credential_profile, k)
+            retval[k] = self.credentials.get(credential_profile, k)
 
         if not retval["url"] or not retval["token"]:
             raise CredentialError("Token and/or URL not available for profile %s" % credential_profile)
diff --git a/src/cbapi/connection.py b/src/cbapi/connection.py
@@ -94,6 +94,9 @@ def __init__(self, credentials, integration_name=None, timeout=None, max_retries
                 requests.packages.urllib3.disable_warnings(InsecureRequestWarning)
             except Exception:
                 pass
+        else:
+            if credentials.ssl_cert_file:
+                self.ssl_verify = credentials.ssl_cert_file
 
         user_agent = "cbapi/{0:s} Python/{1:d}.{2:d}.{3:d}".format(__version__,
                              sys.version_info[0], sys.version_info[1], sys.version_info[2])
@@ -150,7 +153,8 @@ def http_request(self, method, url, **kwargs):
             raw_data = kwargs.get("data", None)
             if raw_data:
                 log.debug("Sending HTTP {0} {1} with {2}".format(method, url, raw_data))
-            r = self.session.request(method, uri, headers=headers, verify=verify_ssl, proxies=proxies, timeout=self._timeout, **kwargs)
+            r = self.session.request(method, uri, headers=headers, verify=verify_ssl, proxies=proxies,
+                                     timeout=self._timeout, **kwargs)
             log.debug('HTTP {0:s} {1:s} took {2:.3f}s (response {3:d})'.format(method, url,
                                                                                calculate_elapsed_time(r.elapsed),
                                                                                r.status_code))
