Open-source and local-first Slack and Notion alternative that puts you in control of your data
TypeScript chatchat-applicationcrdteditorelectronknowledge-baselocal-firstnotionnotion-alternativerealtime-collaborationself-hostedslacksqliteteam-collaborationwikiyjs
Add device request rate limits in api and socket service
Hakan Shehub8bdecf33b07
diff --git a/apps/server/src/controllers/client/accounts/login-email.ts b/apps/server/src/controllers/client/accounts/login-email.tsindex d58581d7..d8720ab9 100644--- a/apps/server/src/controllers/client/accounts/login-email.ts+++ b/apps/server/src/controllers/client/accounts/login-email.ts@@ -13,7 +13,7 @@ export const loginWithEmailHandler = async (res: Response): Promise<void> => {const ip = res.locals.ip;- const isIpRateLimited = await checkIpRateLimit(ip);+ const isIpRateLimited = await rateLimitService.isAuthIpRateLimitted(ip);if (isIpRateLimited) {return ResponseBuilder.tooManyRequests(res, {code: ApiErrorCode.TooManyRequests,@@ -24,7 +24,8 @@ export const loginWithEmailHandler = async (const input: EmailLoginInput = req.body;const email = input.email.toLowerCase();- const isEmailRateLimited = await checkEmailRateLimit(email);+ const isEmailRateLimited =+ await rateLimitService.isAuthEmailRateLimitted(email);if (isEmailRateLimited) {return ResponseBuilder.tooManyRequests(res, {code: ApiErrorCode.TooManyRequests,@@ -68,20 +69,3 @@ export const loginWithEmailHandler = async (const output = await accountService.buildLoginOutput(account, res.locals.ip);return ResponseBuilder.success(res, output);};--const checkIpRateLimit = async (ip: string): Promise<boolean> => {- const rateLimitKey = `auth_ip_${ip}`;- return await rateLimitService.isRateLimited(rateLimitKey, {- limit: 50,- window: 600, // 10 minutes- });-};--const checkEmailRateLimit = async (email: string): Promise<boolean> => {- const emailHash = sha256(email);- const rateLimitKey = `auth_email_${emailHash}`;- return await rateLimitService.isRateLimited(rateLimitKey, {- limit: 10,- window: 600, // 10 minutes- });-};diff --git a/apps/server/src/controllers/client/accounts/login-google.ts b/apps/server/src/controllers/client/accounts/login-google.tsindex a8128997..afa0a147 100644--- a/apps/server/src/controllers/client/accounts/login-google.ts+++ b/apps/server/src/controllers/client/accounts/login-google.ts@@ -21,7 +21,7 @@ export const loginWithGoogleHandler = async (res: Response): Promise<void> => {const ip = res.locals.ip;- const isIpRateLimited = await checkIpRateLimit(ip);+ const isIpRateLimited = await rateLimitService.isAuthIpRateLimitted(ip);if (isIpRateLimited) {return ResponseBuilder.tooManyRequests(res, {code: ApiErrorCode.TooManyRequests,@@ -105,11 +105,3 @@ export const loginWithGoogleHandler = async ();return ResponseBuilder.success(res, output);};--const checkIpRateLimit = async (ip: string): Promise<boolean> => {- const rateLimitKey = `auth_ip_${ip}`;- return await rateLimitService.isRateLimited(rateLimitKey, {- limit: 50,- window: 600, // 10 minutes- });-};diff --git a/apps/server/src/controllers/client/accounts/register-email.ts b/apps/server/src/controllers/client/accounts/register-email.tsindex 8f05023f..1da6d535 100644--- a/apps/server/src/controllers/client/accounts/register-email.ts+++ b/apps/server/src/controllers/client/accounts/register-email.ts@@ -22,7 +22,7 @@ export const registerWithEmailHandler = async (res: Response): Promise<void> => {const ip = res.locals.ip;- const isIpRateLimited = await checkIpRateLimit(ip);+ const isIpRateLimited = await rateLimitService.isAuthIpRateLimitted(ip);if (isIpRateLimited) {return ResponseBuilder.tooManyRequests(res, {code: ApiErrorCode.TooManyRequests,@@ -33,7 +33,8 @@ export const registerWithEmailHandler = async (const input: EmailRegisterInput = req.body;const email = input.email.toLowerCase();- const isEmailRateLimited = await checkEmailRateLimit(email);+ const isEmailRateLimited =+ await rateLimitService.isAuthEmailRateLimitted(email);if (isEmailRateLimited) {return ResponseBuilder.tooManyRequests(res, {code: ApiErrorCode.TooManyRequests,@@ -96,20 +97,3 @@ export const registerWithEmailHandler = async (const output = await accountService.buildLoginOutput(account, res.locals.ip);return ResponseBuilder.success(res, output);};--const checkIpRateLimit = async (ip: string): Promise<boolean> => {- const rateLimitKey = `auth_ip_${ip}`;- return await rateLimitService.isRateLimited(rateLimitKey, {- limit: 50,- window: 600, // 10 minutes- });-};--const checkEmailRateLimit = async (email: string): Promise<boolean> => {- const emailHash = sha256(email);- const rateLimitKey = `auth_email_${emailHash}`;- return await rateLimitService.isRateLimited(rateLimitKey, {- limit: 10,- window: 600, // 10 minutes- });-};diff --git a/apps/server/src/lib/tokens.ts b/apps/server/src/lib/tokens.tsindex 67bd1e7c..e90ad5f5 100644--- a/apps/server/src/lib/tokens.ts+++ b/apps/server/src/lib/tokens.ts@@ -10,6 +10,11 @@ interface GenerateTokenResult {hash: string;}+interface TokenData {+ deviceId: string;+ secret: string;+}+type VerifyTokenResult =| {authenticated: false;@@ -19,10 +24,10 @@ type VerifyTokenResult =account: RequestAccount;};-export const generateToken = (id: string): GenerateTokenResult => {+export const generateToken = (deviceId: string): GenerateTokenResult => {const salt = uuid();const secret = uuid() + uuid();- const token = id + secret;+ const token = deviceId + secret;const hash = sha256(secret + salt);return {@@ -32,16 +37,22 @@ export const generateToken = (id: string): GenerateTokenResult => {};};-export const verifyToken = async (- token: string-): Promise<VerifyTokenResult> => {- const id = token.slice(0, 28);+export const parseToken = (token: string): TokenData => {+ const deviceId = token.slice(0, 28);const secret = token.slice(28);+ return {+ deviceId,+ secret,+ };+};+export const verifyToken = async (+ tokenData: TokenData+): Promise<VerifyTokenResult> => {const device = await database.selectFrom('devices').selectAll()- .where('id', '=', id)+ .where('id', '=', tokenData.deviceId).executeTakeFirst();if (!device) {@@ -50,7 +61,7 @@ export const verifyToken = async (};}- if (!verifySecret(secret, device.token_salt, device.token_hash)) {+ if (!verifySecret(tokenData.secret, device.token_salt, device.token_hash)) {return {authenticated: false,};diff --git a/apps/server/src/middlewares/auth.ts b/apps/server/src/middlewares/auth.tsindex afda7897..054db2e2 100644--- a/apps/server/src/middlewares/auth.ts+++ b/apps/server/src/middlewares/auth.ts@@ -1,8 +1,9 @@import { NextFunction, Request, Response, RequestHandler } from 'express';import { ApiErrorCode } from '@colanode/core';-import { verifyToken } from '@/lib/tokens';+import { parseToken, verifyToken } from '@/lib/tokens';import { ResponseBuilder } from '@/lib/response-builder';+import { rateLimitService } from '@/services/rate-limit-service';export const authMiddleware: RequestHandler = async (req: Request,@@ -18,7 +19,19 @@ export const authMiddleware: RequestHandler = async (});}- const result = await verifyToken(token);+ const tokenData = parseToken(token);+ const isRateLimited = await rateLimitService.isDeviceApiRateLimitted(+ tokenData.deviceId+ );++ if (isRateLimited) {+ return ResponseBuilder.tooManyRequests(res, {+ code: ApiErrorCode.TooManyRequests,+ message: 'Too many requests from this device. Please try again later.',+ });+ }++ const result = await verifyToken(tokenData);if (!result.authenticated) {return ResponseBuilder.unauthorized(res, {code: ApiErrorCode.TokenInvalid,diff --git a/apps/server/src/services/rate-limit-service.ts b/apps/server/src/services/rate-limit-service.tsindex 515020f2..10989d6e 100644--- a/apps/server/src/services/rate-limit-service.ts+++ b/apps/server/src/services/rate-limit-service.ts@@ -1,3 +1,5 @@+import { sha256 } from 'js-sha256';+import { redis } from '@/data/redis';interface RateLimitConfig {@@ -11,7 +13,40 @@ class RateLimitService {window: 300, // 5 minutes};- public async isRateLimited(+ public async isAuthIpRateLimitted(ip: string): Promise<boolean> {+ const rateLimitKey = this.buildKey(`ai_${ip}`);+ return await this.isRateLimited(rateLimitKey, {+ limit: 100,+ window: 600, // 10 minutes+ });+ }++ public async isAuthEmailRateLimitted(email: string): Promise<boolean> {+ const emailHash = sha256(email);+ const rateLimitKey = this.buildKey(`ae_${emailHash}`);+ return await this.isRateLimited(rateLimitKey, {+ limit: 10,+ window: 600, // 10 minutes+ });+ }++ public async isDeviceApiRateLimitted(deviceId: string): Promise<boolean> {+ const rateLimitKey = this.buildKey(`da_${deviceId}`);+ return await this.isRateLimited(rateLimitKey, {+ limit: 100,+ window: 60, // 1 minute+ });+ }++ public async isDeviceSocketRateLimitted(deviceId: string): Promise<boolean> {+ const rateLimitKey = this.buildKey(`ds_${deviceId}`);+ return await this.isRateLimited(rateLimitKey, {+ limit: 20,+ window: 60, // 1 minute+ });+ }++ private async isRateLimited(key: string,config: RateLimitConfig = this.defaultConfig): Promise<boolean> {@@ -27,7 +62,7 @@ class RateLimitService {}private buildKey(key: string): string {- return `rate_limit_${key}`;+ return `rt_${key}`;}}diff --git a/apps/server/src/services/socket-service.ts b/apps/server/src/services/socket-service.tsindex df11ac89..ca58e962 100644--- a/apps/server/src/services/socket-service.ts+++ b/apps/server/src/services/socket-service.ts@@ -2,9 +2,11 @@ import { WebSocketServer, WebSocket } from 'ws';import { IncomingMessage, Server } from 'http';+import { rateLimitService } from './rate-limit-service';+import { SocketConnection } from '@/services/socket-connection';import { eventBus } from '@/lib/event-bus';-import { verifyToken } from '@/lib/tokens';+import { parseToken, verifyToken } from '@/lib/tokens';import { createLogger } from '@/lib/logger';import { RequestAccount } from '@/types/api';@@ -48,7 +50,17 @@ class SocketService {return;}- const result = await verifyToken(token);+ const tokenData = parseToken(token);+ const isRateLimited = await rateLimitService.isDeviceSocketRateLimitted(+ tokenData.deviceId+ );++ if (isRateLimited) {+ socket.destroy();+ return;+ }++ const result = await verifyToken(tokenData);if (!result.authenticated) {socket.destroy();return;