docker
/
docker-py
mirror of https://github.com/docker/docker-py.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add assert_fingerprint option. 

Signed-off-by: dlorenc <lorenc.d@gmail.com>
This commit is contained in:
dlorenc 2015-03-19 11:43:05 -07:00
parent 01654eee68
commit 47f3ff1679
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docker/ssladapter/ssladapter.py
View File

@ -25,10 +25,12 @@ def get_max_tls_protocol():
class SSLAdapter(HTTPAdapter): class SSLAdapter(HTTPAdapter):
'''An HTTPS Transport Adapter that uses an arbitrary SSL version.''' '''An HTTPS Transport Adapter that uses an arbitrary SSL version.'''
def __init__(self, ssl_version=None, assert_hostname=None, **kwargs): def __init__(self, ssl_version=None, assert_hostname=None,
assert_fingerprint=None, **kwargs):
ssl_version = ssl_version or get_max_tls_protocol() ssl_version = ssl_version or get_max_tls_protocol()
self.ssl_version = ssl_version self.ssl_version = ssl_version
self.assert_hostname = assert_hostname self.assert_hostname = assert_hostname
self.assert_fingerprint = assert_fingerprint
super(SSLAdapter, self).__init__(**kwargs) super(SSLAdapter, self).__init__(**kwargs)
def init_poolmanager(self, connections, maxsize, block=False): def init_poolmanager(self, connections, maxsize, block=False):
@ -37,6 +39,7 @@ class SSLAdapter(HTTPAdapter):
'maxsize': maxsize, 'maxsize': maxsize,
'block': block, 'block': block,
'assert_hostname': self.assert_hostname, 'assert_hostname': self.assert_hostname,
'assert_fingerprint': self.assert_fingerprint,
} }
if self.can_override_ssl_version(): if self.can_override_ssl_version():
kwargs['ssl_version'] = self.ssl_version kwargs['ssl_version'] = self.ssl_version

5
docker/tls.py
View File

@ -10,7 +10,8 @@ class TLSConfig(object):
ssl_version = None ssl_version = None
def __init__(self, client_cert=None, ca_cert=None, verify=None, def __init__(self, client_cert=None, ca_cert=None, verify=None,
ssl_version=None, assert_hostname=None): ssl_version=None, assert_hostname=None,
assert_fingerprint=None):
# Argument compatibility/mapping with # Argument compatibility/mapping with
# http://docs.docker.com/examples/https/ # http://docs.docker.com/examples/https/
# This diverges from the Docker CLI in that users can specify 'tls' # This diverges from the Docker CLI in that users can specify 'tls'
@ -24,6 +25,7 @@ class TLSConfig(object):
ssl_version = ssl_version or ssladapter.get_max_tls_protocol() ssl_version = ssl_version or ssladapter.get_max_tls_protocol()
self.ssl_version = ssl_version self.ssl_version = ssl_version
self.assert_hostname = assert_hostname self.assert_hostname = assert_hostname
self.assert_fingerprint = assert_fingerprint
# "tls" and "tls_verify" must have both or neither cert/key files # "tls" and "tls_verify" must have both or neither cert/key files
# In either case, Alert the user when both are expected, but any are # In either case, Alert the user when both are expected, but any are
@ -72,4 +74,5 @@ class TLSConfig(object):
client.mount('https://', ssladapter.SSLAdapter( client.mount('https://', ssladapter.SSLAdapter(
ssl_version=self.ssl_version, ssl_version=self.ssl_version,
assert_hostname=self.assert_hostname, assert_hostname=self.assert_hostname,
assert_fingerprint=self.assert_fingerprint,
)) ))