jwbmisc 0.0.5__tar.gz → 0.0.7__tar.gz

{jwbmisc-0.0.5/src/jwbmisc.egg-info → jwbmisc-0.0.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jwbmisc
-Version: 0.0.5
+Version: 0.0.7
 Summary: Misc util functions of jwb
 Author-email: Joachim Bargsten <jw@bargsten.org>
 License:                                  Apache License

{jwbmisc-0.0.5 → jwbmisc-0.0.7}/src/jwbmisc/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.0.5'
-__version_tuple__ = version_tuple = (0, 0, 5)
+__version__ = version = '0.0.7'
+__version_tuple__ = version_tuple = (0, 0, 7)
 
-__commit_id__ = commit_id = 'g68c0a3571'
+__commit_id__ = commit_id = 'g60a16ac84'

{jwbmisc-0.0.5 → jwbmisc-0.0.7}/src/jwbmisc/exec.py

@@ -9,6 +9,7 @@ def run_cmd(
     stdin=None,
     contains_sensitive_data=False,
     timeout=20,
+    cwd=None,
     decode=True,
     dry_run=False,
 ):
@@ -22,6 +23,9 @@ def run_cmd(
 
     cmd = [str(v) for v in cmd]
 
+    if cwd is not None:
+        cwd = str(cwd)
+
     if dry_run:
         print(cmd)
         if capture:
@@ -35,6 +39,7 @@ def run_cmd(
             env=env,
             check=True,
             timeout=timeout,
+            cwd=cwd,
             input=stdin,
         )
     except sp.CalledProcessError as ex:

{jwbmisc-0.0.5 → jwbmisc-0.0.7}/src/jwbmisc/keeper.py

@@ -1,4 +1,5 @@
 import json
+from typing import Any
 from keepercommander import vault
 from keepercommander import api
 from time import sleep
@@ -67,15 +68,41 @@ class MinimalKeeperUI:
         step.resume()
 
 
-def extract_record_field(record, field: str) -> str | None:
-    if not isinstance(record, vault.TypedRecord):
-        raise TypeError("only TypedRecord is supported")
+def as_strings(vs: list[Any] | Any) -> list[str]:
+    if not isinstance(vs, list):
+        vs = [vs]
+    return [str(v) for v in vs]
 
-    value = record.get_typed_field(field) or record.get_typed_field(None, field)
 
-    if value and value.value:
-        return value.value[0] if isinstance(value.value, list) else str(value.value)
+def extract_record_field(record, field: str | None) -> str | None | list[dict[str, str | list[str]]]:
+    if isinstance(record, vault.PasswordRecord):
+        values = [
+            {"type": "password", "label": "login", "value": as_strings(record.login)},
+            {"type": "password", "label": "password", "value": as_strings(record.password)},
+            {"type": "password", "label": "link", "value": as_strings(record.link)},
+        ] + [{"type": f.type, "label": f.name, "value": as_strings(f.value)} for f in record.custom]
 
+    elif isinstance(record, vault.TypedRecord):
+        fields = record.fields + record.custom
+        values = [{"type": f.type, "label": f.label, "value": as_strings(f.value)} for f in fields]
+    else:
+        raise TypeError("only TypedRecord & PasswordRecord are supported")
+
+    if not field:
+        return values
+
+    value = next(
+        (
+            v
+            for v in values
+            if (v["type"] and v["type"].lower() == field.lower())
+            or (v["label"] and v["label"].lower() == field.lower())
+        ),
+        None,
+    )
+
+    if value and value["value"]:
+        return value["value"][0]
     return None
 
 
@@ -105,7 +132,7 @@ def perform_login(params):
         raise KeyError(f"Keeper login failed: {e}") from e
 
 
-def get_password(record_uid: str, field_path: str) -> str:
+def get_password(record_uid: str, field_path: str | None) -> str:
     CONFIG_FILE.parent.mkdir(parents=True, exist_ok=True)
 
     params = KeeperParams(config_filename=str(CONFIG_FILE))

{jwbmisc-0.0.5 → jwbmisc-0.0.7}/src/jwbmisc/passwd.py

@@ -1,5 +1,6 @@
 import subprocess as sp
 import os
+from urllib.parse import urlparse, parse_qs
 from pathlib import Path
 
 PASS_BIN = os.environ.get("JWBMISC_PASS_BIN", "pass")
@@ -11,11 +12,18 @@ def get_pass(*pass_keys: str):
 
     for pass_key in pass_keys:
         if pass_key.startswith("pass://"):
-            k = pass_key.removeprefix("pass://")
-            lnum = 1
-            if "?" in k:
-                k, lnum = k.rsplit("?", 1)
-            return _call_unix_pass(k, int(lnum))
+            url = urlparse(pass_key, scheme="pass")
+            query = parse_qs(url.query)
+            lines = query.get("lines", ["1"])[0]
+            format = query.get("format", ["raw"])[0]
+            if lines == "all":
+                lines = None
+            else:
+                lines = [int(n) - 1 for n in lines.split(",")]
+            netloc = url.netloc.rstrip("/")
+            path = url.path.lstrip("/")
+            key = f"{netloc}/{path}".lstrip("/")
+            return _call_unix_pass(key, lines, format)
 
         if pass_key.startswith("env://"):
             env_var = pass_key.removeprefix("env://").replace("/", "__")
@@ -40,38 +48,35 @@ def get_pass(*pass_keys: str):
 
         if pass_key.startswith("keeper://"):
             path = pass_key.removeprefix("keeper://")
-            if "/" not in path:
-                raise KeyError("Invalid keeper:// format. Expected: keeper://RECORD_UID/field/fieldname")
 
-            record_uid, field_path = path.split("/", 1)
-            return _keeper_password(record_uid, field_path)
+            parts = path.split("/")
+            return _keeper_password(*parts)
 
     raise KeyError(f"Could not acquire password from one of {pass_keys}")
 
 
-def _call_unix_pass(key, lnum=1):
+def _call_unix_pass(key: str, idcs: list[int] | None = None, format: str = "list") -> str | list[str] | None:
     proc = sp.Popen([PASS_BIN, "show", key], stdout=sp.PIPE, stderr=sp.PIPE, encoding="utf-8")
     value, stderr = proc.communicate()
 
     if proc.returncode != 0:
         raise KeyError(f"pass failed for '{key}': {stderr.strip()}")
 
-    if lnum is None or lnum == 0:
-        return value.strip()
-    lines = value.splitlines()
+    if idcs is None or idcs == [-1]:
+        return value.rstrip()
 
+    lines = value.splitlines()
     try:
-        if isinstance(lnum, list):
-            pw = [lines[ln - 1].strip() for ln in lnum]
-        else:
-            pw = lines[lnum - 1].strip()
+        lines = [lines[idx] for idx in idcs]
     except IndexError:
-        raise KeyError(f"could not retrieve lines {lnum} for {key}")
+        raise KeyError(f"could not retrieve line idcs {idcs} for {key}")
 
-    return pw
+    if format == "list":
+        return lines
+    return "\n".join(lines)
 
 
-def _keeper_password(record_uid: str, field_path: str) -> str:
+def _keeper_password(record_uid: str, field_path: str | None = None) -> str:
     from .keeper import get_password as keeper_get_password
 
     return keeper_get_password(record_uid, field_path)

{jwbmisc-0.0.5 → jwbmisc-0.0.7/src/jwbmisc.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jwbmisc
-Version: 0.0.5
+Version: 0.0.7
 Summary: Misc util functions of jwb
 Author-email: Joachim Bargsten <jw@bargsten.org>
 License:                                  Apache License

{jwbmisc-0.0.5 → jwbmisc-0.0.7}/tests/test_passwd.py

@@ -13,18 +13,18 @@ class TestUnixPass:
         assert result == "password123"
 
     def test_pass_url_with_line_number(self):
-        result = pw.get_pass("pass://test/multiline?2")
+        result = pw.get_pass("pass://test/multiline?lines=2")
         assert result == "line2"
 
     def test_pass_url_with_all_lines(self):
-        result = pw.get_pass("pass://test/multiline?0")
+        result = pw.get_pass("pass://test/multiline?lines=all&format=list")
         assert "line1" in result
         assert "line2" in result
         assert "line3" in result
 
     def test_pass_url_with_invalid_line_number(self):
         with pytest.raises(KeyError):
-            pw.get_pass("pass://test/multiline?99")
+            pw.get_pass("pass://test/multiline?lines=99")
 
 
 class TestGetPass: