open-aea-cli-ipfs 2.2.4__tar.gz → 2.2.6__tar.gz

{open_aea_cli_ipfs-2.2.4/open_aea_cli_ipfs.egg-info → open_aea_cli_ipfs-2.2.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: open-aea-cli-ipfs
-Version: 2.2.4
+Version: 2.2.6
 Summary: CLI extension for open AEA framework wrapping IPFS functionality.
 Author: Valory AG
 License: Apache-2.0

{open_aea_cli_ipfs-2.2.4 → open_aea_cli_ipfs-2.2.6}/aea_cli_ipfs/ipfs_client.py

@@ -70,6 +70,59 @@ class ErrorResponse(StatusError):
     """IPFS daemon returned a JSON error message."""
 
 
+# ---------------------------------------------------------------------------
+# Response parsing
+# ---------------------------------------------------------------------------
+
+
+_SAFE_PREVIEW_LIMIT = 80
+
+
+def _safe_preview(body: Union[bytes, str]) -> str:
+    """Render a short, printable preview of a response body for diagnostic messages.
+
+    Bytes are decoded with ``errors="replace"``, non-printable characters are
+    replaced with ``.`` (to prevent terminal-control or NUL bytes from
+    landing in logs) and the result is truncated to keep error messages and
+    logs scan-friendly.
+
+    :param body: the raw body bytes or text from the daemon.
+    :return: a short printable preview string suitable for inclusion in
+        ``StatusError`` messages and logs.
+    """
+    text = body.decode("utf-8", errors="replace") if isinstance(body, bytes) else body
+    safe = "".join(c if c.isprintable() else "." for c in text)
+    if len(safe) > _SAFE_PREVIEW_LIMIT:
+        safe = safe[:_SAFE_PREVIEW_LIMIT] + "..."
+    return safe
+
+
+def _safe_json_loads(body: Union[bytes, str], context: str) -> Any:
+    """Parse a successful IPFS response body as JSON, raising StatusError on failure.
+
+    The 200-status error-body branches already wrap ``json.loads`` in a
+    ``ValueError``/``KeyError`` guard. This helper extends that guard to the
+    success path so a 200 with a non-JSON body (CDN/proxy HTML error page,
+    truncated response, gzipped payload) surfaces as a typed ``StatusError``
+    rather than an unhandled ``ValueError`` in the caller. The body preview
+    embedded in the exception message is truncated and printable-only so
+    that arbitrary remote bytes cannot inject terminal-control sequences or
+    fill logs.
+
+    :param body: the response body bytes or text from the IPFS daemon.
+    :param context: short label describing the call site for diagnostic messages.
+    :return: the decoded JSON payload.
+    :raises StatusError: if ``body`` is not valid JSON.
+    """
+    try:
+        return json.loads(body)
+    except ValueError as exc:
+        raise StatusError(
+            f"IPFS API returned 200 but body is not JSON ({context}): "
+            f"{_safe_preview(body)!r}"
+        ) from exc
+
+
 # ---------------------------------------------------------------------------
 # Multipart encoding for the IPFS /api/v0/add endpoint
 # ---------------------------------------------------------------------------
@@ -387,10 +440,10 @@ class IPFSHTTPClient:
             for line in text.strip().split("\n"):
                 line = line.strip()
                 if line:
-                    results.append(json.loads(line))
+                    results.append(_safe_json_loads(line, f"{endpoint} stream"))
             return results
 
-        return json.loads(body)
+        return _safe_json_loads(body, endpoint)
 
     def id(self, peer: Optional[str] = None) -> Dict:
         """Get node identity info."""
@@ -449,7 +502,7 @@ class IPFSHTTPClient:
         for line in text.strip().split("\n"):
             line = line.strip()
             if line:
-                results.append(json.loads(line))
+                results.append(_safe_json_loads(line, "/add stream"))
 
         # Match ipfshttpclient behavior: single-item result returns a dict,
         # multi-item result returns a list
@@ -480,7 +533,7 @@ class IPFSHTTPClient:
             except (ValueError, KeyError):
                 pass
             raise StatusError(f"IPFS API returned status {status}: {text}")
-        result = json.loads(resp_body)
+        result = _safe_json_loads(resp_body, "/add")
         if "Hash" not in result:
             raise StatusError(f"IPFS API response missing 'Hash' key: {result}")
         return result["Hash"]

{open_aea_cli_ipfs-2.2.4 → open_aea_cli_ipfs-2.2.6/open_aea_cli_ipfs.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: open-aea-cli-ipfs
-Version: 2.2.4
+Version: 2.2.6
 Summary: CLI extension for open AEA framework wrapping IPFS functionality.
 Author: Valory AG
 License: Apache-2.0

{open_aea_cli_ipfs-2.2.4 → open_aea_cli_ipfs-2.2.6}/setup.py

@@ -34,7 +34,7 @@ def _read_long_description() -> str:
 
 setup(
     name="open-aea-cli-ipfs",
-    version="2.2.4",
+    version="2.2.6",
     author="Valory AG",
     license="Apache-2.0",
     description="CLI extension for open AEA framework wrapping IPFS functionality.",

{open_aea_cli_ipfs-2.2.4 → open_aea_cli_ipfs-2.2.6}/tests/test_ipfs_client.py

@@ -330,6 +330,64 @@ class TestAddBytesErrorHandling:
             client.add_bytes(b"data")
 
 
+class TestSuccessPathJSONSafety:
+    """Tests for typed errors on non-JSON 200 responses.
+
+    The success-path ``json.loads`` calls in ``_api_post``, ``add``, and
+    ``add_bytes`` route through ``_safe_json_loads`` so a 200 carrying a
+    non-JSON body raises a typed ``StatusError`` instead of an unhandled
+    ``ValueError`` in the caller.
+    """
+
+    @patch("aea_cli_ipfs.ipfs_client.urllib.request.urlopen")
+    def test_add_bytes_non_json_200_raises_status_error(
+        self, mock_urlopen: MagicMock
+    ) -> None:
+        """Test add_bytes raises StatusError when the 200 body is not JSON."""
+        mock_urlopen.return_value = _mock_urlopen(200, b"<html>Bad Gateway</html>")
+        client = IPFSHTTPClient("/ip4/127.0.0.1/tcp/5001")
+        with pytest.raises(StatusError, match="not JSON"):
+            client.add_bytes(b"data")
+
+    @patch("aea_cli_ipfs.ipfs_client.urllib.request.urlopen")
+    def test_add_stream_malformed_line_raises_status_error(
+        self, mock_urlopen: MagicMock
+    ) -> None:
+        """Test add raises StatusError when a stream line is not JSON."""
+        ndjson = '{"Name":"a.txt","Hash":"Qm1"}\nnot json at all\n'
+        mock_urlopen.return_value = _mock_urlopen(200, ndjson.encode())
+
+        with tempfile.TemporaryDirectory() as tmp:
+            root = Path(tmp) / "mydir"
+            root.mkdir()
+            (root / "a.txt").write_text("aaa")
+
+            client = IPFSHTTPClient("/ip4/127.0.0.1/tcp/5001")
+            with pytest.raises(StatusError, match="not JSON"):
+                client.add(str(root))
+
+    @patch("aea_cli_ipfs.ipfs_client.urllib.request.urlopen")
+    def test_api_post_non_json_200_raises_status_error(
+        self, mock_urlopen: MagicMock
+    ) -> None:
+        """Test _api_post (non-stream) raises StatusError when the 200 body is not JSON."""
+        mock_urlopen.return_value = _mock_urlopen(200, b"not json")
+        client = IPFSHTTPClient("/ip4/127.0.0.1/tcp/5001")
+        with pytest.raises(StatusError, match="not JSON"):
+            client.id()
+
+    @patch("aea_cli_ipfs.ipfs_client.urllib.request.urlopen")
+    def test_api_post_stream_malformed_line_raises_status_error(
+        self, mock_urlopen: MagicMock
+    ) -> None:
+        """Test _api_post (stream) raises StatusError when a stream line is not JSON."""
+        ndjson = '{"Key":"Qm1"}\n<html>oops</html>\n'
+        mock_urlopen.return_value = _mock_urlopen(200, ndjson.encode())
+        client = IPFSHTTPClient("/ip4/127.0.0.1/tcp/5001")
+        with pytest.raises(StatusError, match="not JSON"):
+            client.repo.gc()
+
+
 class TestTarSafety:
     """Tests for tar extraction safety."""