Skip to content

4.2.0 release #2506

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Feb 6, 2020
Merged

4.2.0 release #2506

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1e56722
set logging level of paramiko to warn
riedel Apr 14, 2019
bc6777e
set host key policy for ssh transport to WarningPolicy()
riedel Apr 14, 2019
ed9b208
obey Hostname Username Port and ProxyCommand settings from .ssh/config
riedel Apr 14, 2019
a67d180
Fix CI labels so we run on amd64 nodes
ndeloof Oct 14, 2019
61e2d5f
Fix win32pipe.WaitNamedPipe throw exception in windows container.
SLdragon Aug 30, 2019
9b0d07f
Version bump
chris-crone Oct 3, 2019
6c29375
Fix ImageCollectionTest.test_pull_multiple flakiness
thaJeztah Jan 3, 2020
6e44d84
Implement context management, lifecycle and unittests.
Jan 17, 2020
ab56784
Bump 4.2.0
ulyssessouza Feb 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
obey Hostname Username Port and ProxyCommand settings from .ssh/config 
Signed-off-by: Till Riedel <[email protected]>
  • Loading branch information
@riedel @ulyssessouza
riedel authored and ulyssessouza committed Feb 6, 2020
commit ed9b208e156a2685b032d934c02621f54caf7608
33 changes: 27 additions & 6 deletions docker/transport/sshconn.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import requests.adapters
import six
import logging
import os

from docker.transport.basehttpadapter import BaseHTTPAdapter
from .. import constants
Expand Down Expand Up @@ -73,17 +74,40 @@ def _get_conn(self, timeout):
class SSHHTTPAdapter(BaseHTTPAdapter):

__attrs__ = requests.adapters.HTTPAdapter.__attrs__ + [
'pools', 'timeout', 'ssh_client',
'pools', 'timeout', 'ssh_client', 'ssh_params'
]

def __init__(self, base_url, timeout=60,
pool_connections=constants.DEFAULT_NUM_POOLS):
logging.getLogger("paramiko").setLevel(logging.WARNING)
self.ssh_client = paramiko.SSHClient()
base_url = six.moves.urllib_parse.urlparse(base_url)
self.ssh_params = {
"hostname": base_url.hostname,
"port": base_url.port,
"username": base_url.username
}
ssh_config_file = os.path.expanduser("~/.ssh/config")
if os.path.exists(ssh_config_file):
conf = paramiko.SSHConfig()
with open(ssh_config_file) as f:
conf.parse(f)
host_config = conf.lookup(base_url.hostname)
self.ssh_conf = host_config
if 'proxycommand' in host_config:
self.ssh_params["sock"] = paramiko.ProxyCommand(
self.ssh_conf['proxycommand']
)
if 'hostname' in host_config:
self.ssh_params['hostname'] = host_config['hostname']
if base_url.port is None and 'port' in host_config:
self.ssh_params['port'] = self.ssh_conf['port']
if base_url.username is None and 'user' in host_config:
self.ssh_params['username'] = self.ssh_conf['user']

self.ssh_client.load_system_host_keys()
self.ssh_client.set_missing_host_key_policy(paramiko.WarningPolicy())

self.base_url = base_url
self._connect()
self.timeout = timeout
self.pools = RecentlyUsedContainer(
Expand All @@ -92,10 +116,7 @@ def __init__(self, base_url, timeout=60,
super(SSHHTTPAdapter, self).__init__()

def _connect(self):
parsed = six.moves.urllib_parse.urlparse(self.base_url)
self.ssh_client.connect(
parsed.hostname, parsed.port, parsed.username,
)
self.ssh_client.connect(**self.ssh_params)

def get_connection(self, url, proxies=None):
with self.pools.lock:
Expand Down