mirror of
https://github.com/lrnselfreliance/wrolpi.git
synced 2026-11-21 23:46:18 -05:00
Onboarding a drive keeps a library on the internal disk (#828)
The onboarding wizard deleted /media/wrolpi/config before mounting a drive, and the shadowed data check ignored config/. A library kept on the internal disk keeps wrolpi.db and its configs there, so onboarding a drive later deleted them without warning. Only a config/ holding nothing but the ssl/ CA is now treated as transient. Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
parent
1554dfb268
commit
b83a9cf017
4 changed files with 89 additions and 25 deletions
|
|
@ -437,13 +437,24 @@ class TestCheckShadowedData:
|
|||
assert check_shadowed_data(str(target)) is None
|
||||
|
||||
def test_returns_none_when_only_config_present(self, tmp_path):
|
||||
"""`config/` is whitelisted — it's expected pre-mount state."""
|
||||
"""A `config/` holding only the CA from generate_certificates.sh is expected pre-mount state."""
|
||||
target = tmp_path / "wrolpi"
|
||||
target.mkdir()
|
||||
(target / "config").mkdir()
|
||||
(target / "config" / "ssl.crt").write_text("cert")
|
||||
(target / "config" / "ssl").mkdir(parents=True)
|
||||
(target / "config" / "ssl" / "ca.crt").write_text("cert")
|
||||
assert check_shadowed_data(str(target)) is None
|
||||
|
||||
def test_detects_config_with_user_data(self, tmp_path):
|
||||
"""A library kept on the internal disk has its database and configs in `config/`."""
|
||||
target = tmp_path / "wrolpi"
|
||||
target.mkdir()
|
||||
(target / "config" / "ssl").mkdir(parents=True)
|
||||
(target / "config" / "ssl" / "ca.crt").write_text("cert")
|
||||
(target / "config" / "wrolpi.db").write_bytes(b"x" * 10)
|
||||
result = check_shadowed_data(str(target))
|
||||
assert result["entries"] == ["config"]
|
||||
assert result["size_bytes"] == 14
|
||||
|
||||
def test_detects_directory_entry(self, tmp_path):
|
||||
target = tmp_path / "wrolpi"
|
||||
target.mkdir()
|
||||
|
|
|
|||
|
|
@ -259,17 +259,20 @@ class TestCommitOnboarding:
|
|||
"""Full onboarding with config file on drive."""
|
||||
media_dir = tmp_path / "wrolpi"
|
||||
media_dir.mkdir()
|
||||
config_dir = media_dir / "config"
|
||||
config_dir.mkdir()
|
||||
|
||||
config_data = {"drives": {"mounts": [
|
||||
{"device": "/dev/sdb1", "mount_point": "/media/backup", "fstype": "ext4"},
|
||||
]}}
|
||||
(config_dir / "controller.yaml").write_text(yaml.dump(config_data))
|
||||
|
||||
def mount_side_effect(device, mount_point, **kwargs):
|
||||
if device == "/dev/sda1":
|
||||
# The drive's config appears once it is mounted.
|
||||
(media_dir / "config").mkdir()
|
||||
(media_dir / "config" / "controller.yaml").write_text(yaml.dump(config_data))
|
||||
return {"success": True}
|
||||
|
||||
with mock.patch("controller.lib.onboarding.get_media_directory", return_value=media_dir), \
|
||||
mock.patch("controller.lib.onboarding._cleanup_temp_mount"), \
|
||||
mock.patch("controller.lib.onboarding.mount_drive", return_value={"success": True}), \
|
||||
mock.patch("controller.lib.onboarding.mount_drive", side_effect=mount_side_effect), \
|
||||
mock.patch("controller.lib.onboarding.add_fstab_entry", return_value={"success": True}), \
|
||||
mock.patch("controller.lib.onboarding.reload_config_from_drive", return_value=True), \
|
||||
mock.patch("controller.lib.onboarding.save_config"), \
|
||||
|
|
@ -277,7 +280,7 @@ class TestCommitOnboarding:
|
|||
result = commit_onboarding("/dev/sda1", "ext4")
|
||||
|
||||
assert result["success"] is True
|
||||
assert str(media_dir) in result["mounts"]
|
||||
assert result["mounts"] == [str(media_dir), "/media/backup"]
|
||||
assert result["repair_started"] is True
|
||||
|
||||
def test_fresh_drive_proceeds(self, mock_docker_mode, tmp_path):
|
||||
|
|
@ -402,13 +405,9 @@ class TestCommitOnboarding:
|
|||
"""Secondary mount failure should not abort onboarding."""
|
||||
media_dir = tmp_path / "wrolpi"
|
||||
media_dir.mkdir()
|
||||
config_dir = media_dir / "config"
|
||||
config_dir.mkdir()
|
||||
|
||||
config_data = {"drives": {"mounts": [
|
||||
{"device": "/dev/sdb1", "mount_point": "/media/backup", "fstype": "ext4"},
|
||||
]}}
|
||||
(config_dir / "controller.yaml").write_text(yaml.dump(config_data))
|
||||
|
||||
call_count = 0
|
||||
|
||||
|
|
@ -416,7 +415,10 @@ class TestCommitOnboarding:
|
|||
nonlocal call_count
|
||||
call_count += 1
|
||||
if call_count == 1:
|
||||
return {"success": True} # Primary mount succeeds
|
||||
# Primary mount succeeds, and the drive's config appears.
|
||||
(media_dir / "config").mkdir()
|
||||
(media_dir / "config" / "controller.yaml").write_text(yaml.dump(config_data))
|
||||
return {"success": True}
|
||||
return {"success": False, "error": "Not found"} # Secondary fails
|
||||
|
||||
with mock.patch("controller.lib.onboarding.get_media_directory", return_value=media_dir), \
|
||||
|
|
@ -429,6 +431,7 @@ class TestCommitOnboarding:
|
|||
result = commit_onboarding("/dev/sda1", "ext4")
|
||||
|
||||
assert result["success"] is True
|
||||
assert call_count == 2
|
||||
# Only primary mount should be in the list
|
||||
assert len(result["mounts"]) == 1
|
||||
|
||||
|
|
@ -476,8 +479,8 @@ class TestCommitOnboardingShadowedData:
|
|||
"""A target containing only `config/` is the expected pre-mount state."""
|
||||
media_dir = tmp_path / "wrolpi"
|
||||
media_dir.mkdir()
|
||||
(media_dir / "config").mkdir()
|
||||
(media_dir / "config" / "ssl.crt").write_text("cert")
|
||||
(media_dir / "config" / "ssl").mkdir(parents=True)
|
||||
(media_dir / "config" / "ssl" / "ca.crt").write_text("cert")
|
||||
|
||||
with contextlib.ExitStack() as stack:
|
||||
for p in self._patched_mount_calls(media_dir):
|
||||
|
|
@ -486,6 +489,36 @@ class TestCommitOnboardingShadowedData:
|
|||
|
||||
assert result["success"] is True
|
||||
|
||||
def test_internal_library_config_blocks_and_is_kept(self, mock_docker_mode, tmp_path):
|
||||
"""A library kept on the internal disk is never deleted by onboarding a drive."""
|
||||
media_dir = tmp_path / "wrolpi"
|
||||
(media_dir / "config" / "ssl").mkdir(parents=True)
|
||||
(media_dir / "config" / "wrolpi.db").write_bytes(b"x" * 10)
|
||||
|
||||
with contextlib.ExitStack() as stack:
|
||||
for p in self._patched_mount_calls(media_dir):
|
||||
stack.enter_context(p)
|
||||
result = commit_onboarding("/dev/sda1", "ext4")
|
||||
|
||||
assert result["success"] is False
|
||||
assert result["needs_force"] == "shadowed"
|
||||
assert result["shadowed_data"]["entries"] == ["config"]
|
||||
assert (media_dir / "config" / "wrolpi.db").is_file()
|
||||
|
||||
def test_internal_library_config_kept_when_forced(self, mock_docker_mode, tmp_path):
|
||||
"""Forcing the mount hides the internal library, but does not delete it."""
|
||||
media_dir = tmp_path / "wrolpi"
|
||||
(media_dir / "config" / "ssl").mkdir(parents=True)
|
||||
(media_dir / "config" / "wrolpi.db").write_bytes(b"x" * 10)
|
||||
|
||||
with contextlib.ExitStack() as stack:
|
||||
for p in self._patched_mount_calls(media_dir):
|
||||
stack.enter_context(p)
|
||||
result = commit_onboarding("/dev/sda1", "ext4", force_shadowed=True)
|
||||
|
||||
assert result["success"] is True
|
||||
assert (media_dir / "config" / "wrolpi.db").is_file()
|
||||
|
||||
def test_shadowed_data_blocks_without_force(self, mock_docker_mode, tmp_path):
|
||||
"""A target with non-config data should soft-block."""
|
||||
media_dir = tmp_path / "wrolpi"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue