From ef6646431769654559b801f4e584c535711f2717 Mon Sep 17 00:00:00 2001 From: thePR0M3TH3AN <53631862+PR0M3TH3AN@users.noreply.github.com> Date: Tue, 8 Jul 2025 16:45:08 -0400 Subject: [PATCH] Display and edit entry tags --- src/password_manager/manager.py | 67 ++++++++++++++++++++--- src/tests/test_edit_tags_from_retrieve.py | 49 +++++++++++++++++ 2 files changed, 107 insertions(+), 9 deletions(-) create mode 100644 src/tests/test_edit_tags_from_retrieve.py diff --git a/src/password_manager/manager.py b/src/password_manager/manager.py index fe25167..7b4a010 100644 --- a/src/password_manager/manager.py +++ b/src/password_manager/manager.py @@ -1623,7 +1623,7 @@ class PasswordManager: print(colored("C. Add Custom Field", "cyan")) print(colored("H. Add Hidden Field", "cyan")) print(colored("E. Edit", "cyan")) - print(colored("T. Add Tags", "cyan")) + print(colored("T. Edit Tags", "cyan")) print(colored("Q. Show QR codes", "cyan")) choice = ( @@ -1662,14 +1662,24 @@ class PasswordManager: self.is_dirty = True self.last_update = time.time() elif choice == "t": - tags_input = input("Enter tags (comma-separated): ").strip() - if tags_input: - new_tags = [t.strip() for t in tags_input.split(",") if t.strip()] - existing_tags = entry.get("tags", []) - tags = list({*existing_tags, *new_tags}) - self.entry_manager.modify_entry(index, tags=tags) - self.is_dirty = True - self.last_update = time.time() + current_tags = entry.get("tags", []) + print( + colored( + f"Current tags: {', '.join(current_tags) if current_tags else 'None'}", + "cyan", + ) + ) + tags_input = input( + "Enter tags (comma-separated, leave blank to remove all tags): " + ).strip() + tags = ( + [t.strip() for t in tags_input.split(",") if t.strip()] + if tags_input + else [] + ) + self.entry_manager.modify_entry(index, tags=tags) + self.is_dirty = True + self.last_update = time.time() elif choice == "e": self._entry_edit_menu(index, entry) elif choice == "q": @@ -1836,6 +1846,9 @@ class PasswordManager: print(color_text(f"Code: {code}", category)) if notes: print(colored(f"Notes: {notes}", "cyan")) + tags = entry.get("tags", []) + if tags: + print(colored(f"Tags: {', '.join(tags)}", "cyan")) remaining = self.entry_manager.get_totp_time_remaining(index) exit_loop = False while remaining > 0: @@ -1885,6 +1898,9 @@ class PasswordManager: print(colored(f"Label: {label}", "cyan")) if notes: print(colored(f"Notes: {notes}", "cyan")) + tags = entry.get("tags", []) + if tags: + print(colored(f"Tags: {', '.join(tags)}", "cyan")) print(colored("Public Key:", "cyan")) print(color_text(pub_pem, "default")) if self.secret_mode_enabled: @@ -1920,6 +1936,9 @@ class PasswordManager: print(colored(f"Label: {label}", "cyan")) if notes: print(colored(f"Notes: {notes}", "cyan")) + tags = entry.get("tags", []) + if tags: + print(colored(f"Tags: {', '.join(tags)}", "cyan")) if self.secret_mode_enabled: copy_to_clipboard(phrase, self.clipboard_clear_delay) print( @@ -1969,6 +1988,9 @@ class PasswordManager: print(colored(f"User ID: {label}", "cyan")) if notes: print(colored(f"Notes: {notes}", "cyan")) + tags = entry.get("tags", []) + if tags: + print(colored(f"Tags: {', '.join(tags)}", "cyan")) print(colored(f"Fingerprint: {fingerprint}", "cyan")) if self.secret_mode_enabled: copy_to_clipboard(priv_key, self.clipboard_clear_delay) @@ -2009,6 +2031,9 @@ class PasswordManager: # QR code display removed for npub and nsec if notes: print(colored(f"Notes: {notes}", "cyan")) + tags = entry.get("tags", []) + if tags: + print(colored(f"Tags: {', '.join(tags)}", "cyan")) except Exception as e: logging.error(f"Error deriving Nostr keys: {e}", exc_info=True) print(colored(f"Error: Failed to derive Nostr keys: {e}", "red")) @@ -2024,6 +2049,9 @@ class PasswordManager: print(colored(f"Retrieving value for '{label}'.", "cyan")) if notes: print(colored(f"Notes: {notes}", "cyan")) + tags = entry.get("tags", []) + if tags: + print(colored(f"Tags: {', '.join(tags)}", "cyan")) print( colored( f"Archived Status: {'Archived' if archived else 'Active'}", @@ -2082,6 +2110,9 @@ class PasswordManager: print(colored(f"Notes: {notes}", "cyan")) if fingerprint: print(colored(f"Fingerprint: {fingerprint}", "cyan")) + tags = entry.get("tags", []) + if tags: + print(colored(f"Tags: {', '.join(tags)}", "cyan")) print( colored( f"Archived Status: {'Archived' if archived else 'Active'}", @@ -2172,6 +2203,9 @@ class PasswordManager: "cyan", ) ) + tags = entry.get("tags", []) + if tags: + print(colored(f"Tags: {', '.join(tags)}", "cyan")) custom_fields = entry.get("custom_fields", []) if custom_fields: print(colored("Additional Fields:", "cyan")) @@ -2651,6 +2685,9 @@ class PasswordManager: notes = entry.get("notes", "") if notes: print(color_text(f" Notes: {notes}", "index")) + tags = entry.get("tags", []) + if tags: + print(color_text(f" Tags: {', '.join(tags)}", "index")) elif etype == EntryType.SEED.value: print(color_text(" Type: Seed Phrase", "index")) print(color_text(f" Label: {entry.get('label', '')}", "index")) @@ -2661,6 +2698,9 @@ class PasswordManager: notes = entry.get("notes", "") if notes: print(color_text(f" Notes: {notes}", "index")) + tags = entry.get("tags", []) + if tags: + print(color_text(f" Tags: {', '.join(tags)}", "index")) elif etype == EntryType.SSH.value: print(color_text(" Type: SSH Key", "index")) print(color_text(f" Label: {entry.get('label', '')}", "index")) @@ -2670,6 +2710,9 @@ class PasswordManager: notes = entry.get("notes", "") if notes: print(color_text(f" Notes: {notes}", "index")) + tags = entry.get("tags", []) + if tags: + print(color_text(f" Tags: {', '.join(tags)}", "index")) elif etype == EntryType.PGP.value: print(color_text(" Type: PGP Key", "index")) print(color_text(f" Label: {entry.get('label', '')}", "index")) @@ -2685,6 +2728,9 @@ class PasswordManager: notes = entry.get("notes", "") if notes: print(color_text(f" Notes: {notes}", "index")) + tags = entry.get("tags", []) + if tags: + print(color_text(f" Tags: {', '.join(tags)}", "index")) elif etype == EntryType.NOSTR.value: print(color_text(" Type: Nostr Key", "index")) print(color_text(f" Label: {entry.get('label', '')}", "index")) @@ -2694,6 +2740,9 @@ class PasswordManager: notes = entry.get("notes", "") if notes: print(color_text(f" Notes: {notes}", "index")) + tags = entry.get("tags", []) + if tags: + print(color_text(f" Tags: {', '.join(tags)}", "index")) else: website = entry.get("label", entry.get("website", "")) username = entry.get("username", "") diff --git a/src/tests/test_edit_tags_from_retrieve.py b/src/tests/test_edit_tags_from_retrieve.py new file mode 100644 index 0000000..143da53 --- /dev/null +++ b/src/tests/test_edit_tags_from_retrieve.py @@ -0,0 +1,49 @@ +import sys +from pathlib import Path +from tempfile import TemporaryDirectory +from types import SimpleNamespace + +from helpers import create_vault, TEST_SEED, TEST_PASSWORD + +sys.path.append(str(Path(__file__).resolve().parents[1])) + +from password_manager.entry_management import EntryManager +from password_manager.backup import BackupManager +from password_manager.manager import PasswordManager, EncryptionMode +from password_manager.config_manager import ConfigManager + + +class FakePasswordGenerator: + def generate_password(self, length: int, index: int) -> str: # noqa: D401 + return "pw" + + +def test_edit_tags_from_retrieve(monkeypatch): + with TemporaryDirectory() as tmpdir: + tmp_path = Path(tmpdir) + vault, enc_mgr = create_vault(tmp_path, TEST_SEED, TEST_PASSWORD) + cfg_mgr = ConfigManager(vault, tmp_path) + backup_mgr = BackupManager(tmp_path, cfg_mgr) + entry_mgr = EntryManager(vault, backup_mgr) + + pm = PasswordManager.__new__(PasswordManager) + pm.encryption_mode = EncryptionMode.SEED_ONLY + pm.encryption_manager = enc_mgr + pm.vault = vault + pm.entry_manager = entry_mgr + pm.backup_manager = backup_mgr + pm.password_generator = FakePasswordGenerator() + pm.parent_seed = TEST_SEED + pm.nostr_client = SimpleNamespace() + pm.fingerprint_dir = tmp_path + pm.secret_mode_enabled = False + + index = entry_mgr.add_entry("example.com", 8, tags=["old"]) + + inputs = iter([str(index), "t", "newtag", ""]) + monkeypatch.setattr("builtins.input", lambda *a, **k: next(inputs)) + + pm.handle_retrieve_entry() + + entry = entry_mgr.retrieve_entry(index) + assert entry.get("tags", []) == ["newtag"]