hbkit 0.4.7__tar.gz → 0.4.8__tar.gz

{hbkit-0.4.7 → hbkit-0.4.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: hbkit
-Version: 0.4.7
+Version: 0.4.8
 Summary: Recover files from Synology Hyper Backup (.hbk) archives without Synology software
 Project-URL: Homepage, https://github.com/YordiLorenzo/hbkit
 Project-URL: Source, https://github.com/YordiLorenzo/hbkit

{hbkit-0.4.7 → hbkit-0.4.8}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "hbkit"
-version = "0.4.7"
+version = "0.4.8"
 description = "Recover files from Synology Hyper Backup (.hbk) archives without Synology software"
 readme = "README.md"
 requires-python = ">=3.10"

{hbkit-0.4.7 → hbkit-0.4.8}/src/hbkit/__init__.py

@@ -1,6 +1,6 @@
 """hbkit - recover files from Synology Hyper Backup (.hbk) archives without Synology software."""
 
-__version__ = "0.4.7"
+__version__ = "0.4.8"
 
 from .archive import (Archive, NeedPassword, UnsupportedArchive,  # noqa: F401
                       find_archive_root, is_archive)

{hbkit-0.4.7 → hbkit-0.4.8}/src/hbkit/cli.py

@@ -92,6 +92,23 @@ def resolve_password(password):
     return password or os.environ.get("HBK_PASSWORD")
 
 
+def stdin_is_interactive():
+    """True when a password prompt can be answered: stdin is a real terminal/console."""
+    if not sys.stdin or not sys.stdin.isatty():
+        return False
+    if os.name != "nt":
+        return True
+    # `< NUL` is a character device, so isatty() is True; only a real console has a mode
+    import ctypes
+    import msvcrt
+    try:
+        h = msvcrt.get_osfhandle(sys.stdin.fileno())
+    except OSError:
+        return False
+    mode = ctypes.c_uint32()
+    return bool(ctypes.windll.kernel32.GetConsoleMode(ctypes.c_void_p(h), ctypes.byref(mode)))
+
+
 def open_archive(archive, password=None):
     """Open, prompting for a password only if the archive turns out to be encrypted."""
     try:
@@ -99,7 +116,7 @@ def open_archive(archive, password=None):
     except hbk.NeedPassword:
         pw = resolve_password(password)
         if not pw:
-            if not sys.stdin.isatty():
+            if not stdin_is_interactive():
                 sys.exit("archive is encrypted - pass --password or set HBK_PASSWORD")
             pw = getpass.getpass("archive password: ")
         try:

{hbkit-0.4.7 → hbkit-0.4.8}/tests/test_hbkit.py

@@ -303,6 +303,26 @@ def test_verify_rejects_options_it_does_not_take():
     assert "unknown option --version" in r.stderr
 
 
+def test_encrypted_archive_with_null_stdin_fails_instead_of_prompting(tmp_path):
+    """On Windows `< NUL` is a character device, so isatty() says True and getpass used
+    to wait on the console forever. Only enough of an archive to reach NeedPassword."""
+    import struct
+    header = struct.pack(">16I", hbk.MAGIC, 0, 0, 0, 56, *([0] * 11))
+    root = tmp_path / "enc.hbk"
+    for d in ("Config/virtual_file.index", "Pool/chunk_index",
+              "Config/file_chunk1.index", "Pool/0"):
+        (root / d).mkdir(parents=True)
+    (root / "Config/virtual_file.index/0.idx").write_bytes(header)
+    (root / "Pool/chunk_index/0.idx").write_bytes(header)
+    (root / "_Syno_TaskConfig").write_text('enable_data_encrypt="true"\n')
+    env = {k: v for k, v in os.environ.items() if k != "HBK_PASSWORD"}
+    r = subprocess.run([sys.executable, "-m", "hbkit.cli", str(root), "list"],
+                       stdin=subprocess.DEVNULL, capture_output=True, text=True,
+                       env=env, timeout=30, check=False)
+    assert r.returncode != 0, r.stderr
+    assert "pass --password or set HBK_PASSWORD" in r.stderr
+
+
 # ------------------------------------------------- shard maths (no archive needed)
 
 def _make_shards(tmp_path, sizes, shard_size, monkeypatch):