diff options
| author | Joffrey F <f.joffrey@gmail.com> | 2016-02-23 15:01:32 -0800 |
|---|---|---|
| committer | Joffrey F <f.joffrey@gmail.com> | 2016-02-23 15:01:32 -0800 |
| commit | 7070346516c3afc35cb2a4e86014b1e667cb5b94 (patch) | |
| tree | 296dd796ef8f52b2381524c07b91007105f919a9 | |
| parent | cc450d697ce326eaa1f5b3fa66984005a5f4c613 (diff) | |
| parent | 9ba0ddf267f853afe37441da7798987e199817dd (diff) | |
| download | docker-py-7070346516c3afc35cb2a4e86014b1e667cb5b94.tar.gz | |
Merge pull request #950 from aanand/fix-tls
Fix TLS regressions
| -rw-r--r-- | docker/tls.py | 9 | ||||
| -rw-r--r-- | docker/utils/utils.py | 2 | ||||
| -rw-r--r-- | tests/unit/utils_test.py | 4 |
3 files changed, 9 insertions, 6 deletions
diff --git a/docker/tls.py b/docker/tls.py index 01573a6..83b0ff7 100644 --- a/docker/tls.py +++ b/docker/tls.py @@ -54,10 +54,15 @@ class TLSConfig(object): 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 index 61e5a8d..6fcf037 100644 --- 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 index a0a96bb..87796d1 100644 --- a/tests/unit/utils_test.py +++ b/tests/unit/utils_test.py @@ -194,7 +194,7 @@ class KwargsFromEnvTest(base.BaseTestCase): 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 @@ class KwargsFromEnvTest(base.BaseTestCase): 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 @@ class KwargsFromEnvTest(base.BaseTestCase): 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: |