Skip to content

Fix formatting of addresses passed to SCP #425

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
jujubot merged 1 commit into from
Jun 16, 2020
Merged

Fix formatting of addresses passed to SCP #425

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
35 changes: 31 additions & 4 deletions juju/machine.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import asyncio
import ipaddress
import logging
import os

Expand Down Expand Up @@ -139,6 +140,22 @@ async def set_annotations(self, annotations):
"""
return await _set_annotations(self.tag, annotations, self.connection)

def _format_addr(self, addr):
"""Validate and format IP address.

:param addr: IPv6 or IPv4 address
:type addr: str
:returns: Address string, optionally encapsulated in brackets ([])
:rtype: str
:raises: ValueError
"""
ipaddr = ipaddress.ip_address(addr)
if isinstance(ipaddr, ipaddress.IPv6Address):
fmt = '[{}]'
else:
fmt = '{}'
return fmt.format(ipaddr)

async def scp_to(self, source, destination, user='ubuntu', proxy=False,
scp_opts=''):
"""Transfer files to this machine.
Expand All @@ -153,8 +170,13 @@ async def scp_to(self, source, destination, user='ubuntu', proxy=False,
if proxy:
raise NotImplementedError('proxy option is not implemented')

address = self.dns_name
destination = '%s@%s:%s' % (user, address, destination)
try:
# if dns_name is an IP address format it appropriately
address = self._format_addr(self.dns_name)
except ValueError:
# otherwise we assume it to be a DNS resolvable string
address = self.dns_name
destination = '{}@{}:{}'.format(user, address, destination)
await self._scp(source, destination, scp_opts)

async def scp_from(self, source, destination, user='ubuntu', proxy=False,
Expand All @@ -171,8 +193,13 @@ async def scp_from(self, source, destination, user='ubuntu', proxy=False,
if proxy:
raise NotImplementedError('proxy option is not implemented')

address = self.dns_name
source = '%s@%s:%s' % (user, address, source)
try:
# if dns_name is an IP address format it appropriately
address = self._format_addr(self.dns_name)
except ValueError:
# otherwise we assume it to be a DNS resolvable string
address = self.dns_name
source = '{}@{}:{}'.format(user, address, source)
await self._scp(source, destination, scp_opts)

async def _scp(self, source, destination, scp_opts):
Expand Down