From f302756599a61d6775fbdf2beab8f1de7e0022c4 Mon Sep 17 00:00:00 2001 From: Joffrey F Date: Thu, 1 Nov 2018 14:57:29 -0700 Subject: Rewrite utils.parse_host to detect more invalid addresses. 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 --- docker/transport/sshconn.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'docker/transport/sshconn.py') 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, ) -- cgit v1.2.1