basic-password-manager 0.4.0__tar.gz → 0.4.1__tar.gz

{basic_password_manager-0.4.0 → basic_password_manager-0.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: basic-password-manager
-Version: 0.4.0
+Version: 0.4.1
 Summary: The Paladin — a local encrypted password manager that lives in your terminal
 License-Expression: MIT
 Project-URL: Repository, https://github.com/Daisentaur/password-manager

{basic_password_manager-0.4.0 → basic_password_manager-0.4.1}/basic_password_manager.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: basic-password-manager
-Version: 0.4.0
+Version: 0.4.1
 Summary: The Paladin — a local encrypted password manager that lives in your terminal
 License-Expression: MIT
 Project-URL: Repository, https://github.com/Daisentaur/password-manager

{basic_password_manager-0.4.0 → basic_password_manager-0.4.1}/pw_manager/mobile.py

@@ -162,9 +162,7 @@ def _build_page(raw_vault: bytes) -> bytes:
     ).encode()
 
 
-def _serve(vault_path: str, token: str, port: int = 0) -> http.server.HTTPServer:
-    page_holder = {}
-
+def _serve(vault_path: str, token: str, port: int = 0, on_fetch=None) -> http.server.HTTPServer:
     class Handler(http.server.BaseHTTPRequestHandler):
         def do_GET(self):
             if self.path.rstrip("/") != f"/{token}":
@@ -177,11 +175,14 @@ def _serve(vault_path: str, token: str, port: int = 0) -> http.server.HTTPServer
             self.send_header("Cache-Control", "no-store")
             self.end_headers()
             self.wfile.write(page)
+            if on_fetch:
+                on_fetch()
 
         def log_message(self, *a):
-            pass  # keep the terminal clean
+            pass  # fetch visibility goes through on_fetch instead
 
-    return http.server.HTTPServer(("127.0.0.1", port), Handler)
+    # threading server: a phone holding a connection open can't stall shutdown
+    return http.server.ThreadingHTTPServer(("127.0.0.1", port), Handler)
 
 
 def _start_tunnel(cf: str, port: int) -> tuple[subprocess.Popen, str]:
@@ -204,7 +205,11 @@ def _start_tunnel(cf: str, port: int) -> tuple[subprocess.Popen, str]:
     raise MobileError("cloudflared didn't produce a tunnel URL in time")
 
 
-def run(vault_path: str, stable_url: str | None = None, port: int = 0) -> None:
+def start_session(
+    vault_path: str, stable_url: str | None = None, port: int = 0, on_fetch=None
+) -> tuple[http.server.HTTPServer, subprocess.Popen | None, str]:
+    """Start server (+ tunnel unless a stable URL is configured). Returns
+    (server, tunnel_process_or_None, full_url)."""
     if not os.path.exists(vault_path):
         raise MobileError(f"no vault at {vault_path} — run 'paladin init' first")
 
@@ -214,7 +219,7 @@ def run(vault_path: str, stable_url: str | None = None, port: int = 0) -> None:
         port = int(os.environ.get("PALADIN_MOBILE_PORT", "8787"))
 
     token = _load_token()
-    server = _serve(vault_path, token, port)
+    server = _serve(vault_path, token, port, on_fetch=on_fetch)
     port = server.server_address[1]
     threading.Thread(target=server.serve_forever, daemon=True).start()
 
@@ -222,10 +227,32 @@ def run(vault_path: str, stable_url: str | None = None, port: int = 0) -> None:
     if stable_url:
         base = stable_url.rstrip("/")  # your reverse proxy points here → 127.0.0.1:port
     else:
-        cf = cloudflared_path()
-        proc, tunnel_url = _start_tunnel(cf, port)
-        base = tunnel_url
-    url = f"{base}/{token}"
+        try:
+            cf = cloudflared_path()
+            proc, base = _start_tunnel(cf, port)
+        except BaseException:
+            server.shutdown()
+            raise
+    return server, proc, f"{base}/{token}"
+
+
+def stop_session(server, proc) -> None:
+    """Tunnel first (no new requests), then server; a second Ctrl+C during
+    cleanup must never produce a traceback."""
+    try:
+        if proc:
+            proc.terminate()
+        server.shutdown()
+    except KeyboardInterrupt:
+        pass
+
+
+def run(vault_path: str, stable_url: str | None = None, port: int = 0) -> None:
+    def fetched():
+        print(f"  vault page served to a device at {time.strftime('%H:%M:%S')}")
+
+    print("\n  creating your secure link…", flush=True)
+    server, proc, url = start_session(vault_path, stable_url, port, on_fetch=fetched)
 
     import qrcode
 
@@ -235,7 +262,7 @@ def run(vault_path: str, stable_url: str | None = None, port: int = 0) -> None:
     qr.print_ascii(invert=True)
     print(f"\n  {url}\n")
     print("  the master password is typed on your phone; only ciphertext leaves this machine.")
-    print("  Ctrl+C to stop the session.\n")
+    print("  every page load is logged below — Ctrl+C to stop the session.\n")
 
     try:
         while True:
@@ -243,6 +270,4 @@ def run(vault_path: str, stable_url: str | None = None, port: int = 0) -> None:
     except KeyboardInterrupt:
         print("\nsession ended.")
     finally:
-        server.shutdown()
-        if proc:
-            proc.terminate()
+        stop_session(server, proc)

{basic_password_manager-0.4.0 → basic_password_manager-0.4.1}/pw_manager/tui.py

@@ -7,7 +7,9 @@ and Textual's own built-in themes are available there too.
 
 import csv
 import os
+import time
 
+from rich.style import Style
 from rich.text import Text
 from textual.app import App, ComposeResult
 from textual.binding import Binding
@@ -158,6 +160,80 @@ class ImportModal(ModalScreen):
             self.dismiss(os.path.expanduser(event.value.strip()))
 
 
+def _qr_text(url: str, primary: str) -> Text:
+    """The QR as half-block art: theme-colored modules on white, darkened
+    until cameras can read it (contrast beats style, but we can have both)."""
+    import qrcode
+
+    r, g, b = logo._hex_rgb(primary)
+    while (r + g + b) / 765 > 0.45:
+        r, g, b = int(r * 0.8), int(g * 0.8), int(b * 0.8)
+    dark, light = f"rgb({r},{g},{b})", "rgb(255,255,255)"
+
+    qr = qrcode.QRCode(border=2)
+    qr.add_data(url)
+    qr.make()
+    matrix = qr.get_matrix()
+    if len(matrix) % 2:
+        matrix.append([False] * len(matrix[0]))
+    text = Text()
+    for top, bottom in zip(matrix[::2], matrix[1::2]):
+        for t, btm in zip(top, bottom):
+            text.append("▀", Style(color=dark if t else light, bgcolor=dark if btm else light))
+        text.append("\n")
+    return text
+
+
+class MobileModal(ModalScreen):
+    """Serve the vault to a phone without leaving the TUI. The session lives
+    while this modal is open; Esc ends it."""
+
+    BINDINGS = [Binding("escape", "dismiss", "stop session")]
+
+    def __init__(self) -> None:
+        super().__init__()
+        self.server = None
+        self.proc = None
+
+    def compose(self) -> ComposeResult:
+        with Vertical(classes="modal-box", id="mobile-box"):
+            yield Label("open on phone", classes="modal-title")
+            yield Static("creating your secure link…", id="qr")
+            yield Static("", id="mobile-status")
+            yield Static("esc ends the session", classes="modal-hint")
+
+    def on_mount(self) -> None:
+        self.run_worker(self._start, thread=True)
+
+    def _start(self) -> None:
+        from . import mobile
+
+        try:
+            self.server, self.proc, url = mobile.start_session(
+                VAULT_PATH, on_fetch=self._on_fetch
+            )
+        except Exception as e:  # show any failure in the modal, don't die silently
+            self.app.call_from_thread(
+                self.query_one("#qr", Static).update, f"couldn't start: {e}"
+            )
+            return
+        qr = _qr_text(url, self.app.current_theme.primary)
+        qr.append(f"\n{url}", Style(color=self.app.current_theme.primary))
+        self.app.call_from_thread(self.query_one("#qr", Static).update, qr)
+
+    def _on_fetch(self) -> None:
+        self.app.call_from_thread(
+            self.query_one("#mobile-status", Static).update,
+            f"vault page served to a device at {time.strftime('%H:%M:%S')}",
+        )
+
+    def on_unmount(self) -> None:
+        from . import mobile
+
+        if self.server:
+            mobile.stop_session(self.server, self.proc)
+
+
 class PasswdModal(ModalScreen):
     """Change the master password. Asks for the current one again so a
     walked-up-to unlocked session can't lock the real owner out."""
@@ -436,6 +512,10 @@ class PwApp(App):
         background: $surface;
         border: round $primary;
     }
+    #mobile-box {
+        width: auto;
+        max-width: 90%;
+    }
     .modal-title {
         color: $primary;
         text-style: bold;
@@ -485,13 +565,7 @@ class PwApp(App):
         self.push_screen(ImportModal(), done)
 
     def _mobile(self) -> None:
-        from . import mobile
-
-        with self.suspend():  # hand the terminal to the QR + tunnel until Ctrl+C
-            try:
-                mobile.run(VAULT_PATH)
-            except mobile.MobileError as e:
-                input(f"\n{e}\n\npress Enter to return… ")
+        self.push_screen(MobileModal())
 
     def _change_master(self) -> None:
         def done(new: str | None) -> None:

{basic_password_manager-0.4.0 → basic_password_manager-0.4.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "basic-password-manager"
-version = "0.4.0"
+version = "0.4.1"
 description = "The Paladin — a local encrypted password manager that lives in your terminal"
 readme = "README.md"
 license = "MIT"