mirror of
https://github.com/kevinveenbirkenbach/docker-volume-backup.git
synced 2026-08-20 21:22:54 +00:00
Kevin Veen-Birkenbach
1d86277a94
The backup built command strings and handed them to shell=True, so four interpolated values per dump - user, password, container, database - were each a way out of the command. validate_database covered one of them since the previous commit; now there is nothing to cover: every command is an argv list, and a value can only ever be an argument. execute_to_file absorbs the atomic dump write. The shell redirect into <file>.tmp and the separate mv process become a Python file handle and os.replace, and a failing dump deletes its partial file instead of leaving it. PGPASSWORD moves out of the command string into the child's environment, where a process listing does not show it. docker exec is built in one place, docker_exec_argv; db.py's three hand-built copies and the probe use it. The dead docker_volume_exists goes - never called, and the restore side owns the living twin. The rsync quoting in --link-dest falls away: inside an argv it would have become part of the path. The snapshot module's injected runner changes type with it, which the three e2e drivers implement - the first conversion missed them, btrfs ran with no arguments, and the e2e caught it. Marked breaking for that contract: any external runner injected into volume_snapshot must now accept a list. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
45 lines
1.5 KiB
Python
45 lines
1.5 KiB
Python
import unittest
|
|
from unittest.mock import patch
|
|
|
|
from baudolo.backup import docker as docker_mod
|
|
from baudolo.backup.shell import BackupException
|
|
|
|
|
|
class TestImageId(unittest.TestCase):
|
|
def test_the_id_is_returned_without_surrounding_whitespace(self) -> None:
|
|
with patch.object(
|
|
docker_mod, "execute_shell_command", return_value=["sha256:abc \n"]
|
|
):
|
|
self.assertEqual(docker_mod.image_id("c1"), "sha256:abc")
|
|
|
|
|
|
class TestHasTool(unittest.TestCase):
|
|
def test_a_tool_that_runs_is_present(self) -> None:
|
|
with patch.object(docker_mod, "execute_shell_command", return_value=[]):
|
|
self.assertTrue(docker_mod.has_tool("c1", "pg_dumpall"))
|
|
|
|
def test_a_tool_that_exits_non_zero_is_absent(self) -> None:
|
|
with patch.object(
|
|
docker_mod, "execute_shell_command", side_effect=BackupException("127")
|
|
):
|
|
self.assertFalse(docker_mod.has_tool("c1", "mariadb-dump"))
|
|
|
|
def test_the_probe_needs_no_shell_in_the_image(self) -> None:
|
|
"""A distroless database ships no shell; `sh -c` would deny every tool."""
|
|
captured = []
|
|
|
|
def _capture(cmd):
|
|
captured.append(cmd)
|
|
return []
|
|
|
|
with patch.object(docker_mod, "execute_shell_command", side_effect=_capture):
|
|
docker_mod.has_tool("c1", "pg_dumpall")
|
|
|
|
self.assertEqual(
|
|
captured, [["docker", "exec", "c1", "pg_dumpall", "--version"]]
|
|
)
|
|
|
|
|
|
if __name__ == "__main__":
|
|
unittest.main()
|