Merge branch 'extensions_for_all' into lnaddress_inc

tests/unit/test_fiat_providers.py

@@ -1445,10 +1445,14 @@ def test_check_revolut_signature_docs_vector(mocker: MockerFixture):
     secret = "wsk_r59a4HfWVAKycbCaNO1RvgCJec02gRd8"
     sig = "v1=bca326fb378d0da7f7c490ad584a8106bab9723d8d9cdd0d50b4c5b3be3837c0"
 
+    # This is a fixed vector straight from Revolut's docs, so its timestamp is
+    # necessarily in the past. Freeze time to it instead of growing
+    # tolerance_seconds indefinitely as real time marches on.
     mocker.patch(
         "lnbits.core.services.fiat_providers.time.time",
         return_value=int(timestamp) / 1000,
     )
+    check_revolut_signature(payload, sig, timestamp, secret)
 
     check_revolut_signature(payload, sig, timestamp, secret)
 

tests/unit/test_wasm_extension_routes.py

@@ -0,0 +1,81 @@
+from __future__ import annotations
+
+from collections.abc import AsyncIterator
+from typing import cast
+
+import pytest
+from fastapi import Request
+
+from lnbits.core.wasm_ext.routes.api import (
+    WasmRequestBodyTooLargeError,
+    _read_api_payload,
+    _read_json_object_with_size,
+)
+
+
+@pytest.mark.anyio
+async def test_wasm_json_reader_rejects_large_content_length_without_reading():
+    request = _FakeRequest([b"{}"], content_length="11")
+
+    with pytest.raises(WasmRequestBodyTooLargeError, match="11 bytes"):
+        await _read_json_object_with_size(cast(Request, request), max_body_bytes=10)
+
+    assert request.stream_started is False
+
+
+@pytest.mark.anyio
+async def test_wasm_json_reader_rejects_large_stream_without_content_length():
+    request = _FakeRequest([b'{"value":"', b"x" * 20, b'"}'])
+
+    with pytest.raises(WasmRequestBodyTooLargeError):
+        await _read_json_object_with_size(cast(Request, request), max_body_bytes=16)
+
+    assert request.stream_started is True
+
+
+@pytest.mark.anyio
+async def test_wasm_api_payload_records_actual_body_bytes():
+    body = b'{"amount":21}'
+    request = _FakeRequest(
+        [body],
+        path_params={"invoice_id": "abc"},
+        query_params={"include_paid": "true"},
+    )
+
+    payload = await _read_api_payload(
+        cast(Request, request),
+        {"invoice_id": "invoiceId"},
+        max_body_bytes=100,
+    )
+
+    assert payload.data == {
+        "invoiceId": "abc",
+        "includePaid": "true",
+        "amount": 21,
+    }
+    assert payload.request_bytes == len(body)
+
+
+class _FakeRequest:
+    method = "POST"
+
+    def __init__(
+        self,
+        chunks: list[bytes],
+        *,
+        content_length: str | None = None,
+        path_params: dict[str, str] | None = None,
+        query_params: dict[str, str] | None = None,
+    ) -> None:
+        self._chunks = chunks
+        self.headers: dict[str, str] = {}
+        if content_length is not None:
+            self.headers["content-length"] = content_length
+        self.path_params = path_params or {}
+        self.query_params = query_params or {}
+        self.stream_started = False
+
+    async def stream(self) -> AsyncIterator[bytes]:
+        self.stream_started = True
+        for chunk in self._chunks:
+            yield chunk