walla-cli 0.1.2__tar.gz → 0.1.3__tar.gz

{walla_cli-0.1.2 → walla_cli-0.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: walla-cli
-Version: 0.1.2
+Version: 0.1.3
 Summary: Wallapop.es CLI - look · offer · talk for humans and agents
 Project-URL: Homepage, https://github.com/berendgort/wallapop-cli
 Project-URL: Repository, https://github.com/berendgort/wallapop-cli

{walla_cli-0.1.2 → walla_cli-0.1.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "walla-cli"
-version = "0.1.2"
+version = "0.1.3"
 description = "Wallapop.es CLI - look · offer · talk for humans and agents"
 authors = [{ name = "Dr. Berend Gort", email = "berend.gort@gmail.com" }]
 readme = "README.md"

{walla_cli-0.1.2 → walla_cli-0.1.3}/tests/test_session_store.py

@@ -53,3 +53,23 @@ def test_parse_cookie_missing(tmp_path: Path) -> None:
     f.write_text("foo=bar\n", encoding="utf-8")
     with pytest.raises(WallaAuthError):
         parse_cookie_export(f)
+
+
+def test_parse_cookie_editor_name_colon_quotes() -> None:
+    from walla.account.cookies import parse_cookie_text
+
+    raw = '__Secure-next-auth.session-token:"eyJhbGci.aaa.bbb"'
+    cookie, _ = parse_cookie_text(raw)
+    assert cookie == "eyJhbGci.aaa.bbb"
+
+
+def test_login_cookie_text_does_not_treat_blob_as_path() -> None:
+    from unittest.mock import patch
+
+    from walla.account.login import login_cookie_text
+
+    blob = '__Secure-next-auth.session-token:"' + ("x." * 400) + 'yyy"'
+    with patch("walla.account.login._session_from_cookie") as mock_sess:
+        mock_sess.return_value = SessionData(access_token="t", session_cookie="c")
+        login_cookie_text(blob)
+    assert mock_sess.call_args[0][0].startswith("x.")

{walla_cli-0.1.2 → walla_cli-0.1.3}/walla/__init__.py

@@ -4,4 +4,4 @@ from __future__ import annotations
 
 __all__ = ("__version__",)
 
-__version__ = "0.1.2"
+__version__ = "0.1.3"

{walla_cli-0.1.2 → walla_cli-0.1.3}/walla/account/cookies.py

@@ -64,25 +64,57 @@ def _from_text(text: str) -> tuple[str, str | None]:
             if len(fields) >= 7:
                 name, value = fields[5], fields[6]
                 if name == SESSION_COOKIE:
-                    session = value
+                    session = _strip_quotes(value)
                 elif name == "device_id":
-                    device = value
+                    device = _strip_quotes(value)
             continue
         line = line.removeprefix("Cookie:").strip()
+        # Cookie-Editor sometimes copies: name:"value" or name=value
+        if SESSION_COOKIE in line and (":" in line or "=" in line):
+            extracted = _extract_named(line, SESSION_COOKIE)
+            if extracted:
+                session = extracted
+                continue
         for pair in line.split(";"):
             pair = pair.strip()
-            if "=" not in pair:
+            if "=" not in pair and ":" not in pair:
                 if pair.count(".") >= 2 and len(pair) > 100:
-                    session = pair
+                    session = _strip_quotes(pair)
                 continue
-            name, _, value = pair.partition("=")
-            name, value = name.strip(), value.strip()
+            name, value = _split_pair(pair)
             if name == SESSION_COOKIE:
                 session = value
             elif name == "device_id":
                 device = value
     if not session and text.count(".") >= 2 and len(text.strip()) > 100:
-        session = text.strip()
+        session = _strip_quotes(text.strip())
     if not session:
         raise WallaAuthError(f"no {SESSION_COOKIE} in cookie paste")
     return session, device
+
+
+def _strip_quotes(value: str) -> str:
+    v = value.strip()
+    if len(v) >= 2 and v[0] == v[-1] and v[0] in "'\"":
+        return v[1:-1]
+    return v
+
+
+def _split_pair(pair: str) -> tuple[str, str]:
+    if "=" in pair:
+        name, _, value = pair.partition("=")
+    else:
+        name, _, value = pair.partition(":")
+    return name.strip(), _strip_quotes(value.strip())
+
+
+def _extract_named(line: str, cookie_name: str) -> str | None:
+    for sep in (":", "="):
+        prefix = f"{cookie_name}{sep}"
+        if line.startswith(prefix):
+            return _strip_quotes(line[len(prefix) :].strip())
+        # also tolerate leading junk
+        idx = line.find(prefix)
+        if idx >= 0:
+            return _strip_quotes(line[idx + len(prefix) :].strip())
+    return None

{walla_cli-0.1.2 → walla_cli-0.1.3}/walla/account/login.py

@@ -28,13 +28,28 @@ __all__ = (
 
 def login_cookie_text(text: str) -> SessionData:
     """Primary path: pasted cookie value, Cookie header, or export body."""
-    path_candidate = Path(text.strip()).expanduser()
-    if path_candidate.is_file():
-        return login_cookies(path_candidate)
-    cookie, device = parse_cookie_text(text)
+    stripped = text.strip()
+    if _looks_like_cookie_file_path(stripped):
+        return login_cookies(Path(stripped).expanduser())
+    cookie, device = parse_cookie_text(stripped)
     return _session_from_cookie(cookie, device)
 
 
+def _looks_like_cookie_file_path(text: str) -> bool:
+    """True only for short path-like pastes; never treat JWT blobs as paths."""
+    if "\n" in text or len(text) > 512:
+        return False
+    if text.count(".") >= 2 and len(text) > 80 and "/" not in text and "\\" not in text:
+        return False
+    if SESSION_COOKIE in text or text.startswith("eyJ") or ':"' in text:
+        return False
+    path = Path(text).expanduser()
+    try:
+        return path.is_file()
+    except OSError:
+        return False
+
+
 def login_cookies(path: Path) -> SessionData:
     cookie, device = parse_cookie_export(path)
     return _session_from_cookie(cookie, device)

{walla_cli-0.1.2 → walla_cli-0.1.3}/walla/account/prompt.py

@@ -37,6 +37,8 @@ How to get your Wallapop session cookie
      - Double-click the Value cell -> Ctrl+C / Cmd+C
 
 4. Paste that long string below (one line), then press Enter.
+   Paste ONLY the Value (starts with eyJ...), or Cookie-Editor's
+   name:"value" form is also OK.
    Do NOT paste your password. Do NOT share this cookie in chat.
 
 Optional: save an export as cookies.txt and paste the file path instead.