cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix ssh connections to IPv6 addresses

Browse source 
We can unconditionally wrap remote_addr in square brackets for scp and
sftp (both of which require them for IPv6 addresses), but not wrap them
at all for ssh (which doesn't accept them). This way, we don't have to
detect and treat IPv6 addresses specially. This works for hostnames,
IPv4 addresses, and IPv6 addresses.

The earlier code seemed to intend to wrap all IPv6 addresses in square
brackets, which would have broken ssh, but it actually made no attempt
to detect IPv6 addresses at all (so it broke only with IPv6 addresses
for scp and sftp).

Based on a review of PR #11677 by @JuiceBoxSingularity
This commit is contained in:
Abhijit Menon-Sen 2015-07-31 18:57:20 +05:30
parent 6d514e18b7
commit 72715c6add
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/ansible/plugins/connections/ssh.py
View file

@ -57,11 +57,7 @@ class Connection(ConnectionBase):
super(Connection, self).__init__(*args, **kwargs) super(Connection, self).__init__(*args, **kwargs)
# FIXME: make this work, should be set from connection info
self._ipv6 = False
self.host = self._play_context.remote_addr self.host = self._play_context.remote_addr
if self._ipv6:
self.host = '[%s]' % self.host
@property @property
def transport(self): def transport(self):
@ -342,8 +338,6 @@ class Connection(ConnectionBase):
ssh_cmd.append("-q") ssh_cmd.append("-q")
ssh_cmd += self._common_args ssh_cmd += self._common_args
if self._ipv6:
ssh_cmd += ['-6']
ssh_cmd.append(self.host) ssh_cmd.append(self.host)
ssh_cmd.append(cmd) ssh_cmd.append(cmd)
@ -437,15 +431,19 @@ class Connection(ConnectionBase):
raise AnsibleFileNotFound("file or module does not exist: {0}".format(in_path)) raise AnsibleFileNotFound("file or module does not exist: {0}".format(in_path))
cmd = self._password_cmd() cmd = self._password_cmd()
# scp and sftp require square brackets for IPv6 addresses, but
# accept them for hostnames and IPv4 addresses too.
host = '[%s]' % self.host
if C.DEFAULT_SCP_IF_SSH: if C.DEFAULT_SCP_IF_SSH:
cmd.append('scp') cmd.append('scp')
cmd.extend(self._common_args) cmd.extend(self._common_args)
cmd.extend([in_path, '{0}:{1}'.format(self.host, pipes.quote(out_path))]) cmd.extend([in_path, '{0}:{1}'.format(host, pipes.quote(out_path))])
indata = None indata = None
else: else:
cmd.append('sftp') cmd.append('sftp')
cmd.extend(self._common_args) cmd.extend(self._common_args)
cmd.append(self.host) cmd.append(host)
indata = "put {0} {1}\n".format(pipes.quote(in_path), pipes.quote(out_path)) indata = "put {0} {1}\n".format(pipes.quote(in_path), pipes.quote(out_path))
(p, stdin) = self._run(cmd, indata) (p, stdin) = self._run(cmd, indata)