From e8231bbca2db4b683fc7da7375010f5c39a8464d Mon Sep 17 00:00:00 2001 From: derrickmehaffy Date: Wed, 19 Jul 2023 01:25:04 -0700 Subject: [PATCH] handle cleanup of trailing / --- packages/core/admin/server/middlewares/rateLimit.js | 8 +++++++- .../users-permissions/server/middlewares/rateLimit.js | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/packages/core/admin/server/middlewares/rateLimit.js b/packages/core/admin/server/middlewares/rateLimit.js index f9415389c4..0135931471 100644 --- a/packages/core/admin/server/middlewares/rateLimit.js +++ b/packages/core/admin/server/middlewares/rateLimit.js @@ -24,7 +24,13 @@ module.exports = const rateLimit = require('koa2-ratelimit').RateLimit; const userEmail = toLower(ctx.request.body.email) || 'unknownEmail'; - const requestPath = toLower(ctx.request.path) || 'unknownPath'; + let requestPath = toLower(ctx.request.path) || 'unknownPath'; + + if (requestPath.endsWith('/')) { + if (requestPath !== '/') { + requestPath = requestPath.slice(0, -1); + } + } const loadConfig = { interval: { min: 5 }, diff --git a/packages/plugins/users-permissions/server/middlewares/rateLimit.js b/packages/plugins/users-permissions/server/middlewares/rateLimit.js index 60b57f89b0..d5d81007c6 100644 --- a/packages/plugins/users-permissions/server/middlewares/rateLimit.js +++ b/packages/plugins/users-permissions/server/middlewares/rateLimit.js @@ -24,7 +24,13 @@ module.exports = const rateLimit = require('koa2-ratelimit').RateLimit; const userIdentifier = toLower(ctx.request.body.email) || 'unknownIdentifier'; - const requestPath = toLower(ctx.request.path) || 'unknownPath'; + let requestPath = toLower(ctx.request.path) || 'unknownPath'; + + if (requestPath.endsWith('/')) { + if (requestPath !== '/') { + requestPath = requestPath.slice(0, -1); + } + } const loadConfig = { interval: { min: 5 },