yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-01 04:42:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

update path normalize to a cleaner implementation

Browse Source
This commit is contained in:
derrickmehaffy 2023-07-19 01:35:40 -07:00
parent 4013ae7345
commit 9f1600ab5d
2 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
packages/core/admin/server/middlewares/rateLimit.js
View File

@ -1,7 +1,8 @@
'use strict'; 'use strict';
const utils = require('@strapi/utils'); const utils = require('@strapi/utils');
const { has, toLower } = require('lodash/fp'); const { isString, has, toLower } = require('lodash/fp');
const path = require('path');
const { RateLimitError } = utils.errors; const { RateLimitError } = utils.errors;
@ -24,13 +25,9 @@ module.exports =
const rateLimit = require('koa2-ratelimit').RateLimit; const rateLimit = require('koa2-ratelimit').RateLimit;
const userEmail = toLower(ctx.request.body.email) || 'unknownEmail'; const userEmail = toLower(ctx.request.body.email) || 'unknownEmail';
let requestPath = toLower(ctx.request.path) || 'unknownPath'; const requestPath = isString(ctx.request.path)
? toLower(path.normalize(ctx.request.path))
if (requestPath.endsWith('/')) { : 'invalidPath';
if (requestPath !== '/') {
requestPath = requestPath.slice(0, -1);
}
}
const loadConfig = { const loadConfig = {
interval: { min: 5 }, interval: { min: 5 },

13
packages/plugins/users-permissions/server/middlewares/rateLimit.js
View File

@ -1,7 +1,8 @@
'use strict'; 'use strict';
const utils = require('@strapi/utils'); const utils = require('@strapi/utils');
const { has, toLower } = require('lodash/fp'); const { isString, has, toLower } = require('lodash/fp');
const path = require('path');
const { RateLimitError } = utils.errors; const { RateLimitError } = utils.errors;
@ -24,13 +25,9 @@ module.exports =
const rateLimit = require('koa2-ratelimit').RateLimit; const rateLimit = require('koa2-ratelimit').RateLimit;
const userIdentifier = toLower(ctx.request.body.email) || 'unknownIdentifier'; const userIdentifier = toLower(ctx.request.body.email) || 'unknownIdentifier';
let requestPath = toLower(ctx.request.path) || 'unknownPath'; const requestPath = isString(ctx.request.path)
? toLower(path.normalize(ctx.request.path))
if (requestPath.endsWith('/')) { : 'invalidPath';
if (requestPath !== '/') {
requestPath = requestPath.slice(0, -1);
}
}
const loadConfig = { const loadConfig = {
interval: { min: 5 }, interval: { min: 5 },