Skip to content
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

Some more needed protection #1975

Merged
merged 1 commit into from
Dec 2, 2022
Merged

Some more needed protection #1975

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions libs/muExpress.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ function renderFile(aRes, aPath, aOptions) {
aOptions.DNT = aRes.oujsOptions.DNT;
aOptions.hideReminderGDPR = aRes.oujsOptions.hideReminderGDPR;
aOptions.showReminderListLimit = aRes.oujsOptions.showReminderListLimit;
aOptions.showReminderInstallLimit = aRes.oujsOptions.showReminderInstallLimit;

// NOTE: Keep in sync with app.js, user.js, and headerReminders.html
aOptions.showInvalidAuth = aRes.oujsOptions.showInvalidAuth;
Expand Down
55 changes: 49 additions & 6 deletions routes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ var settings = require('./models/settings.json');
//--
var limiter = process.env.LIMITER_STRING || settings.limiter;

var lockdown = process.env.FORCE_BUSY_UPDATEURL_CHECK === 'true';

// WATCHPOINT: ~60 second poll time in MongoDB
var fudgeMin = 60;
var fudgeSec = 6;
Expand All @@ -53,8 +55,49 @@ var installCapLimiter = rateLimit({
windowMs: waitInstallCapMin * 60 * 1000, // n minutes for all stores
max: 50, // 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', waitInstallCapMin * 60 + (isDev ? fudgeSec : fudgeMin));
aRes.status(429).send();
if (aReq.rateLimit.current < aReq.rateLimit.limit + 4) {
// Midddlware options
if (!aRes.oujsOptions) {
aRes.oujsOptions = {};
}

aRes.oujsOptions.showReminderInstallLimit = 4 - (aReq.rateLimit.current - aReq.rateLimit.limit);

aNext();
} else if (aReq.rateLimit.current < aReq.rateLimit.limit + 10) {
aRes.header('Retry-After', waitInstallCapMin * 60 + (isDev ? fudgeSec : fudgeMin));
statusCodePage(aReq, aRes, aNext, {
statusCode: 429,
statusMessage: 'Too many requests.',
suppressNavigation: true,
isCustomView: true,
statusData: {
isListView: true,
retryAfter: waitInstallCapMin * 60 + (isDev ? fudgeSec : fudgeMin)
}
});
} else if (aReq.rateLimit.current < aReq.rateLimit.limit + 15) {
aRes.header('Retry-After', waitInstallCapMin * 60 + (isDev ? fudgeSec : fudgeMin));
aRes.status(429).send('Too many requests. Please try again later');
} else if (aReq.rateLimit.current < aReq.rateLimit.limit + 20) {
aRes.header('Retry-After', waitInstallCapMin * 60 + (isDev ? fudgeSec : fudgeMin));
aRes.status(429).send();
} else {
cmd = (isPro && process.env.AUTOBAN ? process.env.AUTOBAN : 'echo SIMULATING INSTALL AUTOBAN') +
' ' + aReq.connection.remoteAddress;

exec(cmd, function (aErr, aStdout, aStderr) {
if (aErr) {
console.error('FAIL INSTALL AUTOBAN', cmd);
// fallthrough
} else {
console.log('INSTALL AUTOBAN', aReq.connection.remoteAddress);
// fallthrough
}

aRes.connection.destroy();
});
}
},
skip: function (aReq, aRes) {
var authedUser = aReq.session.user;
Expand Down Expand Up @@ -100,7 +143,7 @@ var installRateLimiter = rateLimit({
skip: function (aReq, aRes) {
var authedUser = aReq.session.user;

if (aReq.params.type === 'libs') {
if (aReq.params.type === 'libs' && !lockdown) {
return true;
}

Expand Down Expand Up @@ -277,15 +320,15 @@ var listCapLimiter = rateLimit({
aRes.header('Retry-After', waitListCapMin * 60 + (isDev ? fudgeSec : fudgeMin));
aRes.status(429).send();
} else {
cmd = (isPro && process.env.AUTOBAN ? process.env.AUTOBAN : 'echo SIMULATING AUTOBAN') +
cmd = (isPro && process.env.AUTOBAN ? process.env.AUTOBAN : 'echo SIMULATING LIST AUTOBAN') +
' ' + aReq.connection.remoteAddress;

exec(cmd, function (aErr, aStdout, aStderr) {
if (aErr) {
console.error('FAIL AUTOBAN', cmd);
console.error('FAIL LIST AUTOBAN', cmd);
// fallthrough
} else {
console.log('AUTOBAN', aReq.connection.remoteAddress);
console.log('LIST AUTOBAN', aReq.connection.remoteAddress);
// fallthrough
}

Expand Down
5 changes: 5 additions & 0 deletions views/includes/headerReminders.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,11 @@
<p><i class="fa fa-fw fa-exclamation-triangle"></i> <b>WARNING:</b> You will reach your list limit in {{showReminderListLimit}} more requests.</p>
</div>
{{/showReminderListLimit}}
{{#showReminderInstallLimit}}
<div class="alert alert-danger small fade in" role="alert">
<p><i class="fa fa-fw fa-exclamation-triangle"></i> <b>WARNING:</b> You will reach your install limit in {{showReminderListLimit}} more requests.</p>
</div>
{{/showReminderInstallLimit}}
{{#showSesssionNoExtend}}
<div class="alert alert-danger alert-dismissible alert-autodismissible small fade in" role="alert">
<button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
Expand Down