mirror/ditto
mirror/ditto
1
0
Fork 0
mirror of https://gitlab.com/soapbox-pub/ditto.git synced 2025-12-06 03:19:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't throw inside the websocket callbacks because that crashes the whole application

Browse source
This commit is contained in:
Alex Gleason 2025-01-25 15:37:09 -06:00
parent fd312032a4
commit 7601cfa430
No known key found for this signature in database
GPG key ID: 7211D1F99744FBB7
1 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/controllers/nostr/relay.ts
View file

@ -56,7 +56,7 @@ function connectStream(socket: WebSocket, ip: string | undefined) {
}; };
socket.onmessage = (e) => { socket.onmessage = (e) => {
assertRateLimit(limiters.msg); if (rateLimited(limiters.msg)) return;
if (typeof e.data !== 'string') { if (typeof e.data !== 'string') {
socket.close(1003, 'Invalid message'); socket.close(1003, 'Invalid message');
@ -82,16 +82,17 @@ function connectStream(socket: WebSocket, ip: string | undefined) {
} }
}; };
function assertRateLimit(limiter: Pick<RateLimiter, 'client'>): void { function rateLimited(limiter: Pick<RateLimiter, 'client'>): boolean {
if (ip) { if (ip) {
const client = limiter.client(ip); const client = limiter.client(ip);
try { try {
client.hit(); client.hit();
} catch (error) { } catch {
socket.close(1008, 'Rate limit exceeded'); socket.close(1008, 'Rate limit exceeded');
throw error; return true;
} }
} }
return false;
} }
/** Handle client message. */ /** Handle client message. */
@ -114,7 +115,7 @@ function connectStream(socket: WebSocket, ip: string | undefined) {
/** Handle REQ. Start a subscription. */ /** Handle REQ. Start a subscription. */
async function handleReq([_, subId, ...filters]: NostrClientREQ): Promise<void> { async function handleReq([_, subId, ...filters]: NostrClientREQ): Promise<void> {
assertRateLimit(limiters.req); if (rateLimited(limiters.req)) return;
const controller = new AbortController(); const controller = new AbortController();
controllers.get(subId)?.abort(); controllers.get(subId)?.abort();
@ -156,11 +157,8 @@ function connectStream(socket: WebSocket, ip: string | undefined) {
async function handleEvent([_, event]: NostrClientEVENT): Promise<void> { async function handleEvent([_, event]: NostrClientEVENT): Promise<void> {
relayEventsCounter.inc({ kind: event.kind.toString() }); relayEventsCounter.inc({ kind: event.kind.toString() });
if (NKinds.ephemeral(event.kind)) { const limiter = NKinds.ephemeral(event.kind) ? limiters.ephemeral : limiters.event;
assertRateLimit(limiters.ephemeral); if (rateLimited(limiter)) return;
} else {
assertRateLimit(limiters.event);
}
try { try {
// This will store it (if eligible) and run other side-effects. // This will store it (if eligible) and run other side-effects.
@ -187,7 +185,7 @@ function connectStream(socket: WebSocket, ip: string | undefined) {
/** Handle COUNT. Return the number of events matching the filters. */ /** Handle COUNT. Return the number of events matching the filters. */
async function handleCount([_, subId, ...filters]: NostrClientCOUNT): Promise<void> { async function handleCount([_, subId, ...filters]: NostrClientCOUNT): Promise<void> {
assertRateLimit(limiters.req); if (rateLimited(limiters.req)) return;
const store = await Storages.db(); const store = await Storages.db();
const { count } = await store.count(filters, { timeout: Conf.db.timeouts.relay }); const { count } = await store.count(filters, { timeout: Conf.db.timeouts.relay });
send(['COUNT', subId, { count, approximate: false }]); send(['COUNT', subId, { count, approximate: false }]);