Merge pull request #110 from voyager1708/restore-tests-and-peer-bak

Restore tests

Author: voyager1708

tests/bsv/__init__.py

@@ -0,0 +1 @@
+

tests/bsv/auth/__init__.py

@@ -0,0 +1 @@
+

tests/bsv/auth/clients/__init__.py

@@ -0,0 +1 @@
+

tests/bsv/auth/clients/test_auth_fetch.py

@@ -0,0 +1,118 @@
+import pytest
+from unittest.mock import AsyncMock, MagicMock
+from bsv.auth.clients.auth_fetch import AuthFetch, SimplifiedFetchRequestOptions
+from bsv.auth.requested_certificate_set import RequestedCertificateSet
+from bsv.auth.auth_message import AuthMessage
+from bsv.auth.peer import Peer, PeerOptions
+
+
+class DummyWallet:
+    def get_public_key(self, ctx, args, originator):
+        return {"publicKey": "02a1633c...", "derivationPrefix": "m/0"}
+
+    def create_action(self, ctx, args, originator):
+        return {"tx": "0100000001abcdef..."}
+
+    def create_signature(self, ctx, args, originator):
+        return {"signature": b"dummy_signature"}
+
+    def verify_signature(self, ctx, args, originator):
+        return {"valid": True}
+
+
+@pytest.mark.asyncio
+async def test_fetch_basic_request():
+    wallet = DummyWallet()
+    requested_certs = RequestedCertificateSet()
+    auth_fetch = AuthFetch(wallet, requested_certs)
+    url = "https://example.com/api"
+    config = SimplifiedFetchRequestOptions(method="GET", headers={"Accept": "application/json"})
+
+    # モックのPeerとTransport
+    mock_transport = MagicMock()
+    mock_transport.send = AsyncMock(return_value=None)
+    mock_transport.on_data = MagicMock(return_value=None)
+    peer_options = PeerOptions(wallet=wallet, transport=mock_transport, certificates_to_request=requested_certs)
+    mock_peer = Peer(peer_options)
+    mock_peer.get_authenticated_session = AsyncMock(return_value=MagicMock(peer_nonce="dummy", is_authenticated=True, peer_identity_key="dummy"))
+    mock_peer.to_peer = MagicMock(return_value=None)  # 同期メソッドとしてモック
+    mock_peer.listen_for_general_messages = MagicMock(return_value=1)
+    mock_peer.stop_listening_for_general_messages = MagicMock()
+
+    # peersにセット
+    auth_peer = auth_fetch.peers["https://example.com"] = MagicMock()
+    auth_peer.peer = mock_peer
+
+    auth_fetch.fetch(None, url, config)
+    mock_peer.to_peer.assert_called_once()
+
+@pytest.mark.asyncio
+async def test_fetch_with_auth_headers():
+    wallet = DummyWallet()
+    requested_certs = RequestedCertificateSet()
+    auth_fetch = AuthFetch(wallet, requested_certs)
+    url = "https://example.com/api"
+    config = SimplifiedFetchRequestOptions(
+        method="POST",
+        headers={"Content-Type": "application/json", "X-Auth-Required": "true"},
+        body=b'{"test": "data"}'
+    )
+    mock_transport = MagicMock()
+    mock_transport.send = AsyncMock(return_value=None)
+    mock_transport.on_data = MagicMock(return_value=None)
+    peer_options = PeerOptions(wallet=wallet, transport=mock_transport, certificates_to_request=requested_certs)
+    mock_peer = Peer(peer_options)
+    mock_peer.get_authenticated_session = AsyncMock(return_value=MagicMock(peer_nonce="dummy", is_authenticated=True, peer_identity_key="dummy"))
+    mock_peer.to_peer = MagicMock(return_value=None)  # 同期メソッドとしてモック
+    mock_peer.listen_for_general_messages = MagicMock(return_value=1)
+    mock_peer.stop_listening_for_general_messages = MagicMock()
+    auth_peer = auth_fetch.peers["https://example.com"] = MagicMock()
+    auth_peer.peer = mock_peer
+    auth_fetch.fetch(None, url, config)
+    mock_peer.to_peer.assert_called_once()
+
+@pytest.mark.asyncio
+async def test_fetch_error_handling():
+    wallet = DummyWallet()
+    requested_certs = RequestedCertificateSet()
+    auth_fetch = AuthFetch(wallet, requested_certs)
+    url = "https://example.com/api"
+    config = SimplifiedFetchRequestOptions(method="GET")
+    mock_transport = MagicMock()
+    mock_transport.send = AsyncMock(side_effect=Exception("Network error"))
+    mock_transport.on_data = MagicMock(return_value=None)
+    peer_options = PeerOptions(wallet=wallet, transport=mock_transport, certificates_to_request=requested_certs)
+    mock_peer = Peer(peer_options)
+    mock_peer.get_authenticated_session = AsyncMock(return_value=MagicMock(peer_nonce="dummy", is_authenticated=True, peer_identity_key="dummy"))
+    mock_peer.to_peer = MagicMock(side_effect=Exception("Network error"))  # 同期メソッドとして例外
+    mock_peer.listen_for_general_messages = MagicMock(return_value=1)
+    mock_peer.stop_listening_for_general_messages = MagicMock()
+    auth_peer = auth_fetch.peers["https://example.com"] = MagicMock()
+    auth_peer.peer = mock_peer
+    with pytest.raises(RuntimeError, match="Network error"):
+        auth_fetch.fetch(None, url, config)
+
+def test_consume_received_certificates():
+    wallet = DummyWallet()
+    requested_certs = RequestedCertificateSet()
+    auth_fetch = AuthFetch(wallet, requested_certs)
+    mock_cert = {"type": "authrite", "validationKey": "test_key", "serialNumber": "123", "validFrom": 1000, "validUntil": 2000}
+    auth_fetch.certificates_received = [mock_cert]
+    certs = auth_fetch.consume_received_certificates()
+    assert len(certs) == 1
+    assert certs[0]["type"] == "authrite"
+    assert certs[0]["serialNumber"] == "123"
+    assert len(auth_fetch.certificates_received) == 0
+
+def test_validate_request_options():
+    config = SimplifiedFetchRequestOptions()
+    assert config.method == "GET"
+    assert isinstance(config.headers, dict)
+    assert config.body is None
+    assert config.retry_counter is None
+    config = SimplifiedFetchRequestOptions(method="POST")
+    assert config.method == "POST"
+    config = SimplifiedFetchRequestOptions(headers={"X-Test": "value"})
+    assert config.headers["X-Test"] == "value"
+    config = SimplifiedFetchRequestOptions(body=b"test")
+    assert config.body == b"test"

tests/bsv/auth/clients/test_auth_fetch_e2e.py

@@ -0,0 +1,82 @@
+import pytest
+import json
+from aiohttp import web
+from bsv.auth.clients.auth_fetch import AuthFetch, SimplifiedFetchRequestOptions
+from bsv.auth.requested_certificate_set import RequestedCertificateSet
+from bsv.auth.peer import PeerOptions
+import asyncio
+
+class DummyWallet:
+    def get_public_key(self, ctx, args, originator):
+        return {"publicKey": "02a1633c...", "derivationPrefix": "m/0"}
+    def create_action(self, ctx, args, originator):
+        return {"tx": "0100000001abcdef..."}
+    def create_signature(self, ctx, args, originator):
+        return {"signature": b"dummy_signature"}
+    def verify_signature(self, ctx, args, originator):
+        return {"valid": True}
+
+import json
+import pytest
+from aiohttp import web
+
+import pytest_asyncio
+
+@pytest_asyncio.fixture
+async def auth_server(unused_tcp_port):
+    async def handle_authfetch(request):
+        print("[auth_server] /authfetch called")
+        body = await request.json()
+        print(f"[auth_server] received body: {body}")
+        # emulate processing delay so the test actually waits
+        await asyncio.sleep(0.3)
+        # 最小応答（initialRequestに対するinitialResponse）
+        resp = {
+            "message_type": "initialResponse",
+            "server_nonce": "c2VydmVyX25vbmNl",
+        }
+        print(f"[auth_server] sending: {resp}")
+        return web.json_response(resp)
+
+    app = web.Application()
+    app.router.add_post("/authfetch", handle_authfetch)
+    runner = web.AppRunner(app)
+    await runner.setup()
+    port = unused_tcp_port
+    site = web.TCPSite(runner, "127.0.0.1", port)
+    await site.start()
+    try:
+        yield f"http://127.0.0.1:{port}"
+    finally:
+        await runner.cleanup()
+
+@pytest.mark.asyncio
+async def test_authfetch_e2e(auth_server):
+    wallet = DummyWallet()
+    requested_certs = RequestedCertificateSet()
+    auth_fetch = AuthFetch(wallet, requested_certs)
+
+    from bsv.auth.clients.auth_fetch import AuthPeer
+
+    base = auth_server.rstrip("/")
+    # 既存のキーを消してから、フォールバック指定のPeerを登録
+    auth_fetch.peers.pop(base, None)
+    ap = AuthPeer()
+    ap.supports_mutual_auth = False  # ← 有効化
+    auth_fetch.peers[base] = ap
+
+    headers = {"Content-Type": "application/json"}
+    config = SimplifiedFetchRequestOptions(
+        method="POST",
+        headers=headers,
+        body=b'{"message_type":"initialRequest","initial_nonce":"dGVzdF9ub25jZQ==","identity_key":"test_client_key"}'
+    )
+    print(f"[test] calling fetch to {base}/authfetch")
+    resp = await asyncio.wait_for(
+        asyncio.to_thread(auth_fetch.fetch, None, f"{base}/authfetch", config),
+        timeout=10,
+    )
+    print(f"[test] got response: status={getattr(resp,'status_code',None)} text={getattr(resp,'text',None)}")
+    assert resp is not None and resp.status_code == 200
+    data = json.loads(resp.text)
+    assert data.get("message_type") == "initialResponse"