lee/pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2025-12-12 02:47:46 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

use redis store in rate limiters

Browse Source
This commit is contained in:
miloschwartz
2025-06-22 19:55:05 -04:00
parent 0e87b6e48b
commit fb5010a2b5
3 changed files with 17 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
server/lib/readConfigFile.ts
View File

@@ -214,21 +214,6 @@ export const configSchema = z
no_reply: z.string().email().optional()
})
.optional(),
users: z.object({
server_admin: z.object({
email: z
.string()
.email()
.optional()
.transform(getEnvOrYaml("USERS_SERVERADMIN_EMAIL"))
.pipe(z.string().email())
.transform((v) => v.toLowerCase()),
password: passwordSchema
.optional()
.transform(getEnvOrYaml("USERS_SERVERADMIN_PASSWORD"))
.pipe(passwordSchema)
})
}),
flags: z
.object({
require_email_verification: z.boolean().optional(),

22
server/middlewares/rateLimit.ts
View File

@@ -7,13 +7,16 @@ import config from "@server/lib/config";
import { RedisStore } from "rate-limit-redis";
import redisManager from "@server/db/redis";
export let rateLimitStore: Store = new MemoryStore();
if (config.getRawConfig().flags?.enable_redis) {
const client = redisManager.client!;
rateLimitStore = new RedisStore({
sendCommand: async (command: string, ...args: string[]) =>
(await client.call(command, args)) as any
});
export function createStore(): Store {
let rateLimitStore: Store = new MemoryStore();
if (config.getRawConfig().flags?.enable_redis) {
const client = redisManager.client!;
rateLimitStore = new RedisStore({
sendCommand: async (command: string, ...args: string[]) =>
(await client.call(command, args)) as any
});
}
return rateLimitStore;
}
export function rateLimitMiddleware({
@@ -44,7 +47,7 @@ export function rateLimitMiddleware({
createHttpError(HttpCode.TOO_MANY_REQUESTS, message)
);
},
store: rateLimitStore
store: createStore()
});
} else {
return rateLimit({
@@ -57,7 +60,8 @@ export function rateLimitMiddleware({
return next(
createHttpError(HttpCode.TOO_MANY_REQUESTS, message)
);
}
},
store: createStore()
});
}
}

8
server/routers/external.ts
View File

@@ -32,7 +32,7 @@ import {
verifyIsLoggedInUser,
verifyClientAccess,
verifyApiKeyAccess,
rateLimitStore,
createStore,
} from "@server/middlewares";
import { verifyUserHasAction } from "../middlewares/verifyUserHasAction";
import { ActionsEnum } from "@server/auth/actions";
@@ -784,7 +784,7 @@ authRouter.post(
const message = `You can only request an email verification code ${3} times every ${15} minutes. Please try again later.`;
return next(createHttpError(HttpCode.TOO_MANY_REQUESTS, message));
},
store: rateLimitStore
store: createStore()
}),
auth.requestEmailVerificationCode
);
@@ -805,7 +805,7 @@ authRouter.post(
const message = `You can only request a password reset ${3} times every ${15} minutes. Please try again later.`;
return next(createHttpError(HttpCode.TOO_MANY_REQUESTS, message));
},
store: rateLimitStore
store: createStore()
}),
auth.requestPasswordReset
);
@@ -825,7 +825,7 @@ authRouter.post(
const message = `You can only request an email OTP ${10} times every ${15} minutes. Please try again later.`;
return next(createHttpError(HttpCode.TOO_MANY_REQUESTS, message));
},
store: rateLimitStore
store: createStore()
}),
resource.authWithWhitelist
);