diff options
| author | Joffrey F <joffrey@docker.com> | 2018-11-01 14:57:29 -0700 |
|---|---|---|
| committer | Joffrey F <joffrey@docker.com> | 2018-11-01 15:44:43 -0700 |
| commit | f302756599a61d6775fbdf2beab8f1de7e0022c4 (patch) | |
| tree | 306d5ed162f68fc86cd6acb9a78043b830787cdd /docker/transport/sshconn.py | |
| parent | 6bfe2005e0a700621c094a01b42db39e7c6408de (diff) | |
| download | docker-py-ssh_protocol_support.tar.gz | |
Rewrite utils.parse_host to detect more invalid addresses.ssh_protocol_support
The method now uses parsing methods from urllib to better split provided URLs.
Addresses containing query strings, parameters, passwords or fragments no longer fail silently.
SSH addresses containing paths are no longer accepted.
Signed-off-by: Joffrey F <joffrey@docker.com>
Diffstat (limited to 'docker/transport/sshconn.py')
| -rw-r--r-- | docker/transport/sshconn.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/docker/transport/sshconn.py b/docker/transport/sshconn.py index 6c9c119..0f6bb51 100644 --- a/docker/transport/sshconn.py +++ b/docker/transport/sshconn.py @@ -1,10 +1,7 @@ -import urllib.parse - import paramiko import requests.adapters import six - from .. import constants if six.PY3: @@ -82,7 +79,7 @@ class SSHAdapter(requests.adapters.HTTPAdapter): self.ssh_client = paramiko.SSHClient() self.ssh_client.load_system_host_keys() - parsed = urllib.parse.urlparse(base_url) + parsed = six.moves.urllib_parse.urlparse(base_url) self.ssh_client.connect( parsed.hostname, parsed.port, parsed.username, ) |