AaronFiore/electrum
1
0
Fork 0
Code Activity

swaps: rate limit swapserver requests

Browse Source
This commit is contained in:
f321x
2025-08-21 10:25:33 +02:00
parent d7fe5fb46d
commit 9086f1af14
1 changed files with 33 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
electrum/submarine_swaps.py
View File

@@ -1518,6 +1518,7 @@ class NostrTransport(SwapServerTransport):
self.relay_manager = None # type: Optional[aionostr.Manager] self.relay_manager = None # type: Optional[aionostr.Manager]
self.taskgroup = OldTaskGroup() self.taskgroup = OldTaskGroup()
self._last_swapserver_relays = self._load_last_swapserver_relays() # type: Optional[Sequence[str]] self._last_swapserver_relays = self._load_last_swapserver_relays() # type: Optional[Sequence[str]]
self._swap_server_requests = asyncio.Queue(maxsize=5) # type: asyncio.Queue[dict]
def __enter__(self): def __enter__(self):
asyncio.run_coroutine_threadsafe(self.main_loop(), self.network.asyncio_loop) asyncio.run_coroutine_threadsafe(self.main_loop(), self.network.asyncio_loop)
@@ -1547,6 +1548,7 @@ class NostrTransport(SwapServerTransport):
if self.sm.is_server: if self.sm.is_server:
tasks = [ tasks = [
self.check_direct_messages(), self.check_direct_messages(),
self._handle_requests(),
] ]
else: else:
tasks = [ tasks = [
@@ -1807,37 +1809,42 @@ class NostrTransport(SwapServerTransport):
if fut: if fut:
fut.set_result(content) fut.set_result(content)
elif self.sm.is_server and 'method' in content: elif self.sm.is_server and 'method' in content:
try: if self._swap_server_requests.full():
await self._handle_request(content) self.logger.warning(f"too many swap requests, dropping incoming request: {event.id[:10]}...")
except Exception as e: continue
self.logger.exception(f"failed to handle request: {content}") await self._swap_server_requests.put(content)
error_response = json.dumps({
"error": str(e)[:100],
"reply_to": event.id,
})
await self.taskgroup.spawn(self.send_direct_message(event.pubkey, error_response))
else: else:
self.logger.info(f'unknown message {content}') self.logger.info(f'unknown message {content}')
@log_exceptions @log_exceptions
async def _handle_request(self, request: dict) -> None: async def _handle_requests(self) -> None:
assert self.sm.is_server assert self.sm.is_server
# todo: remember event_id of already processed requests while True:
method = request.pop('method') await asyncio.sleep(5)
event_id = request.pop('event_id') request = await self._swap_server_requests.get()
event_pubkey = request.pop('event_pubkey') event_id = request.pop('event_id')
self.logger.info(f'handle_request: id={event_id} {method} {request}') event_pubkey = request.pop('event_pubkey')
if method == 'addswapinvoice': try:
r = self.sm.server_add_swap_invoice(request) method = request.pop('method')
elif method == 'createswap': self.logger.info(f'handle_request: id={event_id} {method} {request}')
r = self.sm.server_create_swap(request) if method == 'addswapinvoice':
elif method == 'createnormalswap': r = self.sm.server_add_swap_invoice(request)
r = self.sm.server_create_normal_swap(request) elif method == 'createswap':
else: r = self.sm.server_create_swap(request)
raise Exception(method) elif method == 'createnormalswap':
r['reply_to'] = event_id r = self.sm.server_create_normal_swap(request)
self.logger.debug(f'sending response id={event_id}') else:
await self.taskgroup.spawn(self.send_direct_message(event_pubkey, json.dumps(r), retries=2)) raise Exception(method)
r['reply_to'] = event_id
self.logger.debug(f'sending response id={event_id}')
await self.taskgroup.spawn(self.send_direct_message(event_pubkey, json.dumps(r), retries=2))
except Exception as e:
self.logger.exception(f"failed to handle {request=}")
error_response = json.dumps({
"error": str(e)[:100],
"reply_to": event_id,
})
await self.taskgroup.spawn(self.send_direct_message(event_pubkey, error_response))
def _store_last_swapserver_relays(self, relays: Sequence[str]): def _store_last_swapserver_relays(self, relays: Sequence[str]):
self._last_swapserver_relays = relays self._last_swapserver_relays = relays