openstack/tempest
Code Issues Proposed changes

Merge "Prevent SSH client proxy loops"

Browse Source
This commit is contained in:
Zuul 2020-03-13 16:13:32 +00:00 committed by Gerrit Code Review
commit 714c607a36
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tempest/lib/common/ssh.py
View File

@ -75,6 +75,11 @@ class Client(object):
self.channel_timeout = float(channel_timeout) self.channel_timeout = float(channel_timeout)
self.buf_size = 1024 self.buf_size = 1024
self.proxy_client = proxy_client self.proxy_client = proxy_client
if (self.proxy_client and self.proxy_client.host == self.host and
self.proxy_client.port == self.port and
self.proxy_client.username == self.username):
raise exceptions.SSHClientProxyClientLoop(
host=self.host, port=self.port, username=self.username)
self._proxy_conn = None self._proxy_conn = None
def _get_ssh_connection(self, sleep=1.5, backoff=1): def _get_ssh_connection(self, sleep=1.5, backoff=1):
@ -114,8 +119,10 @@ class Client(object):
ssh.close() ssh.close()
if self._is_timed_out(_start_time): if self._is_timed_out(_start_time):
LOG.exception("Failed to establish authenticated ssh" LOG.exception("Failed to establish authenticated ssh"
" connection to %s@%s after %d attempts", " connection to %s@%s after %d attempts. "
self.username, self.host, attempts) "Proxy client: %s",
self.username, self.host, attempts,
self._get_proxy_client_info())
raise exceptions.SSHTimeout(host=self.host, raise exceptions.SSHTimeout(host=self.host,
user=self.username, user=self.username,
password=self.password) password=self.password)
@ -219,3 +226,13 @@ class Client(object):
cmd = 'nc %s %s' % (self.host, self.port) cmd = 'nc %s %s' % (self.host, self.port)
chan.exec_command(cmd) chan.exec_command(cmd)
return chan return chan
def _get_proxy_client_info(self):
if not self.proxy_client:
return 'no proxy client'
nested_pclient = self.proxy_client._get_proxy_client_info()
return ('%(username)s@%(host)s:%(port)s, nested proxy client: '
'%(nested_pclient)s' % {'username': self.proxy_client.username,
'host': self.proxy_client.host,
'port': self.proxy_client.port,
'nested_pclient': nested_pclient})

5
tempest/lib/exceptions.py
View File

@ -251,6 +251,11 @@ class SSHExecCommandFailed(TempestException):
"stdout:\n%(stdout)s") "stdout:\n%(stdout)s")
class SSHClientProxyClientLoop(TempestException):
message = ("SSH client proxy client has same host: %(host)s, port: "
"%(port)s and username: %(username)s as parent")
class UnknownServiceClient(TempestException): class UnknownServiceClient(TempestException):
message = "Service clients named %(services)s are not known" message = "Service clients named %(services)s are not known"