diff --git a/helpers.py b/helpers.py index ccc85f7..a624226 100644 --- a/helpers.py +++ b/helpers.py @@ -1,7 +1,7 @@ from datetime import datetime, timezone -import httpx from lnbits.core.services import get_pr_from_lnurl, pay_invoice +from lnbits.utils.safe_http import SafeHttpClient from .crud import ( get_all_unpaid_players, @@ -12,7 +12,7 @@ async def get_latest_block(mempool: str): - async with httpx.AsyncClient() as client: + async with SafeHttpClient() as client: response = await client.get(f"{mempool}/api/blocks") assert response.status_code == 200 return response.json()[0] diff --git a/pyproject.toml b/pyproject.toml index 2b06c1e..bb81ba8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,7 +5,7 @@ requires-python = ">=3.10,<3.14" description = "LNbits, free and open-source Lightning wallet and accounts system." authors = [{ name = "Alan Bits", email = "alan@lnbits.com" }] urls = { Homepage = "https://lnbits.com", Repository = "https://github.com/lnbits/numberlottery" } -dependencies = [ "lnbits>=1.7.0rc1" ] +dependencies = [ "lnbits==1.7.0rc2" ] [dependency-groups] dev = [ diff --git a/tests/test_lnurl_security.py b/tests/test_lnurl_security.py new file mode 100644 index 0000000..0dc30ff --- /dev/null +++ b/tests/test_lnurl_security.py @@ -0,0 +1,98 @@ +import json +from datetime import datetime, timedelta +from ipaddress import ip_address +from types import SimpleNamespace +from unittest.mock import AsyncMock + +import pytest +from lnbits.core.services import lnurl as core_lnurl +from lnbits.settings import settings +from starlette.exceptions import HTTPException + +from .. import views_api as views + + +@pytest.fixture +def anyio_backend(): + return "asyncio" + + +@pytest.fixture +def game_route(monkeypatch): + payment = SimpleNamespace(payment_hash="payment-hash", bolt11="invoice") + create = AsyncMock(return_value=payment) + monkeypatch.setattr(views, "create_invoice", create) + monkeypatch.setattr(settings, "lnbits_callback_url_rules", []) + monkeypatch.setattr(settings, "lnbits_lnurl_allow_private_ips", False) + monkeypatch.setattr( + views, + "get_game", + AsyncMock( + return_value=SimpleNamespace( + completed=False, + closing_date=datetime.now() + timedelta(hours=2), + buy_in_max=100, + odds=10, + wallet="wallet", + name="game", + ) + ), + ) + data = SimpleNamespace( + game_id="game", ln_address="alice@pay.example", buy_in=21, block_number=5 + ) + route = views.api_create_player + return route, data, create + + +@pytest.mark.anyio +async def test_private_lnurl_rejected_before_invoice(game_route, monkeypatch): + route, data, create = game_route + assert views.lnurl_handle is core_lnurl.handle + monkeypatch.setattr( + core_lnurl, + "_resolve_lnurl_host", + AsyncMock(return_value=[ip_address("127.0.0.1")]), + ) + send = AsyncMock() + monkeypatch.setattr(core_lnurl, "_send_lnurl_request", send) + with pytest.raises(HTTPException) as exc: + await route(data) + assert exc.value.status_code == 400 + create.assert_not_awaited() + send.assert_not_awaited() + + +@pytest.mark.anyio +async def test_public_lnurl_preserves_invoice_amount_wallet_and_metadata( + game_route, monkeypatch +): + route, data, create = game_route + monkeypatch.setattr( + core_lnurl, + "_resolve_lnurl_host", + AsyncMock(return_value=[ip_address("93.184.216.34")]), + ) + response = { + "tag": "payRequest", + "callback": "https://pay.example/callback", + "minSendable": 1000, + "maxSendable": 100000000, + "metadata": '[["text/plain","Test payment"]]', + } + monkeypatch.setattr( + core_lnurl, + "_send_lnurl_request", + AsyncMock(return_value=(200, {}, json.dumps(response).encode())), + ) + result = await route(data) + assert result == {"payment_hash": "payment-hash", "payment_request": "invoice"} + args = create.await_args.kwargs + assert args["wallet_id"] == "wallet" + assert args["amount"] == 21 + assert args["extra"] == { + "tag": "numberlottery", + "ln_address": data.ln_address, + "game_id": "game", + "block_number": 5, + } diff --git a/uv.lock b/uv.lock index fdfeb40..28fea20 100644 --- a/uv.lock +++ b/uv.lock @@ -1131,7 +1131,7 @@ wheels = [ [[package]] name = "lnbits" -version = "1.7.0rc1" +version = "1.7.0rc2" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "aiosqlite" }, @@ -1184,9 +1184,9 @@ dependencies = [ { name = "websocket-client" }, { name = "websockets" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/eb/d0/f3c539ba700ea8c6441ce1487fc6f0b99b610cc62b0021ffefe06e501c84/lnbits-1.7.0rc1.tar.gz", hash = "sha256:2205c9e211198947c53997772f08ddc24f5d6b9fb2aad409b92f0852217556f2", size = 6254983, upload-time = "2026-10-29T11:17:31.885Z" } +sdist = { url = "https://files.pythonhosted.org/packages/7c/d9/0af67927194d744909bd6cfbe38a07f31a271eff9e1071023c6b78818835/lnbits-1.7.0rc2.tar.gz", hash = "sha256:93df2edd2231bee38b073b56f26aabbf8d25636fc24355208581d687020c7fd3", size = 6284276, upload-time = "2026-11-09T14:46:51.862Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/21/a6/1509a06ca8d6de2516d13bea286eda81fca88c732c36de9a01a711495cc3/lnbits-1.7.0rc1-py3-none-any.whl", hash = "sha256:d41a053af62dab452072a9d7efac43ead05d0e7314ed172ca103db62e1f12c66", size = 4452276, upload-time = "2026-10-29T11:17:29.533Z" }, + { url = "https://files.pythonhosted.org/packages/e7/88/3304ba60cd1da828f5a55030e4e946b85a185c6501f1c9267eca71607164/lnbits-1.7.0rc2-py3-none-any.whl", hash = "sha256:cab8cc8c4705684d2e347cbe68c0f3a4fb4573f1f0861b7e72e34599c3dad4c3", size = 4461220, upload-time = "2026-11-09T14:46:49.877Z" }, ] [[package]] @@ -1209,7 +1209,7 @@ dev = [ ] [package.metadata] -requires-dist = [{ name = "lnbits", specifier = ">=1.7.0rc1" }] +requires-dist = [{ name = "lnbits", specifier = "==1.7.0rc2" }] [package.metadata.requires-dev] dev = [ diff --git a/views_api.py b/views_api.py index 410086a..b8295d9 100644 --- a/views_api.py +++ b/views_api.py @@ -5,9 +5,9 @@ from lnbits.core.crud import get_user from lnbits.core.models import WalletTypeInfo from lnbits.core.services import create_invoice +from lnbits.core.services.lnurl import handle as lnurl_handle from lnbits.decorators import require_admin_key from lnurl import LnurlPayResponse -from lnurl import handle as lnurl_handle from starlette.exceptions import HTTPException from .crud import (