Merge pull request #950 from aanand/fix-tls

Fix TLS regressions
docker · Feb 23, 2016 · 7070346 · 7070346
2 parents cc450d6 + 9ba0ddf
commit 7070346
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/docker/tls.py b/docker/tls.py
@@ -54,10 +54,15 @@ def __init__(self, client_cert=None, ca_cert=None, verify=None,
 
     def configure_client(self, client):
         client.ssl_version = self.ssl_version
-        client.verify = self.verify
-        client.ca_cert = self.ca_cert
+
+        if self.verify and self.ca_cert:
+            client.verify = self.ca_cert
+        else:
+            client.verify = self.verify
+
         if self.cert:
             client.cert = self.cert
+
         client.mount('https://', ssladapter.SSLAdapter(
             ssl_version=self.ssl_version,
             assert_hostname=self.assert_hostname,

diff --git a/docker/utils/utils.py b/docker/utils/utils.py
@@ -489,7 +489,7 @@ def kwargs_from_env(ssl_version=None, assert_hostname=None):
         verify=tls_verify,
         ssl_version=ssl_version,
         assert_hostname=assert_hostname,
-        assert_fingerprint=tls_verify)
+    )
 
     return params
 

diff --git a/tests/unit/utils_test.py b/tests/unit/utils_test.py
@@ -194,7 +194,7 @@ def test_kwargs_from_env_tls(self):
         try:
             client = Client(**kwargs)
             self.assertEqual(kwargs['base_url'], client.base_url)
-            self.assertEqual(kwargs['tls'].verify, client.verify)
+            self.assertEqual(kwargs['tls'].ca_cert, client.verify)
             self.assertEqual(kwargs['tls'].cert, client.cert)
         except TypeError as e:
             self.fail(e)
@@ -213,7 +213,6 @@ def test_kwargs_from_env_tls_verify_false(self):
         try:
             client = Client(**kwargs)
             self.assertEqual(kwargs['base_url'], client.base_url)
-            self.assertEqual(kwargs['tls'].ca_cert, client.ca_cert)
             self.assertEqual(kwargs['tls'].cert, client.cert)
             self.assertFalse(kwargs['tls'].verify)
         except TypeError as e:
@@ -238,7 +237,6 @@ def test_kwargs_from_env_tls_verify_false_no_cert(self):
         try:
             client = Client(**kwargs)
             self.assertEqual(kwargs['base_url'], client.base_url)
-            self.assertEqual(kwargs['tls'].ca_cert, client.ca_cert)
             self.assertEqual(kwargs['tls'].cert, client.cert)
             self.assertFalse(kwargs['tls'].verify)
         except TypeError as e: