Skip to content

Commit

Permalink
sftp: add support for ~/.ssh/config, fixes #37
Browse files Browse the repository at this point in the history
- support configured IdentityFiles
- parse user and system ssh config
- prefer values in url over config
- add note about missing ssh_config.d/* support
  • Loading branch information
ThomasWaldmann committed Sep 16, 2024
1 parent 90b4363 commit d80a1cd
Show file tree
Hide file tree
Showing 3 changed files with 58 additions and 12 deletions.
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ classifiers = [
license = {text="BSD"}
requires-python = ">=3.9"
dependencies = [
"paramiko",
"paramiko >= 1.9.1", # 1.9.1+ supports multiple IdentityKey entries in .ssh/config
]

[project.urls]
Expand Down
42 changes: 39 additions & 3 deletions src/borgstore/backends/sftp.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,21 +26,57 @@ def get_sftp_backend(url):
"""
m = re.match(sftp_regex, url, re.VERBOSE)
if m:
return Sftp(username=m["username"], hostname=m["hostname"], port=int(m["port"] or "22"), path=m["path"])
return Sftp(username=m["username"], hostname=m["hostname"], port=int(m["port"] or "0"), path=m["path"])


class Sftp(BackendBase):
def __init__(self, hostname: str, path: str, port: int = 22, username: Optional[str] = None):
def __init__(self, hostname: str, path: str, port: int = 0, username: Optional[str] = None):
self.username = username
self.hostname = hostname
self.port = port
self.base_path = path
self.opened = False

def _get_host_config_from_file(self, path: str, hostname: str):
"""lookup the configuration for hostname in path (ssh config file)"""
config_path = Path(path).expanduser()
try:
ssh_config = paramiko.SSHConfig.from_path(config_path)
except FileNotFoundError:
return paramiko.SSHConfigDict() # empty dict
else:
return ssh_config.lookup(hostname)

def _get_host_config(self):
"""assemble all given and configured host config values"""
host_config = paramiko.SSHConfigDict()
# self.hostname might be an alias/shortcut (with real hostname given in configuration),
# but there might be also nothing in the configs at all for self.hostname:
host_config["hostname"] = self.hostname
# first process system-wide ssh config, then override with user ssh config:
host_config.update(self._get_host_config_from_file("/etc/ssh/ssh_config", self.hostname))
# note: no support yet for /etc/ssh/ssh_config.d/*
host_config.update(self._get_host_config_from_file("~/.ssh/config", self.hostname))
# now override configured values with given values
if self.username is not None:
host_config.update({"user": self.username})
if self.port != 0:
host_config.update({"port": self.port})
# make sure port is present and is an int
host_config["port"] = int(host_config.get("port") or 22)
return host_config

def _connect(self):
ssh = paramiko.SSHClient()
ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
ssh.connect(hostname=self.hostname, username=self.username, port=self.port, allow_agent=True)
host_config = self._get_host_config()
ssh.connect(
hostname=host_config["hostname"],
username=host_config.get("user"), # if None, paramiko will use current user
port=host_config["port"],
key_filename=host_config.get("identityfile"), # list of keys, ~ is already expanded
allow_agent=True,
)
self.client = ssh.open_sftp()

def _disconnect(self):
Expand Down
26 changes: 18 additions & 8 deletions tests/test_backends.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,23 @@ def posixfs_backend_created(tmp_path):
be.destroy()


def _get_sftp_backend():
def _get_sftp_backend(local=False, remote_url=False, remote_config=True):
# needs an authorized key loaded into the ssh agent. pytest works, tox doesn't:
# return Sftp(username="tw", hostname="localhost", path="/Users/tw/w/borgstore/temp-store")
if local:
return Sftp(username="tw", hostname="localhost", path="/Users/tw/w/borgstore/temp-store")
# for tests with higher latency:
return Sftp(
username="twaldmann", hostname="shell.ipv4.thinkmo.de", port=2222, path="/home/twaldmann/borgstore/temp-store"
)
if remote_url:
return Sftp(
username="twaldmann",
hostname="shell.ipv4.thinkmo.de",
port=2222,
path="/home/twaldmann/borgstore/temp-store",
)
# same as previous, but loads config for host "shell" from ~/.ssh/config:
if remote_config:
return Sftp(hostname="shell", path="/home/twaldmann/borgstore/temp-store")

raise ValueError("check _get_sftp_backend() parameter defaults!")


def check_sftp_available():
Expand Down Expand Up @@ -96,16 +106,16 @@ def test_file_url(url, path):
"url,username,hostname,port,path",
[
("sftp://username@hostname:2222/some/path", "username", "hostname", 2222, "/some/path"),
("sftp://username@hostname/some/path", "username", "hostname", 22, "/some/path"),
("sftp://hostname/some/path", None, "hostname", 22, "/some/path"),
("sftp://username@hostname/some/path", "username", "hostname", 0, "/some/path"),
("sftp://hostname/some/path", None, "hostname", 0, "/some/path"),
],
)
def test_sftp_url(url, username, hostname, port, path):
backend = get_sftp_backend(url)
assert isinstance(backend, Sftp)
assert backend.username == username
assert backend.hostname == hostname
assert backend.port == port
assert backend.port == port # note: 0 means "not given" (and will usually mean 22 in the end)
assert backend.base_path == path


Expand Down

0 comments on commit d80a1cd

Please sign in to comment.