jwbmisc 0.0.4__py3-none-any.whl → 0.0.6__py3-none-any.whl

jwbmisc/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.0.4'
-__version_tuple__ = version_tuple = (0, 0, 4)
+__version__ = version = '0.0.6'
+__version_tuple__ = version_tuple = (0, 0, 6)
 
 __commit_id__ = commit_id = None

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/keeper.py

@@ -1,5 +1,6 @@
 import json
-from keepercommander import vault as keeper_vault
+from typing import Any
+from keepercommander import vault
 from keepercommander import api
 from time import sleep
 from keepercommander.params import KeeperParams
@@ -13,8 +14,10 @@ from logging import getLogger
 
 logger = getLogger(__name__)
 
+CONFIG_FILE = Path.home() / ".config" / "jwbmisc" / "keeper.json"
 
-class _MinimalKeeperUI:
+
+class MinimalKeeperUI:
     def __init__(self):
         self.waiting_for_sso_data_key = False
 
@@ -65,19 +68,45 @@ class _MinimalKeeperUI:
         step.resume()
 
 
-def _extract_keeper_field(record, field: str) -> str | None:
-    if isinstance(record, keeper_vault.TypedRecord):
-        value = record.get_typed_field(field)
-        if value is None:
-            value = next((f for f in record.custom if f.label == field), None)
+def as_strings(vs: list[Any] | Any) -> list[str]:
+    if not isinstance(vs, list):
+        vs = [vs]
+    return [str(v) for v in vs]
+
 
-        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
 
 
-def _perform_keeper_login(params):
+def perform_login(params):
     if not params.user:
         user = os.environ.get("KEEPER_USERNAME", None)
         if user is None:
@@ -96,29 +125,28 @@ def _perform_keeper_login(params):
         params.server = server
 
     try:
-        api.login(params, login_ui=_MinimalKeeperUI())
+        api.login(params, login_ui=MinimalKeeperUI())
     except KeyboardInterrupt:
         raise KeyError("\nKeeper login cancelled by user.") from None
     except Exception as e:
         raise KeyError(f"Keeper login failed: {e}") from e
 
 
-def get_keeper_password(record_uid: str, field_path: str) -> str:
-    config_file = Path.home() / ".config" / "keeper" / "config.json"
-    config_file.parent.mkdir(parents=True, exist_ok=True)
+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))
+    params = KeeperParams(config_filename=str(CONFIG_FILE))
 
-    if config_file.exists():
+    if CONFIG_FILE.exists():
         try:
-            params.config = json.loads(config_file.read_text())
+            params.config = json.loads(CONFIG_FILE.read_text())
             loader.load_config_properties(params)
             if not params.session_token:
                 raise ValueError("No session token")
         except Exception:
-            _perform_keeper_login(params)
+            perform_login(params)
     else:
-        _perform_keeper_login(params)
+        perform_login(params)
 
     try:
         api.sync_down(params)
@@ -126,11 +154,11 @@ def get_keeper_password(record_uid: str, field_path: str) -> str:
         raise KeyError(f"Failed to sync Keeper vault: {e}") from e
 
     try:
-        record = keeper_vault.KeeperRecord.load(params, record_uid)
+        record = vault.KeeperRecord.load(params, record_uid)
     except Exception as e:
         raise KeyError(f"Record {record_uid} not found: {e}") from e
 
-    value = _extract_keeper_field(record, field_path)
+    value = extract_record_field(record, field_path)
     if value is None:
         raise KeyError(f"Field '{field_path}' not found in record {record_uid}")
 

jwbmisc/passwd.py

@@ -40,11 +40,9 @@ 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}")
 
@@ -71,7 +69,7 @@ def _call_unix_pass(key, lnum=1):
     return pw
 
 
-def _keeper_password(record_uid: str, field_path: str) -> str:
-    from .keeper import get_keeper_password
+def _keeper_password(record_uid: str, field_path: str | None = None) -> str:
+    from .keeper import get_password as keeper_get_password
 
-    return get_keeper_password(record_uid, field_path)
+    return keeper_get_password(record_uid, field_path)

{jwbmisc-0.0.4.dist-info → jwbmisc-0.0.6.dist-info}/METADATA

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

jwbmisc-0.0.6.dist-info/RECORD

@@ -0,0 +1,15 @@
+jwbmisc/__init__.py,sha256=5VXxKCMejjLWaiECh64309WJ2LpHHSULxaGOvCAOzyU,581
+jwbmisc/_version.py,sha256=7MyqQ3iPP2mJruPfRYGCNCq1z7_Nk7c-eyYecYITxsY,704
+jwbmisc/collection.py,sha256=mICHxBFfk2XY8ajdWkLvmQF1R6oo6d0torpRAeDvd1c,663
+jwbmisc/exec.py,sha256=_3Xf0D342VDoVwtCZLjnyJ8N-WuHJfeIrBGFsL2qUW4,1260
+jwbmisc/fs.py,sha256=Vf28qbOnBeHEbXNMUZjOQXtMWBurjkzD2KmfV2gJQXM,599
+jwbmisc/interactive.py,sha256=qMgpQNHvUg4AYw-aAAy2qdxri1aKr-mffoLfUgh8TWE,423
+jwbmisc/json.py,sha256=h3CBDNNZjcTDxydViyydPsQufXQLuxqP24wBBAT2nDs,1198
+jwbmisc/keeper.py,sha256=mKhrUjNvlePxDv89tMcDs4dEgHWTVbtzMPH1jMRuylU,5201
+jwbmisc/passwd.py,sha256=UKQk9sDJFYQSqBvTjPjtYLC1arAol82GlUdlc_PK4Eo,2433
+jwbmisc/string.py,sha256=0_AvtAyXUlyVL6yw1iMjs3vMunubTTTWS0PSu_qKgi8,1232
+jwbmisc-0.0.6.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+jwbmisc-0.0.6.dist-info/METADATA,sha256=7ixSPZaGjryN7NKhu88Q9AAoMaAkU1E_Q25_48eXfT0,14507
+jwbmisc-0.0.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+jwbmisc-0.0.6.dist-info/top_level.txt,sha256=FqEYs8zdG3iGOJmC6cutDXfGQUNptzfYeKsaG43y1HE,8
+jwbmisc-0.0.6.dist-info/RECORD,,

jwbmisc-0.0.4.dist-info/RECORD

@@ -1,15 +0,0 @@
-jwbmisc/__init__.py,sha256=5VXxKCMejjLWaiECh64309WJ2LpHHSULxaGOvCAOzyU,581
-jwbmisc/_version.py,sha256=QlXZ5JTjE_pgpDaeHk0GTExkc75xUZFmd0hA7kGYCJ0,704
-jwbmisc/collection.py,sha256=mICHxBFfk2XY8ajdWkLvmQF1R6oo6d0torpRAeDvd1c,663
-jwbmisc/exec.py,sha256=9g1Jc7iDkBj1Y-dn5VhnwH1JqvWSbrFe6Mmvnf-iqag,1177
-jwbmisc/fs.py,sha256=Vf28qbOnBeHEbXNMUZjOQXtMWBurjkzD2KmfV2gJQXM,599
-jwbmisc/interactive.py,sha256=qMgpQNHvUg4AYw-aAAy2qdxri1aKr-mffoLfUgh8TWE,423
-jwbmisc/json.py,sha256=h3CBDNNZjcTDxydViyydPsQufXQLuxqP24wBBAT2nDs,1198
-jwbmisc/keeper.py,sha256=mm3lVUL0UzXzxIBgT3ZM60By-I4Sckozl4t74O3mvQQ,4324
-jwbmisc/passwd.py,sha256=cBCgy3NnLGa2-Fd7S4I_Qos9Taw7UpU-39k0RsKHs0U,2577
-jwbmisc/string.py,sha256=0_AvtAyXUlyVL6yw1iMjs3vMunubTTTWS0PSu_qKgi8,1232
-jwbmisc-0.0.4.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-jwbmisc-0.0.4.dist-info/METADATA,sha256=aVscIglVdplmuuHuZAfHjbl6gtWSIFegob1-FNbhHec,14507
-jwbmisc-0.0.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-jwbmisc-0.0.4.dist-info/top_level.txt,sha256=FqEYs8zdG3iGOJmC6cutDXfGQUNptzfYeKsaG43y1HE,8
-jwbmisc-0.0.4.dist-info/RECORD,,