Introduce vault layer

src/tests/test_config_manager.py

@@ -9,6 +9,7 @@ sys.path.append(str(Path(__file__).resolve().parents[1]))
 
 from password_manager.encryption import EncryptionManager
 from password_manager.config_manager import ConfigManager
+from password_manager.vault import Vault
 from nostr.client import DEFAULT_RELAYS
 
 
@@ -16,7 +17,8 @@ def test_config_defaults_and_round_trip():
     with TemporaryDirectory() as tmpdir:
         key = Fernet.generate_key()
         enc_mgr = EncryptionManager(key, Path(tmpdir))
-        cfg_mgr = ConfigManager(enc_mgr, Path(tmpdir))
+        vault = Vault(enc_mgr, Path(tmpdir))
+        cfg_mgr = ConfigManager(vault, Path(tmpdir))
 
         cfg = cfg_mgr.load_config(require_pin=False)
         assert cfg["relays"] == list(DEFAULT_RELAYS)
@@ -34,7 +36,8 @@ def test_pin_verification_and_change():
     with TemporaryDirectory() as tmpdir:
         key = Fernet.generate_key()
         enc_mgr = EncryptionManager(key, Path(tmpdir))
-        cfg_mgr = ConfigManager(enc_mgr, Path(tmpdir))
+        vault = Vault(enc_mgr, Path(tmpdir))
+        cfg_mgr = ConfigManager(vault, Path(tmpdir))
 
         cfg_mgr.set_pin("1234")
         assert cfg_mgr.verify_pin("1234")
@@ -50,7 +53,8 @@ def test_config_file_encrypted_after_save():
     with TemporaryDirectory() as tmpdir:
         key = Fernet.generate_key()
         enc_mgr = EncryptionManager(key, Path(tmpdir))
-        cfg_mgr = ConfigManager(enc_mgr, Path(tmpdir))
+        vault = Vault(enc_mgr, Path(tmpdir))
+        cfg_mgr = ConfigManager(vault, Path(tmpdir))
 
         data = {"relays": ["wss://r"], "pin_hash": ""}
         cfg_mgr.save_config(data)
@@ -67,7 +71,8 @@ def test_set_relays_persists_changes():
     with TemporaryDirectory() as tmpdir:
         key = Fernet.generate_key()
         enc_mgr = EncryptionManager(key, Path(tmpdir))
-        cfg_mgr = ConfigManager(enc_mgr, Path(tmpdir))
+        vault = Vault(enc_mgr, Path(tmpdir))
+        cfg_mgr = ConfigManager(vault, Path(tmpdir))
         cfg_mgr.set_relays(["wss://custom"], require_pin=False)
         cfg = cfg_mgr.load_config(require_pin=False)
         assert cfg["relays"] == ["wss://custom"]
@@ -77,6 +82,7 @@ def test_set_relays_requires_at_least_one():
     with TemporaryDirectory() as tmpdir:
         key = Fernet.generate_key()
         enc_mgr = EncryptionManager(key, Path(tmpdir))
-        cfg_mgr = ConfigManager(enc_mgr, Path(tmpdir))
+        vault = Vault(enc_mgr, Path(tmpdir))
+        cfg_mgr = ConfigManager(vault, Path(tmpdir))
         with pytest.raises(ValueError):
             cfg_mgr.set_relays([], require_pin=False)

src/tests/test_password_change.py

@@ -11,6 +11,7 @@ sys.path.append(str(Path(__file__).resolve().parents[1]))
 from password_manager.encryption import EncryptionManager
 from password_manager.entry_management import EntryManager
 from password_manager.config_manager import ConfigManager
+from password_manager.vault import Vault
 from password_manager.manager import PasswordManager
 
 
@@ -18,13 +19,15 @@ def test_change_password_does_not_trigger_nostr_backup(monkeypatch):
     with TemporaryDirectory() as tmpdir:
         fp = Path(tmpdir)
         enc_mgr = EncryptionManager(Fernet.generate_key(), fp)
-        entry_mgr = EntryManager(enc_mgr, fp)
-        cfg_mgr = ConfigManager(enc_mgr, fp)
+        vault = Vault(enc_mgr, fp)
+        entry_mgr = EntryManager(vault, fp)
+        cfg_mgr = ConfigManager(vault, fp)
 
         pm = PasswordManager.__new__(PasswordManager)
         pm.encryption_manager = enc_mgr
         pm.entry_manager = entry_mgr
         pm.config_manager = cfg_mgr
+        pm.vault = vault
         pm.password_generator = SimpleNamespace(encryption_manager=enc_mgr)
         pm.fingerprint_dir = fp
         pm.current_fingerprint = "fp"

src/tests/test_settings_menu.py

@@ -13,6 +13,7 @@ import main
 from nostr.client import DEFAULT_RELAYS
 from password_manager.encryption import EncryptionManager
 from password_manager.config_manager import ConfigManager
+from password_manager.vault import Vault
 from utils.fingerprint_manager import FingerprintManager
 
 
@@ -26,7 +27,8 @@ def setup_pm(tmp_path, monkeypatch):
     fp_dir = constants.APP_DIR / "fp"
     fp_dir.mkdir(parents=True)
     enc_mgr = EncryptionManager(Fernet.generate_key(), fp_dir)
-    cfg_mgr = ConfigManager(enc_mgr, fp_dir)
+    vault = Vault(enc_mgr, fp_dir)
+    cfg_mgr = ConfigManager(vault, fp_dir)
     fp_mgr = FingerprintManager(constants.APP_DIR)
 
     nostr_stub = SimpleNamespace(