root/ubuntu-post-install
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pass the resolved SSH port to Kopia's SFTP mirror, not just user/host

Browse Source 
The additional-mirror setup already resolves user/hostname through ssh -G
so a ~/.ssh/config alias works, but never extracted port — Kopia's sftp
storage backend doesn't read ~/.ssh/config at all and defaults to 22
regardless of what the alias actually configures. Confirmed live: this
produced "server unexpectedly closed connection: unexpected EOF" on the
dry-run verification — Kopia connecting to the right host on the wrong
port, not a credentials or host-key issue, which is exactly why plain
`ssh main` kept working the entire time this was being debugged (it reads
the alias's Port line correctly).

Now parses `port` out of the same ssh -G output, defaults to 22 if absent
(matching ssh's own default), and passes --port= through to both the
dry-run check and the persisted EXTRA_MIRROR_ARGS string — the latter
matters as much as the former, since that's what every actual scheduled
sync reuses afterward, not just the one-time verification.

Verified the parsing against three cases: a custom-port alias, a
default-port alias, and an unresolvable alias — all three resolve to the
correct port with no manual intervention needed.
This commit is contained in:
Claude
2026-08-15 03:36:23 +00:00
parent 2b9ba85875
commit 1bb7498567
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/backup.sh
+16 -4
View File
@@ -947,13 +947,25 @@ install_backup() {
# instead of failing later with the alias name as a literal,
# unresolvable hostname. Falls back to the plain @-split if
# `ssh -G` can't resolve it (e.g. no matching Host block).
local _ssh_g _SFTP_USER _SFTP_HOSTNAME
local _ssh_g _SFTP_USER _SFTP_HOSTNAME _SFTP_PORT
_ssh_g="$(ssh -G "$_SFTP_DEST" 2>/dev/null)"
_SFTP_USER="$(echo "$_ssh_g" | awk '/^user /{print $2; exit}')"
_SFTP_HOSTNAME="$(echo "$_ssh_g" | awk '/^hostname /{print $2; exit}')"
_SFTP_PORT="$(echo "$_ssh_g" | awk '/^port /{print $2; exit}')"
[ -z "$_SFTP_USER" ] && _SFTP_USER="${_SFTP_DEST%%@*}"
[ -z "$_SFTP_HOSTNAME" ] && _SFTP_HOSTNAME="${_SFTP_DEST#*@}"
log_info " Using ${_SFTP_USER}@${_SFTP_HOSTNAME} for this mirror (resolved via ~/.ssh/config)."
# Kopia's sftp storage defaults to port 22 same as ssh(1) would,
# but it never reads ~/.ssh/config to get there — a `Port` line
# in a Host block (the common case for anything reachable from
# the internet, to cut down on scanner noise) is exactly the
# kind of thing that silently vanishes without this. Confirmed
# live: this produced "server unexpectedly closed connection:
# unexpected EOF" — Kopia connecting to the real host on the
# WRONG port, not a credentials or host-key problem, while plain
# `ssh main` kept working fine throughout since it reads that
# same Port line correctly.
_SFTP_PORT="${_SFTP_PORT:-22}"
log_info " Using ${_SFTP_USER}@${_SFTP_HOSTNAME}:${_SFTP_PORT} for this mirror (resolved via ~/.ssh/config)."
local _SFTP_PATH="" _MIRROR_NAME=""
prompt_text " Remote path for the repo:" "~/backups/kopia-mirror" _SFTP_PATH
_SFTP_PATH="${_SFTP_PATH:-~/backups/kopia-mirror}"
@@ -977,11 +989,11 @@ install_backup() {
local _sftp_err
if _sftp_err="$(env KOPIA_PASSWORD="${DEST_PASSWORDS[default]}" "$KOPIA_BIN" \
--config-file="${DEST_CONFIGS[default]}" repository sync-to sftp \
--host="$_SFTP_HOSTNAME" --username="$_SFTP_USER" --path="$_SFTP_PATH" \
--host="$_SFTP_HOSTNAME" --port="$_SFTP_PORT" --username="$_SFTP_USER" --path="$_SFTP_PATH" \
--keyfile="$_SFTP_KEYFILE" --known-hosts=/root/.ssh/known_hosts \
--dry-run 2>&1)"; then
EXTRA_MIRROR_TYPE["$_MIRROR_NAME"]="sftp"
EXTRA_MIRROR_ARGS["$_MIRROR_NAME"]="--host=$_SFTP_HOSTNAME --username=$_SFTP_USER --path=$_SFTP_PATH --keyfile=$_SFTP_KEYFILE --known-hosts=/root/.ssh/known_hosts"
EXTRA_MIRROR_ARGS["$_MIRROR_NAME"]="--host=$_SFTP_HOSTNAME --port=$_SFTP_PORT --username=$_SFTP_USER --path=$_SFTP_PATH --keyfile=$_SFTP_KEYFILE --known-hosts=/root/.ssh/known_hosts"
# Reusing an existing mirror name reconfigures it (the
# associative-array assignments above already do that)
# without duplicating it in the space-separated name list.