Skip to content

Think it goes this way #1933

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
Martii merged 1 commit into from
Jan 10, 2022
Merged

Think it goes this way #1933

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 7 additions & 18 deletions routesStatic.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ var url = require('url');
var express = require('express');
var rateLimit = require('express-rate-limit');

var fudgeSec = 6;

var waitStaticRateSec = isDev ? parseInt(4 / 2) : 4;
var staticRateLimiter = rateLimit({
Expand All @@ -20,19 +21,6 @@ var staticRateLimiter = rateLimit({
max: 1, // limit each IP to n requests per windowMs for memory store or expireTimeMs for mongo store
handler: function (aReq, aRes, aNext, aOptions) {
aRes.header('Retry-After', waitStaticRateSec + fudgeSec);
if (aReq.rateLimit.current <= aReq.rateLimit.limit + 1) {
statusCodePage(aReq, aRes, aNext, {
statusCode: 429,
statusMessage: 'Too many requests.',
suppressNavigation: true,
isCustomView: true,
statusData: {
isListView: true,
retryAfter: waitStaticRateSec + fudgeSec
}
});
return;
}
aRes.status(429).send();
},
keyGenerator: function (aReq, aRes, aNext) {
Expand Down Expand Up @@ -60,27 +48,28 @@ module.exports = function (aApp) {
if (!aModuleOption || typeof aModuleOption === 'number') {
aApp.use(
url.resolve(aModuleBase, aModuleBaseName),
staticRateLimiter,
express.static(
path.join(dirname, aModuleBaseName),
{ maxage: aModuleOption }
),
staticRateLimiter
)
);
} else {
for (basename in aModuleOption) {
aApp.use(
url.resolve(aModuleBase, url.resolve(aModuleBaseName, basename)),
staticRateLimiter,
express.static(
path.join(dirname, aModuleBaseName, basename),
{ maxage: aModuleOption[basename].maxage }
),
staticRateLimiter
)

);
}
}
}

aApp.use(express.static(path.join(__dirname, 'public'), { maxage: day * 1 }), staticRateLimiter);
aApp.use(staticRateLimiter, express.static(path.join(__dirname, 'public'), { maxage: day * 1 }));

serveModule('/redist/npm/', 'ace-builds/src/', 7);

Expand Down