hippogrief/pobsync
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Compare commits

base: hippogrief:833edb2466393992ba4ee683d73258bfb1639caf
Branches Tags
hippogrief:master hippogrief:issue-24-ui-label-cleanup
hippogrief:v1.2.0 hippogrief:v1.1.0 hippogrief:v1.0.0
..
compare: hippogrief:8633cbea26a12bc4bf6f2e13468a8de7379a9bcc
Branches Tags
hippogrief:master hippogrief:issue-24-ui-label-cleanup
hippogrief:v1.2.0 hippogrief:v1.1.0 hippogrief:v1.0.0

2 Commits
833edb2466 ... 8633cbea26

Author SHA1 Message Date
Peter van Arkel
8633cbea26 Merge pull request '(bugfix) Quote remote preflight shell commands' (#46) from issue-45-preflight-shell-quoting into master 
Reviewed-on: #46
 2026-05-21 15:45:46 +02:00
Peter van Arkel
3fb8209aef (bugfix) Quote remote preflight shell commands 
Pass remote rsync and source-root preflight checks as a single quoted
shell command to SSH so the remote shell evaluates command -v and test
expressions reliably.

Refs #45
 2026-05-21 15:44:46 +02:00
2 changed files with 10 additions and 6 deletions
Expand all files Collapse all files

12
src/pobsync_backend/preflight.py
View File

@@ -97,9 +97,7 @@ def run_remote_preflight(host: HostConfig, *, timeout_seconds: int = 20) -> dict
*ssh_cmd, *ssh_cmd,
"-oBatchMode=yes", "-oBatchMode=yes",
target, target,
"sh", _remote_shell_command(f"command -v {shlex.quote(rsync_binary)} >/dev/null"),
"-lc",
f"command -v {shlex.quote(rsync_binary)} >/dev/null",
], ],
timeout_seconds=timeout_seconds, timeout_seconds=timeout_seconds,
), ),
@@ -109,9 +107,7 @@ def run_remote_preflight(host: HostConfig, *, timeout_seconds: int = 20) -> dict
*ssh_cmd, *ssh_cmd,
"-oBatchMode=yes", "-oBatchMode=yes",
target, target,
"sh", _remote_shell_command(f"test -e {shlex.quote(source_root)} && test -r {shlex.quote(source_root)}"),
"-lc",
f"test -e {shlex.quote(source_root)} && test -r {shlex.quote(source_root)}",
], ],
timeout_seconds=timeout_seconds, timeout_seconds=timeout_seconds,
), ),
@@ -129,6 +125,10 @@ def run_remote_preflight(host: HostConfig, *, timeout_seconds: int = 20) -> dict
return result return result
def _remote_shell_command(script: str) -> str:
return f"sh -lc {shlex.quote(script)}"
def effective_host_config_preview(host: HostConfig, global_config: GlobalConfig) -> dict[str, Any]: def effective_host_config_preview(host: HostConfig, global_config: GlobalConfig) -> dict[str, Any]:
config = build_effective_config(global_config_object_data(global_config), host_config_object_data(host)) config = build_effective_config(global_config_object_data(global_config), host_config_object_data(host))
credential = host.ssh_credential or global_config.default_ssh_credential credential = host.ssh_credential or global_config.default_ssh_credential

4
src/pobsync_backend/tests/test_views.py
View File

@@ -1100,6 +1100,10 @@ class ViewTests(TestCase):
self.assertContains(response, "Remote rsync") self.assertContains(response, "Remote rsync")
self.assertContains(response, "Remote source root") self.assertContains(response, "Remote source root")
self.assertEqual(run.call_count, 3) self.assertEqual(run.call_count, 3)
commands = [call.kwargs["args"] if "args" in call.kwargs else call.args[0] for call in run.call_args_list]
self.assertEqual(commands[1][-1], "sh -lc 'command -v rsync >/dev/null'")
self.assertEqual(commands[2][-1], "sh -lc 'test -e / && test -r /'")
self.assertNotIn("sh", commands[2][commands[2].index("root@web-01.example.test") + 1 : -1])
host.refresh_from_db() host.refresh_from_db()
self.assertTrue(host.config["last_preflight"]["ok"]) self.assertTrue(host.config["last_preflight"]["ok"])
self.assertEqual(host.config["last_preflight"]["target"], "root@web-01.example.test") self.assertEqual(host.config["last_preflight"]["target"], "root@web-01.example.test")