Skip to content

fix: Rate limiter may reject requests that contain a session token #8399

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 25, 2023
Merged

fix: Rate limiter may reject requests that contain a session token #8399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ad69d7c
fix: rate limit can reject requests with a sessionToken
dblythy Jan 24, 2023
ccf66e9
Update middlewares.js
dblythy Jan 24, 2023
53fcc2b
Merge branch 'alpha' into rate-limiter-fix
mtrezza Jan 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions spec/RateLimit.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,27 @@ describe('rate limit', () => {
);
});

it('can limit cloud functions with user session token', async () => {
await Parse.User.signUp('myUser', 'password');
Parse.Cloud.define('test', () => 'Abc');
await reconfigureServer({
rateLimit: [
{
requestPath: '/functions/*',
requestTimeWindow: 10000,
requestCount: 1,
errorResponseMessage: 'Too many requests',
includeInternalRequests: true,
},
],
});
const response1 = await Parse.Cloud.run('test');
expect(response1).toBe('Abc');
await expectAsync(Parse.Cloud.run('test')).toBeRejectedWith(
new Parse.Error(Parse.Error.CONNECTION_FAILED, 'Too many requests')
);
});

it('can add global limit', async () => {
Parse.Cloud.define('test', () => 'Abc');
await reconfigureServer({
Expand Down
17 changes: 13 additions & 4 deletions src/middlewares.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,15 +276,21 @@ const handleRateLimit = async (req, res, next) => {
if (pathExp.test(req.url)) {
await limit.handler(req, res, err => {
if (err) {
throw err;
if (err.code === Parse.Error.CONNECTION_FAILED) {
throw err;
}
req.config.loggerController.error(
'An unknown error occured when attempting to apply the rate limiter: ',
err
);
}
});
}
})
);
} catch (error) {
res.status(429);
res.json({ code: Parse.Error.CONNECTION_FAILED, error });
res.json({ code: Parse.Error.CONNECTION_FAILED, error: error.message });
return;
}
next();
Expand Down Expand Up @@ -477,7 +483,10 @@ export const addRateLimit = (route, config) => {
max: route.requestCount,
message: route.errorResponseMessage || RateLimitOptions.errorResponseMessage.default,
handler: (request, response, next, options) => {
throw options.message;
throw {
code: Parse.Error.CONNECTION_FAILED,
message: options.message,
};
},
skip: request => {
if (request.ip === '127.0.0.1' && !route.includeInternalRequests) {
Expand All @@ -498,7 +507,7 @@ export const addRateLimit = (route, config) => {
}
}
}
return request.auth.isMaster;
return request.auth?.isMaster;
},
keyGenerator: request => {
return request.config.ip;
Expand Down