mirror of
https://github.com/burrow-dev/burrow-server.git
synced 2026-11-18 17:27:50 -05:00
fix(captcha): cap Cloudflare checks in flight, and let a blocked widget be retried
- server: at most config.maxConcurrentCaptchaChecks (AJ_CAPTCHA_MAX_CONCURRENT, 24 by default, 1 to 100) Turnstile checks wait on Cloudflare at once; past that the answer is captcha_unavailable at once, so a slow Cloudflare cannot hold thousands of sockets open. The page's policy lets it connect to challenges.cloudflare.com too. - page: public/captcha.js gives up on a widget that has not loaded in 15 s, or that loaded without turnstile.render, instead of waiting for ever, and a render that throws counts as a failed answer. The game's captcha window says to check the connection or a content blocker, with a "Try again" button. Co-Authored-By: Claude Opus 5.5 <[email protected]>
This commit is contained in:
1 parent
43f2717b44
commit
974f68490e
4 files changed
+62
-19
No files matched your search
+13
-1
@@ -26,10 +26,12 @@ const MAX_ANSWER_LENGTH = 2048;
|
||||
const PASS_MS = 600000;
|
||||
const PASS_USES = 5;
|
||||
const MAX_PASSES = 10000;
|
||||
const MAX_VERIFYING = config.maxConcurrentCaptchaChecks;
|
||||
|
||||
const on = Boolean(config.turnstile);
|
||||
const passes = new Map(); // SHA-256 of a pass -> {id: account id, key: address key, expiry, uses}
|
||||
const sha256 = text => crypto.createHash("sha256").update(String(text)).digest("hex");
|
||||
let verifying = 0;
|
||||
|
||||
// for the pages: what each answer means
|
||||
const MESSAGES = {
|
||||
@@ -70,6 +72,13 @@ const verify = async (answer, from, action) => {
|
||||
if (typeof answer !== "string" || !answer || answer.length > MAX_ANSWER_LENGTH) {
|
||||
return "captcha_required";
|
||||
}
|
||||
// A burst of valid-looking tokens should not turn an upstream Turnstile
|
||||
// slowdown into thousands of open fetches on this VPS. Refuse quickly;
|
||||
// the browser can reset its widget and retry after the short outage.
|
||||
if (verifying >= MAX_VERIFYING) {
|
||||
return "captcha_unavailable";
|
||||
}
|
||||
verifying++;
|
||||
const form = new URLSearchParams({secret: config.turnstile.secret, response: answer});
|
||||
if (!limits.isLoopback(from.address)) {
|
||||
form.set("remoteip", from.address);
|
||||
@@ -83,6 +92,9 @@ const verify = async (answer, from, action) => {
|
||||
console.log(`[captcha] cloudflare did not answer: ${logText(err.message)}`);
|
||||
return "captcha_unavailable";
|
||||
}
|
||||
finally {
|
||||
verifying--;
|
||||
}
|
||||
// an answer made for another form is no answer for this one. cloudflare's
|
||||
// test keys give none.
|
||||
if (!result || result.success !== true || (result.action && result.action !== action)) {
|
||||
@@ -107,7 +119,7 @@ const check = async (body, from, action, account) => {
|
||||
// a page's security policy: public/captcha.js always (the page calls it even
|
||||
// when off), and the widget too when it is on.
|
||||
const policy = csp => (on
|
||||
? `${csp.replace("script-src ", `script-src 'self' ${ORIGIN} `)}; frame-src ${ORIGIN}`
|
||||
? `${csp.replace("script-src ", `script-src 'self' ${ORIGIN} `).replace("connect-src ", `connect-src 'self' ${ORIGIN} `)}; frame-src ${ORIGIN}`
|
||||
: csp.replace("script-src ", "script-src 'self' "));
|
||||
|
||||
// a page with public/captcha.js asked for under a name that changes with the
|
||||
|
||||
Reference in new issue
Block a user