@prosopo/provider 5.19.4 → 5.20.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.turbo/turbo-build$colon$cjs.log +40 -36
- package/.turbo/turbo-build$colon$tsc.log +28 -28
- package/.turbo/turbo-build.log +43 -36
- package/CHANGELOG.md +155 -0
- package/dist/api/admin/apiClearAllCountersEndpoint.js.map +1 -1
- package/dist/api/admin/apiGetAllDecisionMachinesEndpoint.js.map +1 -1
- package/dist/api/admin/apiGetDecisionMachineEndpoint.js.map +1 -1
- package/dist/api/admin/apiGetSessionEndpoint.js.map +1 -1
- package/dist/api/admin/apiRemoveAllDecisionMachinesEndpoint.js.map +1 -1
- package/dist/api/admin/apiRemoveDecisionMachineEndpoint.js.map +1 -1
- package/dist/api/admin/apiRemoveSiteKeyEndpoint.js.map +1 -1
- package/dist/api/admin/apiRemoveSiteKeysEndpoint.js.map +1 -1
- package/dist/api/admin/apiReplaceDetectorPoolEndpoint.js.map +1 -1
- package/dist/api/admin/apiUpdateDecisionMachineEndpoint.js.map +1 -1
- package/dist/api/blacklistRequestInspector.d.ts.map +1 -1
- package/dist/api/blacklistRequestInspector.js +9 -8
- package/dist/api/blacklistRequestInspector.js.map +1 -1
- package/dist/api/captcha/checkSpamEmail.d.ts.map +1 -1
- package/dist/api/captcha/checkSpamEmail.js +19 -26
- package/dist/api/captcha/checkSpamEmail.js.map +1 -1
- package/dist/api/captcha/getFrictionlessCaptchaChallenge/accessPolicy.d.ts.map +1 -1
- package/dist/api/captcha/getFrictionlessCaptchaChallenge/accessPolicy.js +11 -2
- package/dist/api/captcha/getFrictionlessCaptchaChallenge/accessPolicy.js.map +1 -1
- package/dist/api/captcha/getFrictionlessCaptchaChallenge/decisionMachine.d.ts.map +1 -1
- package/dist/api/captcha/getFrictionlessCaptchaChallenge/decisionMachine.js +6 -1
- package/dist/api/captcha/getFrictionlessCaptchaChallenge/decisionMachine.js.map +1 -1
- package/dist/api/captcha/getFrictionlessCaptchaChallenge/handler.d.ts.map +1 -1
- package/dist/api/captcha/getFrictionlessCaptchaChallenge/handler.js +20 -25
- package/dist/api/captcha/getFrictionlessCaptchaChallenge/handler.js.map +1 -1
- package/dist/api/captcha/getImageCaptchaChallenge.d.ts.map +1 -1
- package/dist/api/captcha/getImageCaptchaChallenge.js +32 -43
- package/dist/api/captcha/getImageCaptchaChallenge.js.map +1 -1
- package/dist/api/captcha/getPoWCaptchaChallenge.d.ts.map +1 -1
- package/dist/api/captcha/getPoWCaptchaChallenge.js +27 -32
- package/dist/api/captcha/getPoWCaptchaChallenge.js.map +1 -1
- package/dist/api/captcha/interactiveCaptchaChallenge.d.ts.map +1 -1
- package/dist/api/captcha/interactiveCaptchaChallenge.js +27 -32
- package/dist/api/captcha/interactiveCaptchaChallenge.js.map +1 -1
- package/dist/api/captcha/interactiveCaptchaSolution.d.ts.map +1 -1
- package/dist/api/captcha/interactiveCaptchaSolution.js +18 -24
- package/dist/api/captcha/interactiveCaptchaSolution.js.map +1 -1
- package/dist/api/captcha/submitImageCaptchaSolution.d.ts.map +1 -1
- package/dist/api/captcha/submitImageCaptchaSolution.js +18 -24
- package/dist/api/captcha/submitImageCaptchaSolution.js.map +1 -1
- package/dist/api/captcha/submitPoWCaptchaSolution.d.ts.map +1 -1
- package/dist/api/captcha/submitPoWCaptchaSolution.js +23 -25
- package/dist/api/captcha/submitPoWCaptchaSolution.js.map +1 -1
- package/dist/api/domainMiddleware.d.ts.map +1 -1
- package/dist/api/domainMiddleware.js +39 -47
- package/dist/api/domainMiddleware.js.map +1 -1
- package/dist/api/errorCodeForReason.d.ts +3 -0
- package/dist/api/errorCodeForReason.d.ts.map +1 -0
- package/dist/api/errorCodeForReason.js +22 -0
- package/dist/api/errorCodeForReason.js.map +1 -0
- package/dist/api/headerCheckMiddleware.d.ts.map +1 -1
- package/dist/api/headerCheckMiddleware.js +14 -9
- package/dist/api/headerCheckMiddleware.js.map +1 -1
- package/dist/api/ipInfoMiddleware.d.ts +1 -1
- package/dist/api/ipInfoMiddleware.d.ts.map +1 -1
- package/dist/api/ipInfoMiddleware.js +5 -1
- package/dist/api/ipInfoMiddleware.js.map +1 -1
- package/dist/api/metrics.d.ts.map +1 -1
- package/dist/api/metrics.js +9 -1
- package/dist/api/metrics.js.map +1 -1
- package/dist/api/public.d.ts.map +1 -1
- package/dist/api/public.js +6 -2
- package/dist/api/public.js.map +1 -1
- package/dist/api/rateLimitHandler.d.ts +4 -0
- package/dist/api/rateLimitHandler.d.ts.map +1 -0
- package/dist/api/rateLimitHandler.js +20 -0
- package/dist/api/rateLimitHandler.js.map +1 -0
- package/dist/api/startProviderApi.d.ts +1 -0
- package/dist/api/startProviderApi.d.ts.map +1 -1
- package/dist/api/startProviderApi.js +8 -17
- package/dist/api/startProviderApi.js.map +1 -1
- package/dist/api/validateAddress.d.ts +3 -4
- package/dist/api/validateAddress.d.ts.map +1 -1
- package/dist/api/validateAddress.js +13 -19
- package/dist/api/validateAddress.js.map +1 -1
- package/dist/api/verify.d.ts.map +1 -1
- package/dist/api/verify.js +73 -96
- package/dist/api/verify.js.map +1 -1
- package/dist/cjs/api/blacklistRequestInspector.cjs +9 -8
- package/dist/cjs/api/captcha/checkSpamEmail.cjs +18 -25
- package/dist/cjs/api/captcha/getFrictionlessCaptchaChallenge/accessPolicy.cjs +11 -2
- package/dist/cjs/api/captcha/getFrictionlessCaptchaChallenge/decisionMachine.cjs +6 -1
- package/dist/cjs/api/captcha/getFrictionlessCaptchaChallenge/handler.cjs +19 -24
- package/dist/cjs/api/captcha/getImageCaptchaChallenge.cjs +31 -42
- package/dist/cjs/api/captcha/getPoWCaptchaChallenge.cjs +26 -31
- package/dist/cjs/api/captcha/interactiveCaptchaChallenge.cjs +26 -31
- package/dist/cjs/api/captcha/interactiveCaptchaSolution.cjs +17 -23
- package/dist/cjs/api/captcha/submitImageCaptchaSolution.cjs +17 -23
- package/dist/cjs/api/captcha/submitPoWCaptchaSolution.cjs +22 -24
- package/dist/cjs/api/domainMiddleware.cjs +38 -46
- package/dist/cjs/api/errorCodeForReason.cjs +22 -0
- package/dist/cjs/api/headerCheckMiddleware.cjs +13 -8
- package/dist/cjs/api/ipInfoMiddleware.cjs +5 -1
- package/dist/cjs/api/metrics.cjs +9 -1
- package/dist/cjs/api/public.cjs +5 -1
- package/dist/cjs/api/rateLimitHandler.cjs +20 -0
- package/dist/cjs/api/startProviderApi.cjs +8 -16
- package/dist/cjs/api/validateAddress.cjs +12 -18
- package/dist/cjs/api/verify.cjs +72 -95
- package/dist/cjs/index.cjs +1 -0
- package/dist/cjs/tasks/captchaManager.cjs +6 -8
- package/dist/cjs/tasks/client/clientTasks.cjs +26 -13
- package/dist/cjs/tasks/dataset/datasetTasksUtils.cjs +28 -8
- package/dist/cjs/tasks/decisionMachine/decisionMachineRunner.cjs +21 -19
- package/dist/cjs/tasks/frictionless/routingMachine.cjs +13 -4
- package/dist/cjs/tasks/imgCaptcha/imgCaptchaTasks.cjs +89 -40
- package/dist/cjs/tasks/imgCaptcha/imgCaptchaTasksUtils.cjs +18 -8
- package/dist/cjs/tasks/interactiveCaptcha/interactiveCaptchaManager.cjs +21 -13
- package/dist/cjs/tasks/powCaptcha/backgroundWrites.cjs +24 -0
- package/dist/cjs/tasks/powCaptcha/powTasks.cjs +44 -19
- package/dist/cjs/tasks/powCaptcha/powTasksUtils.cjs +14 -10
- package/dist/cjs/tasks/signatureCheck.cjs +12 -0
- package/dist/cjs/tasks/tasks.cjs +6 -1
- package/dist/cjs/util/usageCounters.cjs +26 -3
- package/dist/cjs/util.cjs +14 -3
- package/dist/errorSites.d.ts +98 -0
- package/dist/errorSites.d.ts.map +1 -0
- package/dist/errorSites.js +2 -0
- package/dist/errorSites.js.map +1 -0
- package/dist/fingerprint/dist/merkle.js +69 -0
- package/dist/fingerprint/dist/proof.js +95 -0
- package/dist/fingerprint/dist/summary.js +73 -0
- package/dist/index.js +2 -2
- package/dist/tasks/captchaManager.d.ts +2 -3
- package/dist/tasks/captchaManager.d.ts.map +1 -1
- package/dist/tasks/captchaManager.js +6 -7
- package/dist/tasks/captchaManager.js.map +1 -1
- package/dist/tasks/client/clientTasks.d.ts.map +1 -1
- package/dist/tasks/client/clientTasks.js +27 -14
- package/dist/tasks/client/clientTasks.js.map +1 -1
- package/dist/tasks/dataset/datasetTasksUtils.d.ts.map +1 -1
- package/dist/tasks/dataset/datasetTasksUtils.js +29 -9
- package/dist/tasks/dataset/datasetTasksUtils.js.map +1 -1
- package/dist/tasks/decisionMachine/decisionMachineRunner.d.ts +1 -3
- package/dist/tasks/decisionMachine/decisionMachineRunner.d.ts.map +1 -1
- package/dist/tasks/decisionMachine/decisionMachineRunner.js +21 -19
- package/dist/tasks/decisionMachine/decisionMachineRunner.js.map +1 -1
- package/dist/tasks/frictionless/routingMachine.d.ts.map +1 -1
- package/dist/tasks/frictionless/routingMachine.js +13 -4
- package/dist/tasks/frictionless/routingMachine.js.map +1 -1
- package/dist/tasks/imgCaptcha/imgCaptchaTasks.d.ts.map +1 -1
- package/dist/tasks/imgCaptcha/imgCaptchaTasks.js +91 -42
- package/dist/tasks/imgCaptcha/imgCaptchaTasks.js.map +1 -1
- package/dist/tasks/imgCaptcha/imgCaptchaTasksUtils.js +19 -9
- package/dist/tasks/imgCaptcha/imgCaptchaTasksUtils.js.map +1 -1
- package/dist/tasks/interactiveCaptcha/interactiveCaptchaManager.d.ts.map +1 -1
- package/dist/tasks/interactiveCaptcha/interactiveCaptchaManager.js +22 -14
- package/dist/tasks/interactiveCaptcha/interactiveCaptchaManager.js.map +1 -1
- package/dist/tasks/powCaptcha/backgroundWrites.d.ts +7 -0
- package/dist/tasks/powCaptcha/backgroundWrites.d.ts.map +1 -0
- package/dist/tasks/powCaptcha/backgroundWrites.js +24 -0
- package/dist/tasks/powCaptcha/backgroundWrites.js.map +1 -0
- package/dist/tasks/powCaptcha/powTasks.d.ts +3 -3
- package/dist/tasks/powCaptcha/powTasks.d.ts.map +1 -1
- package/dist/tasks/powCaptcha/powTasks.js +45 -20
- package/dist/tasks/powCaptcha/powTasks.js.map +1 -1
- package/dist/tasks/powCaptcha/powTasksUtils.d.ts.map +1 -1
- package/dist/tasks/powCaptcha/powTasksUtils.js +15 -11
- package/dist/tasks/powCaptcha/powTasksUtils.js.map +1 -1
- package/dist/tasks/signatureCheck.d.ts +2 -0
- package/dist/tasks/signatureCheck.d.ts.map +1 -0
- package/dist/tasks/signatureCheck.js +12 -0
- package/dist/tasks/signatureCheck.js.map +1 -0
- package/dist/tasks/tasks.d.ts.map +1 -1
- package/dist/tasks/tasks.js +7 -2
- package/dist/tasks/tasks.js.map +1 -1
- package/dist/tests/integration/api/admin/apiRegisterSiteKeyEndpoint.integration.test.js +3 -1
- package/dist/tests/integration/api/admin/apiRegisterSiteKeyEndpoint.integration.test.js.map +1 -1
- package/dist/tests/integration/api/admin/apiRegisterSiteKeysEndpoint.integration.test.js +6 -2
- package/dist/tests/integration/api/admin/apiRegisterSiteKeysEndpoint.integration.test.js.map +1 -1
- package/dist/tests/integration/escalationPeekBeforeConsume.integration.test.js +1 -1
- package/dist/tests/integration/escalationPeekBeforeConsume.integration.test.js.map +1 -1
- package/dist/tests/integration/imgCaptcha.integration.test.js +6 -5
- package/dist/tests/integration/imgCaptcha.integration.test.js.map +1 -1
- package/dist/tests/integration/ipValidation.integration.test.js +1 -1
- package/dist/tests/integration/ipValidation.integration.test.js.map +1 -1
- package/dist/tests/integration/powCaptcha.integration.test.js +2 -2
- package/dist/tests/integration/powCaptcha.integration.test.js.map +1 -1
- package/dist/tests/integration/routingDecisionMachines.integration.test.js.map +1 -1
- package/dist/tests/integration/testUtils.d.ts +2 -2
- package/dist/tests/integration/testUtils.d.ts.map +1 -1
- package/dist/tests/integration/testUtils.js +1 -1
- package/dist/tests/integration/testUtils.js.map +1 -1
- package/dist/tests/integration/webBotAuthAuthenticated.integration.test.js +3 -1
- package/dist/tests/integration/webBotAuthAuthenticated.integration.test.js.map +1 -1
- package/dist/tests/unit/api/blacklistRequestInspector.unit.test.js +26 -10
- package/dist/tests/unit/api/blacklistRequestInspector.unit.test.js.map +1 -1
- package/dist/tests/unit/api/captcha/checkSpamEmail.unit.test.js +4 -4
- package/dist/tests/unit/api/captcha/checkSpamEmail.unit.test.js.map +1 -1
- package/dist/tests/unit/api/captcha/submitSolutionBadSignature.unit.test.d.ts +2 -0
- package/dist/tests/unit/api/captcha/submitSolutionBadSignature.unit.test.d.ts.map +1 -0
- package/dist/tests/unit/api/captcha/submitSolutionBadSignature.unit.test.js +153 -0
- package/dist/tests/unit/api/captcha/submitSolutionBadSignature.unit.test.js.map +1 -0
- package/dist/tests/unit/api/domainMiddlewareErrorBody.unit.test.js +6 -2
- package/dist/tests/unit/api/domainMiddlewareErrorBody.unit.test.js.map +1 -1
- package/dist/tests/unit/api/errorCodeForReason.unit.test.d.ts +2 -0
- package/dist/tests/unit/api/errorCodeForReason.unit.test.d.ts.map +1 -0
- package/dist/tests/unit/api/errorCodeForReason.unit.test.js +23 -0
- package/dist/tests/unit/api/errorCodeForReason.unit.test.js.map +1 -0
- package/dist/tests/unit/api/getFrictionlessCaptchaChallenge.unit.test.js +6 -1
- package/dist/tests/unit/api/getFrictionlessCaptchaChallenge.unit.test.js.map +1 -1
- package/dist/tests/unit/api/headerCheckMiddleware.unit.test.js +16 -7
- package/dist/tests/unit/api/headerCheckMiddleware.unit.test.js.map +1 -1
- package/dist/tests/unit/api/ipInfoMiddleware.unit.test.d.ts +2 -0
- package/dist/tests/unit/api/ipInfoMiddleware.unit.test.d.ts.map +1 -0
- package/dist/tests/unit/api/ipInfoMiddleware.unit.test.js +46 -0
- package/dist/tests/unit/api/ipInfoMiddleware.unit.test.js.map +1 -0
- package/dist/tests/unit/api/public.unit.test.js +45 -10
- package/dist/tests/unit/api/public.unit.test.js.map +1 -1
- package/dist/tests/unit/api/rateLimitHandler.unit.test.d.ts +2 -0
- package/dist/tests/unit/api/rateLimitHandler.unit.test.d.ts.map +1 -0
- package/dist/tests/unit/api/rateLimitHandler.unit.test.js +39 -0
- package/dist/tests/unit/api/rateLimitHandler.unit.test.js.map +1 -0
- package/dist/tests/unit/api/validateAddress.unit.test.js +41 -115
- package/dist/tests/unit/api/validateAddress.unit.test.js.map +1 -1
- package/dist/tests/unit/api/verifyMalformedToken.unit.test.js +3 -3
- package/dist/tests/unit/api/verifyMalformedToken.unit.test.js.map +1 -1
- package/dist/tests/unit/tasks/captchaManager.unit.test.js +22 -18
- package/dist/tests/unit/tasks/captchaManager.unit.test.js.map +1 -1
- package/dist/tests/unit/tasks/client/clientTasks.unit.test.js +25 -0
- package/dist/tests/unit/tasks/client/clientTasks.unit.test.js.map +1 -1
- package/dist/tests/unit/tasks/dataset/datasetTasksUtils.unit.test.js +25 -20
- package/dist/tests/unit/tasks/dataset/datasetTasksUtils.unit.test.js.map +1 -1
- package/dist/tests/unit/tasks/decisionMachine/decisionMachineRunner.unit.test.js +31 -0
- package/dist/tests/unit/tasks/decisionMachine/decisionMachineRunner.unit.test.js.map +1 -1
- package/dist/tests/unit/tasks/frictionless/fingerprintBucketFlow.unit.test.d.ts +2 -0
- package/dist/tests/unit/tasks/frictionless/fingerprintBucketFlow.unit.test.d.ts.map +1 -0
- package/dist/tests/unit/tasks/frictionless/fingerprintBucketFlow.unit.test.js +80 -0
- package/dist/tests/unit/tasks/frictionless/fingerprintBucketFlow.unit.test.js.map +1 -0
- package/dist/tests/unit/tasks/frictionless/routingMachine.unit.test.js +48 -0
- package/dist/tests/unit/tasks/frictionless/routingMachine.unit.test.js.map +1 -1
- package/dist/tests/unit/tasks/imgCaptcha/imgCaptchaTasks.unit.test.js +20 -28
- package/dist/tests/unit/tasks/imgCaptcha/imgCaptchaTasks.unit.test.js.map +1 -1
- package/dist/tests/unit/tasks/imgCaptcha/imgCaptchaTasksUtils.unit.test.js +2 -2
- package/dist/tests/unit/tasks/imgCaptcha/imgCaptchaTasksUtils.unit.test.js.map +1 -1
- package/dist/tests/unit/tasks/powCaptcha/backgroundWrites.unit.test.d.ts +2 -0
- package/dist/tests/unit/tasks/powCaptcha/backgroundWrites.unit.test.d.ts.map +1 -0
- package/dist/tests/unit/tasks/powCaptcha/backgroundWrites.unit.test.js +44 -0
- package/dist/tests/unit/tasks/powCaptcha/backgroundWrites.unit.test.js.map +1 -0
- package/dist/tests/unit/tasks/powCaptcha/powTasks.unit.test.js +78 -43
- package/dist/tests/unit/tasks/powCaptcha/powTasks.unit.test.js.map +1 -1
- package/dist/tests/unit/tasks/powCaptcha/powTasksUtils.unit.test.js +7 -6
- package/dist/tests/unit/tasks/powCaptcha/powTasksUtils.unit.test.js.map +1 -1
- package/dist/tests/unit/tasks/puzzleCaptcha/puzzleTasks.unit.test.js +2 -2
- package/dist/tests/unit/tasks/puzzleCaptcha/puzzleTasks.unit.test.js.map +1 -1
- package/dist/tests/unit/util/usageCounters.unit.test.js +20 -0
- package/dist/tests/unit/util/usageCounters.unit.test.js.map +1 -1
- package/dist/tests/unit/util.unit.test.js +7 -7
- package/dist/tests/unit/util.unit.test.js.map +1 -1
- package/dist/util/usageCounters.d.ts +1 -1
- package/dist/util/usageCounters.d.ts.map +1 -1
- package/dist/util/usageCounters.js +26 -3
- package/dist/util/usageCounters.js.map +1 -1
- package/dist/util.d.ts.map +1 -1
- package/dist/util.js +15 -4
- package/dist/util.js.map +1 -1
- package/package.json +44 -43
|
@@ -2,7 +2,7 @@ import { recordDomainValidation } from "./metrics.js";
|
|
|
2
2
|
import { Tasks } from "../tasks/tasks.js";
|
|
3
3
|
import { getMaintenanceMode } from "./admin/apiToggleMaintenanceModeEndpoint.js";
|
|
4
4
|
import { isReservedTestSiteKey } from "./testSiteKey.js";
|
|
5
|
-
import {
|
|
5
|
+
import { ProsopoError, isProsopoError, toPublicError } from "@prosopo/common";
|
|
6
6
|
import { decodeGoogleTranslateHost, parseUrl } from "@prosopo/util";
|
|
7
7
|
import { handleErrors } from "@prosopo/api-express-router";
|
|
8
8
|
import { validateAddress } from "@prosopo/util-crypto";
|
|
@@ -20,11 +20,11 @@ var domainMiddleware = (env) => {
|
|
|
20
20
|
if (!cachedTasks) cachedTasks = new Tasks(env);
|
|
21
21
|
const tasks = cachedTasks;
|
|
22
22
|
const siteKey = req.headers["prosopo-site-key"];
|
|
23
|
-
if (!siteKey) throw siteKeyNotRegisteredError(
|
|
23
|
+
if (!siteKey) throw siteKeyNotRegisteredError("No sitekey provided");
|
|
24
24
|
try {
|
|
25
25
|
validateAddress(siteKey, false, 42);
|
|
26
26
|
} catch (err) {
|
|
27
|
-
throw invalidSiteKeyError(
|
|
27
|
+
throw invalidSiteKeyError(siteKey);
|
|
28
28
|
}
|
|
29
29
|
if (isReservedTestSiteKey(siteKey)) {
|
|
30
30
|
recordDomainValidation("test_key");
|
|
@@ -32,32 +32,34 @@ var domainMiddleware = (env) => {
|
|
|
32
32
|
return;
|
|
33
33
|
}
|
|
34
34
|
const clientSettings = await tasks.db.getClientRecord(siteKey);
|
|
35
|
-
if (!clientSettings) throw siteKeyNotRegisteredError(
|
|
35
|
+
if (!clientSettings) throw siteKeyNotRegisteredError(siteKey);
|
|
36
36
|
const allowedDomains = clientSettings.settings?.domains;
|
|
37
|
-
if (!allowedDomains) throw siteKeyInvalidDomainError(
|
|
37
|
+
if (!allowedDomains) throw siteKeyInvalidDomainError(siteKey, req.hostname);
|
|
38
38
|
const origin = req.headers.origin;
|
|
39
|
-
if (!origin) throw unauthorizedOriginError(
|
|
39
|
+
if (!origin) throw unauthorizedOriginError(void 0);
|
|
40
40
|
const candidateOrigins = [origin, ...googleTranslateOrigins(origin)];
|
|
41
41
|
for (const candidate of candidateOrigins) for (const domain of allowedDomains) if (tasks.clientTaskManager.domainPatternMatcher(candidate, domain)) {
|
|
42
42
|
recordDomainValidation("allowed");
|
|
43
43
|
next();
|
|
44
44
|
return;
|
|
45
45
|
}
|
|
46
|
-
throw unauthorizedOriginError(
|
|
46
|
+
throw unauthorizedOriginError(origin);
|
|
47
47
|
} catch (err) {
|
|
48
48
|
recordDomainValidation("rejected");
|
|
49
|
-
if (err
|
|
50
|
-
|
|
51
|
-
req.logger.error(() => ({
|
|
52
|
-
err,
|
|
53
|
-
msg: "Domain middleware error"
|
|
54
|
-
}));
|
|
55
|
-
res.status(401).json({
|
|
56
|
-
error: "Unauthorized",
|
|
57
|
-
message: "Unauthorized"
|
|
58
|
-
});
|
|
49
|
+
if (isProsopoError(err) || err instanceof ZodError || err instanceof SyntaxError) {
|
|
50
|
+
handleErrors(err, req, res, next);
|
|
59
51
|
return;
|
|
60
52
|
}
|
|
53
|
+
req.logger.error(() => ({
|
|
54
|
+
err,
|
|
55
|
+
msg: "Domain middleware error"
|
|
56
|
+
}));
|
|
57
|
+
const error = new ProsopoError({
|
|
58
|
+
code: "UNAUTHORIZED",
|
|
59
|
+
errorSite: "PROV-85",
|
|
60
|
+
cause: err
|
|
61
|
+
});
|
|
62
|
+
res.status(error.status).json({ error: toPublicError(error, "BACKEND_ERROR") });
|
|
61
63
|
}
|
|
62
64
|
};
|
|
63
65
|
};
|
|
@@ -71,46 +73,36 @@ var googleTranslateOrigins = (origin) => {
|
|
|
71
73
|
return [];
|
|
72
74
|
}
|
|
73
75
|
};
|
|
74
|
-
var siteKeyNotRegisteredError = (
|
|
75
|
-
return new
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
},
|
|
80
|
-
i18n,
|
|
81
|
-
logger
|
|
76
|
+
var siteKeyNotRegisteredError = (dapp) => {
|
|
77
|
+
return new ProsopoError({
|
|
78
|
+
code: "SITE_KEY_NOT_REGISTERED",
|
|
79
|
+
errorSite: "PROV-30",
|
|
80
|
+
context: { siteKey: dapp }
|
|
82
81
|
});
|
|
83
82
|
};
|
|
84
|
-
var invalidSiteKeyError = (
|
|
85
|
-
return new
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
},
|
|
90
|
-
i18n,
|
|
91
|
-
logger
|
|
83
|
+
var invalidSiteKeyError = (siteKey) => {
|
|
84
|
+
return new ProsopoError({
|
|
85
|
+
code: "SITE_KEY_INVALID",
|
|
86
|
+
errorSite: "PROV-31",
|
|
87
|
+
context: { siteKey }
|
|
92
88
|
});
|
|
93
89
|
};
|
|
94
|
-
var unauthorizedOriginError = (
|
|
95
|
-
return new
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
},
|
|
100
|
-
i18n,
|
|
101
|
-
logger
|
|
90
|
+
var unauthorizedOriginError = (origin) => {
|
|
91
|
+
return new ProsopoError({
|
|
92
|
+
code: "ORIGIN_NOT_ALLOWED",
|
|
93
|
+
errorSite: "PROV-32",
|
|
94
|
+
context: { origin }
|
|
102
95
|
});
|
|
103
96
|
};
|
|
104
|
-
var siteKeyInvalidDomainError = (
|
|
105
|
-
return new
|
|
97
|
+
var siteKeyInvalidDomainError = (dapp, domain) => {
|
|
98
|
+
return new ProsopoError({
|
|
99
|
+
code: "ORIGIN_NOT_ALLOWED",
|
|
100
|
+
errorSite: "PROV-33",
|
|
106
101
|
context: {
|
|
107
|
-
code: 400,
|
|
108
102
|
message: "No domains are allowed for this site key. Please fix in the Procaptcha Portal",
|
|
109
103
|
siteKey: dapp,
|
|
110
104
|
domain
|
|
111
|
-
}
|
|
112
|
-
i18n,
|
|
113
|
-
logger
|
|
105
|
+
}
|
|
114
106
|
});
|
|
115
107
|
};
|
|
116
108
|
//#endregion
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"domainMiddleware.js","sourceRoot":"","sources":["../../src/api/domainMiddleware.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"domainMiddleware.js","sourceRoot":"","sources":["../../src/api/domainMiddleware.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"errorCodeForReason.d.ts","sourceRoot":"","sources":["../../src/api/errorCodeForReason.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,KAAK,SAAS,EAAe,MAAM,iBAAiB,CAAC;AAc9D,eAAO,MAAM,kBAAkB,WACtB,MAAM,GAAG,SAAS,aAChB,SAAS,KACjB,SAMF,CAAC"}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
import { isErrorCode } from "@prosopo/common";
|
|
2
|
+
//#region src/api/errorCodeForReason.ts
|
|
3
|
+
var RENAMED = {
|
|
4
|
+
"API.INVALID_SITE_KEY": "SITE_KEY_INVALID",
|
|
5
|
+
"API.UNAUTHORIZED_ORIGIN_URL": "ORIGIN_NOT_ALLOWED",
|
|
6
|
+
"API.BAD_REQUEST": "INVALID_REQUEST"
|
|
7
|
+
};
|
|
8
|
+
/**
|
|
9
|
+
* A request validation outcome (a `ResultReason` or other translation key) as
|
|
10
|
+
* the error code the widget branches on: the key without its namespace, e.g.
|
|
11
|
+
* `API.VPN_BLOCKED` is `VPN_BLOCKED`. An outcome with no code of its own gets
|
|
12
|
+
* `fallback`.
|
|
13
|
+
*/
|
|
14
|
+
var errorCodeForReason = (reason, fallback = "INVALID_REQUEST") => {
|
|
15
|
+
if (reason === void 0) return fallback;
|
|
16
|
+
const renamed = RENAMED[reason];
|
|
17
|
+
if (renamed) return renamed;
|
|
18
|
+
const unprefixed = reason.slice(reason.indexOf(".") + 1);
|
|
19
|
+
return isErrorCode(unprefixed) ? unprefixed : fallback;
|
|
20
|
+
};
|
|
21
|
+
//#endregion
|
|
22
|
+
export { errorCodeForReason };
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"errorCodeForReason.js","sourceRoot":"","sources":["../../src/api/errorCodeForReason.ts"],"names":[],"mappings":"AAcA,OAAO,EAAkB,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE9D,MAAM,OAAO,GAAwC;IACpD,sBAAsB,EAAE,kBAAkB;IAC1C,6BAA6B,EAAE,oBAAoB;IACnD,iBAAiB,EAAE,iBAAiB;CACpC,CAAC;AAQF,MAAM,CAAC,MAAM,kBAAkB,GAAG,CACjC,MAA0B,EAC1B,WAAsB,iBAAiB,EAC3B,EAAE;IACd,IAAI,MAAM,KAAK,SAAS;QAAE,OAAO,QAAQ,CAAC;IAC1C,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAChC,IAAI,OAAO;QAAE,OAAO,OAAO,CAAC;IAC5B,MAAM,UAAU,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;IACzD,OAAO,WAAW,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC;AACxD,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"headerCheckMiddleware.d.ts","sourceRoot":"","sources":["../../src/api/headerCheckMiddleware.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"headerCheckMiddleware.d.ts","sourceRoot":"","sources":["../../src/api/headerCheckMiddleware.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAG/D,eAAO,MAAM,qBAAqB,QAAS,mBAAmB,WAC1C,OAAO,OAAO,QAAQ,QAAQ,YAAY,kBAiD7D,CAAC"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { validateAddr, validateSiteKey } from "./validateAddress.js";
|
|
2
|
-
import {
|
|
2
|
+
import { ProsopoError } from "@prosopo/common";
|
|
3
|
+
import { handleErrors, sendProsopoError } from "@prosopo/api-express-router";
|
|
3
4
|
//#region src/api/headerCheckMiddleware.ts
|
|
4
5
|
var headerCheckMiddleware = (env) => {
|
|
5
6
|
return async (req, res, next) => {
|
|
@@ -7,15 +8,23 @@ var headerCheckMiddleware = (env) => {
|
|
|
7
8
|
const user = req.headers["prosopo-user"];
|
|
8
9
|
const siteKey = req.headers["prosopo-site-key"];
|
|
9
10
|
if (!user) {
|
|
10
|
-
|
|
11
|
+
sendProsopoError(res, new ProsopoError({
|
|
12
|
+
code: "UNAUTHORIZED",
|
|
13
|
+
errorSite: "PROV-86",
|
|
14
|
+
message: "Missing prosopo-user header"
|
|
15
|
+
}));
|
|
11
16
|
return;
|
|
12
17
|
}
|
|
13
18
|
if (!siteKey) {
|
|
14
|
-
|
|
19
|
+
sendProsopoError(res, new ProsopoError({
|
|
20
|
+
code: "UNAUTHORIZED",
|
|
21
|
+
errorSite: "PROV-87",
|
|
22
|
+
message: "Missing prosopo-site-key header"
|
|
23
|
+
}));
|
|
15
24
|
return;
|
|
16
25
|
}
|
|
17
|
-
validateSiteKey(siteKey
|
|
18
|
-
validateAddr(user
|
|
26
|
+
validateSiteKey(siteKey);
|
|
27
|
+
validateAddr(user);
|
|
19
28
|
req.user = user;
|
|
20
29
|
req.siteKey = siteKey;
|
|
21
30
|
req.logger = req.logger.with({
|
|
@@ -28,9 +37,5 @@ var headerCheckMiddleware = (env) => {
|
|
|
28
37
|
}
|
|
29
38
|
};
|
|
30
39
|
};
|
|
31
|
-
var unauthorised = (res) => res.status(401).json({
|
|
32
|
-
error: "Unauthorized",
|
|
33
|
-
message: "Unauthorized"
|
|
34
|
-
});
|
|
35
40
|
//#endregion
|
|
36
41
|
export { headerCheckMiddleware };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"headerCheckMiddleware.js","sourceRoot":"","sources":["../../src/api/headerCheckMiddleware.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"headerCheckMiddleware.js","sourceRoot":"","sources":["../../src/api/headerCheckMiddleware.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC7E,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAG/C,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAErE,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,GAAwB,EAAE,EAAE;IACjE,OAAO,KAAK,EAAE,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;QAChE,IAAI,CAAC;YACJ,MAAM,IAAI,GAAG,GAAG,CAAC,OAAO,CAAC,cAAc,CAAW,CAAC;YACnD,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC,kBAAkB,CAAW,CAAC;YAE1D,IAAI,CAAC,IAAI,EAAE,CAAC;gBACX,gBAAgB,CACf,GAAG,EACH,IAAI,YAAY,CAAC;oBAChB,IAAI,EAAE,cAAc;oBACpB,SAAS,EAAE,SAAS;oBACpB,OAAO,EAAE,6BAA6B;iBACtC,CAAC,CACF,CAAC;gBACF,OAAO;YACR,CAAC;YACD,IAAI,CAAC,OAAO,EAAE,CAAC;gBACd,gBAAgB,CACf,GAAG,EACH,IAAI,YAAY,CAAC;oBAChB,IAAI,EAAE,cAAc;oBACpB,SAAS,EAAE,SAAS;oBACpB,OAAO,EAAE,iCAAiC;iBAC1C,CAAC,CACF,CAAC;gBACF,OAAO;YACR,CAAC;YAED,eAAe,CAAC,OAAO,CAAC,CAAC;YAEzB,YAAY,CAAC,IAAI,CAAC,CAAC;YAEnB,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC;YAChB,GAAG,CAAC,OAAO,GAAG,OAAO,CAAC;YAGtB,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,CAC3B;gBACC,IAAI;gBACJ,OAAO;aACP,EACD,cAAc,CACd,CAAC;YAEF,IAAI,EAAE,CAAC;QACR,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACd,OAAO,YAAY,CAAC,GAAY,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;QACnD,CAAC;IACF,CAAC,CAAC;AACH,CAAC,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import type { ProviderEnvironment } from "@prosopo/types-env";
|
|
2
2
|
import type { NextFunction, Request, Response } from "express";
|
|
3
|
-
export declare const ipInfoMiddleware: (env: ProviderEnvironment) => (req: Request, _res: Response, next: NextFunction) => Promise<void>;
|
|
3
|
+
export declare const ipInfoMiddleware: (env: ProviderEnvironment, skipPaths?: ReadonlySet<string>) => (req: Request, _res: Response, next: NextFunction) => Promise<void>;
|
|
4
4
|
//# sourceMappingURL=ipInfoMiddleware.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ipInfoMiddleware.d.ts","sourceRoot":"","sources":["../../src/api/ipInfoMiddleware.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAE/D,eAAO,MAAM,gBAAgB,
|
|
1
|
+
{"version":3,"file":"ipInfoMiddleware.d.ts","sourceRoot":"","sources":["../../src/api/ipInfoMiddleware.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAE/D,eAAO,MAAM,gBAAgB,QACvB,mBAAmB,cACb,WAAW,CAAC,MAAM,CAAC,WAEX,OAAO,QAAQ,QAAQ,QAAQ,YAAY,kBAoB9D,CAAC"}
|
|
@@ -1,6 +1,10 @@
|
|
|
1
1
|
//#region src/api/ipInfoMiddleware.ts
|
|
2
|
-
var ipInfoMiddleware = (env) => {
|
|
2
|
+
var ipInfoMiddleware = (env, skipPaths = /* @__PURE__ */ new Set()) => {
|
|
3
3
|
return async (req, _res, next) => {
|
|
4
|
+
if (skipPaths.has(req.path)) {
|
|
5
|
+
next();
|
|
6
|
+
return;
|
|
7
|
+
}
|
|
4
8
|
try {
|
|
5
9
|
const ip = req.ip;
|
|
6
10
|
if (ip && env.ipInfoService.isAvailable()) req.ipInfo = await env.ipInfoService.lookup(ip);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ipInfoMiddleware.js","sourceRoot":"","sources":["../../src/api/ipInfoMiddleware.ts"],"names":[],"mappings":"AAiBA,MAAM,CAAC,MAAM,gBAAgB,GAAG,
|
|
1
|
+
{"version":3,"file":"ipInfoMiddleware.js","sourceRoot":"","sources":["../../src/api/ipInfoMiddleware.ts"],"names":[],"mappings":"AAiBA,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAC/B,GAAwB,EACxB,YAAiC,IAAI,GAAG,EAAE,EACzC,EAAE;IACH,OAAO,KAAK,EAAE,GAAY,EAAE,IAAc,EAAE,IAAkB,EAAE,EAAE;QACjE,IAAI,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;YAC7B,IAAI,EAAE,CAAC;YACP,OAAO;QACR,CAAC;QACD,IAAI,CAAC;YACJ,MAAM,EAAE,GAAG,GAAG,CAAC,EAAE,CAAC;YAClB,IAAI,EAAE,IAAI,GAAG,CAAC,aAAa,CAAC,WAAW,EAAE,EAAE,CAAC;gBAC3C,GAAG,CAAC,MAAM,GAAG,MAAM,GAAG,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YACjD,CAAC;YACD,IAAI,EAAE,CAAC;QACR,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YAEd,GAAG,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC;gBACzB,GAAG,EAAE,2BAA2B;gBAChC,GAAG;aACH,CAAC,CAAC,CAAC;YACJ,IAAI,EAAE,CAAC;QACR,CAAC;IACF,CAAC,CAAC;AACH,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metrics.d.ts","sourceRoot":"","sources":["../../src/api/metrics.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"metrics.d.ts","sourceRoot":"","sources":["../../src/api/metrics.ts"],"names":[],"mappings":"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"}
|
package/dist/api/metrics.js
CHANGED
|
@@ -1,4 +1,6 @@
|
|
|
1
|
+
import { ProsopoError } from "@prosopo/common";
|
|
1
2
|
import { AdminApiPaths, ClientApiPaths, PublicApiPaths } from "@prosopo/types";
|
|
3
|
+
import { sendProsopoError } from "@prosopo/api-express-router";
|
|
2
4
|
import { timingSafeEqual } from "node:crypto";
|
|
3
5
|
import { BlockList, isIPv4, isIPv6 } from "node:net";
|
|
4
6
|
import { Counter, Gauge, Histogram, Registry, collectDefaultMetrics } from "prom-client";
|
|
@@ -386,7 +388,13 @@ var metricsHandler = (env) => {
|
|
|
386
388
|
return async (req, res) => {
|
|
387
389
|
const access = metricsAccess(req);
|
|
388
390
|
if (access !== 200) {
|
|
389
|
-
res
|
|
391
|
+
sendProsopoError(res, access === 401 ? new ProsopoError({
|
|
392
|
+
code: "UNAUTHORIZED",
|
|
393
|
+
errorSite: "PROV-91"
|
|
394
|
+
}) : new ProsopoError({
|
|
395
|
+
code: "FORBIDDEN",
|
|
396
|
+
errorSite: "PROV-92"
|
|
397
|
+
}));
|
|
390
398
|
return;
|
|
391
399
|
}
|
|
392
400
|
const m = getMetrics();
|
package/dist/api/metrics.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metrics.js","sourceRoot":"","sources":["../../src/api/metrics.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"metrics.js","sourceRoot":"","sources":["../../src/api/metrics.ts"],"names":[],"mappings":"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"}
|
package/dist/api/public.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"public.d.ts","sourceRoot":"","sources":["../../src/api/public.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAGxD,OAAgB,EAAE,KAAK,MAAM,EAAE,MAAM,SAAS,CAAC;AAc/C,wBAAgB,YAAY,CAAC,GAAG,EAAE,mBAAmB,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"public.d.ts","sourceRoot":"","sources":["../../src/api/public.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAGxD,OAAgB,EAAE,KAAK,MAAM,EAAE,MAAM,SAAS,CAAC;AAc/C,wBAAgB,YAAY,CAAC,GAAG,EAAE,mBAAmB,GAAG,MAAM,CA+G7D"}
|
package/dist/api/public.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { metricsEnabled, metricsHandler, recordHealthzGeoOutcome } from "./metrics.js";
|
|
2
2
|
import { assetDocumentRouter } from "./assetDocument.js";
|
|
3
3
|
import { getHealthzGeoRouter } from "./healthzGeo.js";
|
|
4
|
-
import {
|
|
4
|
+
import { ProsopoError } from "@prosopo/common";
|
|
5
5
|
import { PublicApiPaths } from "@prosopo/types";
|
|
6
6
|
import { version } from "@prosopo/util";
|
|
7
7
|
import { handleErrors } from "@prosopo/api-express-router";
|
|
@@ -59,7 +59,11 @@ function publicRouter(env) {
|
|
|
59
59
|
data: { reqParams: req.params },
|
|
60
60
|
msg: "Error getting provider details"
|
|
61
61
|
}));
|
|
62
|
-
return next(new
|
|
62
|
+
return next(new ProsopoError({
|
|
63
|
+
code: "UNEXPECTED",
|
|
64
|
+
errorSite: "PROV-34",
|
|
65
|
+
message: "BadRequest"
|
|
66
|
+
}));
|
|
63
67
|
}
|
|
64
68
|
});
|
|
65
69
|
router.use(assetDocumentRouter());
|
package/dist/api/public.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"public.js","sourceRoot":"","sources":["../../src/api/public.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"public.js","sourceRoot":"","sources":["../../src/api/public.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"rateLimitHandler.d.ts","sourceRoot":"","sources":["../../src/api/rateLimitHandler.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAGlD,eAAO,MAAM,gBAAgB,WACnB,MAAM,QAAQ,MAAM,KAAG,OAAO,CAAC,SAAS,CAkBhD,CAAC"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import { ProsopoError } from "@prosopo/common";
|
|
2
|
+
import { sendProsopoError } from "@prosopo/api-express-router";
|
|
3
|
+
//#region src/api/rateLimitHandler.ts
|
|
4
|
+
var rateLimitHandler = (logger, path) => (req, res, _next, options) => {
|
|
5
|
+
logger.warn(() => ({
|
|
6
|
+
msg: "Rate limit exceeded",
|
|
7
|
+
data: {
|
|
8
|
+
path,
|
|
9
|
+
ip: req.ip,
|
|
10
|
+
siteKey: req.headers["prosopo-site-key"]
|
|
11
|
+
}
|
|
12
|
+
}));
|
|
13
|
+
sendProsopoError(res, new ProsopoError({
|
|
14
|
+
code: "RATE_LIMITED",
|
|
15
|
+
errorSite: "PROV-93",
|
|
16
|
+
status: options.statusCode
|
|
17
|
+
}));
|
|
18
|
+
};
|
|
19
|
+
//#endregion
|
|
20
|
+
export { rateLimitHandler };
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"rateLimitHandler.js","sourceRoot":"","sources":["../../src/api/rateLimitHandler.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAK/C,MAAM,CAAC,MAAM,gBAAgB,GAC5B,CAAC,MAAc,EAAE,IAAY,EAAsB,EAAE,CACrD,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;IAC5B,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;QAClB,GAAG,EAAE,qBAAqB;QAC1B,IAAI,EAAE;YACL,IAAI;YACJ,EAAE,EAAE,GAAG,CAAC,EAAE;YACV,OAAO,EAAE,GAAG,CAAC,OAAO,CAAC,kBAAkB,CAAC;SACxC;KACD,CAAC,CAAC,CAAC;IACJ,gBAAgB,CACf,GAAG,EACH,IAAI,YAAY,CAAC;QAChB,IAAI,EAAE,cAAc;QACpB,SAAS,EAAE,SAAS;QACpB,MAAM,EAAE,OAAO,CAAC,UAAU;KAC1B,CAAC,CACF,CAAC;AACH,CAAC,CAAC"}
|
|
@@ -5,6 +5,7 @@ import { type CorsOptions } from "cors";
|
|
|
5
5
|
import type { Request } from "express";
|
|
6
6
|
export declare const providerCorsOptions: CorsOptions;
|
|
7
7
|
export declare const isTlsAvailable: () => boolean;
|
|
8
|
+
export declare const getServerVerifyPaths: () => ClientApiPaths[];
|
|
8
9
|
export declare const getClientApiPathsExpectingProsopoHeaders: () => ClientApiPaths[];
|
|
9
10
|
export declare const getUserFromJWT: (req: Request) => string | undefined;
|
|
10
11
|
export declare function startProviderApi(env: ProviderEnvironment, admin?: boolean, port?: number): Promise<Server>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"startProviderApi.d.ts","sourceRoot":"","sources":["../../src/api/startProviderApi.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AASvC,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAGxD,OAAO,EAEN,cAAc,EAEd,MAAM,gBAAgB,CAAC;AAMxB,OAAa,EAAE,KAAK,WAAW,EAAE,MAAM,MAAM,CAAC;AAE9C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"startProviderApi.d.ts","sourceRoot":"","sources":["../../src/api/startProviderApi.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AASvC,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAGxD,OAAO,EAEN,cAAc,EAEd,MAAM,gBAAgB,CAAC;AAMxB,OAAa,EAAE,KAAK,WAAW,EAAE,MAAM,MAAM,CAAC;AAE9C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AA8CvC,eAAO,MAAM,mBAAmB,EAAE,WAcjC,CAAC;AAEF,eAAO,MAAM,cAAc,QAAO,OAEjC,CAAC;AAEF,eAAO,MAAM,oBAAoB,QAAO,cAAc,EACmB,CAAC;AAM1E,eAAO,MAAM,wCAAwC,QAChD,cAAc,EAajB,CAAC;AAOH,eAAO,MAAM,cAAc,QAAS,OAAO,KAAG,MAAM,GAAG,SAuBtD,CAAC;AA0CF,wBAAsB,gBAAgB,CACrC,GAAG,EAAE,mBAAmB,EACxB,KAAK,UAAQ,EACb,IAAI,CAAC,EAAE,MAAM,GACX,OAAO,CAAC,MAAM,CAAC,CAuRjB"}
|
|
@@ -16,15 +16,16 @@ import { detectorPoolBodyParser } from "./detectorPoolBodyParser.js";
|
|
|
16
16
|
import { headerCheckMiddleware } from "./headerCheckMiddleware.js";
|
|
17
17
|
import { ignoreMiddleware } from "./ignoreMiddleware.js";
|
|
18
18
|
import { ipInfoMiddleware } from "./ipInfoMiddleware.js";
|
|
19
|
+
import { rateLimitHandler } from "./rateLimitHandler.js";
|
|
19
20
|
import { robotsMiddleware } from "./robotsMiddleware.js";
|
|
20
21
|
import { parseLogLevel } from "@prosopo/logger";
|
|
21
22
|
import { AdminApiPaths, ClientApiPaths } from "@prosopo/types";
|
|
22
23
|
import { apiExpressRouterFactory, authMiddleware, createApiExpressDefaultEndpointAdapter, requestLoggerMiddleware } from "@prosopo/api-express-router";
|
|
23
|
-
import { LANGUAGE_HEADER, i18nMiddleware } from "@prosopo/locale";
|
|
24
24
|
import fs from "node:fs";
|
|
25
25
|
import path from "node:path";
|
|
26
26
|
import https from "node:https";
|
|
27
27
|
import express from "express";
|
|
28
|
+
import { LANGUAGE_HEADER, i18nMiddleware } from "@prosopo/locale";
|
|
28
29
|
import { fileURLToPath } from "node:url";
|
|
29
30
|
import { AccessRuleApiRoutes, getExpressApiRuleRateLimits } from "@prosopo/user-access-policy/api";
|
|
30
31
|
import cors from "cors";
|
|
@@ -66,6 +67,7 @@ var providerCorsOptions = {
|
|
|
66
67
|
var isTlsAvailable = () => {
|
|
67
68
|
return fs.existsSync(keyPath) && fs.existsSync(crtPath);
|
|
68
69
|
};
|
|
70
|
+
var getServerVerifyPaths = () => Object.values(ClientApiPaths).filter((path) => path.endsWith("/verify"));
|
|
69
71
|
/**
|
|
70
72
|
* Get client API paths that expect Prosopo headers (like site key) for validation, excluding verify and spam routes
|
|
71
73
|
* @returns Array of ClientApiPaths excluding verify and spam routes
|
|
@@ -173,36 +175,25 @@ async function startProviderApi(env, admin = false, port) {
|
|
|
173
175
|
...getExpressApiRuleRateLimits()
|
|
174
176
|
};
|
|
175
177
|
const adminPaths = Object.values(AdminApiPaths);
|
|
176
|
-
const rateLimitHandler = (path) => (req, res, _next, options) => {
|
|
177
|
-
env.logger.warn(() => ({
|
|
178
|
-
msg: "Rate limit exceeded",
|
|
179
|
-
data: {
|
|
180
|
-
path,
|
|
181
|
-
ip: req.ip,
|
|
182
|
-
siteKey: req.headers["prosopo-site-key"]
|
|
183
|
-
}
|
|
184
|
-
}));
|
|
185
|
-
res.status(options.statusCode).send(options.message);
|
|
186
|
-
};
|
|
187
178
|
for (const [path, limit] of Object.entries(rateLimits)) {
|
|
188
179
|
const enumPath = path;
|
|
189
180
|
if (adminPaths.includes(enumPath)) apiApp.use(enumPath, rateLimit({
|
|
190
181
|
...limit,
|
|
191
|
-
handler: rateLimitHandler(enumPath),
|
|
182
|
+
handler: rateLimitHandler(env.logger, enumPath),
|
|
192
183
|
keyGenerator: (req) => {
|
|
193
184
|
return getUserFromJWT(req) || req.ip || "unknown";
|
|
194
185
|
}
|
|
195
186
|
}));
|
|
196
187
|
else if (path === ClientApiPaths.VerifyImageCaptchaSolutionDapp || path === ClientApiPaths.VerifyPowCaptchaSolution) apiApp.use(enumPath, rateLimit({
|
|
197
188
|
...limit,
|
|
198
|
-
handler: rateLimitHandler(enumPath),
|
|
189
|
+
handler: rateLimitHandler(env.logger, enumPath),
|
|
199
190
|
keyGenerator: (req) => {
|
|
200
191
|
return req.headers["prosopo-site-key"] || req.ip || "unknown";
|
|
201
192
|
}
|
|
202
193
|
}));
|
|
203
194
|
else apiApp.use(enumPath, rateLimit({
|
|
204
195
|
...limit,
|
|
205
|
-
handler: rateLimitHandler(enumPath)
|
|
196
|
+
handler: rateLimitHandler(env.logger, enumPath)
|
|
206
197
|
}));
|
|
207
198
|
}
|
|
208
199
|
}
|
|
@@ -214,7 +205,7 @@ async function startProviderApi(env, admin = false, port) {
|
|
|
214
205
|
apiApp.use(ja4Middleware(env));
|
|
215
206
|
apiApp.use(handshakeTimingMiddleware(env));
|
|
216
207
|
apiApp.use(rawTlsSignalsMiddleware(env));
|
|
217
|
-
apiApp.use(ipInfoMiddleware(env));
|
|
208
|
+
apiApp.use(ipInfoMiddleware(env, new Set(getServerVerifyPaths())));
|
|
218
209
|
apiApp.use(clientPathsExcludingVerify, headerCheckMiddleware(env));
|
|
219
210
|
apiApp.use(prosopoVerifyRouter(env));
|
|
220
211
|
env.logger.info(() => ({ msg: "Enabling admin auth middleware" }));
|
|
@@ -261,4 +252,4 @@ async function startProviderApi(env, admin = false, port) {
|
|
|
261
252
|
return server;
|
|
262
253
|
}
|
|
263
254
|
//#endregion
|
|
264
|
-
export { getClientApiPathsExpectingProsopoHeaders, getUserFromJWT, isTlsAvailable, providerCorsOptions, startProviderApi };
|
|
255
|
+
export { getClientApiPathsExpectingProsopoHeaders, getServerVerifyPaths, getUserFromJWT, isTlsAvailable, providerCorsOptions, startProviderApi };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"startProviderApi.js","sourceRoot":"","sources":["../../src/api/startProviderApi.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,KAAK,MAAM,YAAY,CAAC;AAE/B,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EACN,uBAAuB,EACvB,cAAc,EACd,sCAAsC,EACtC,uBAAuB,GACvB,MAAM,6BAA6B,CAAC;AAErC,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EACN,aAAa,EACb,cAAc,GAEd,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACN,mBAAmB,EACnB,2BAA2B,GAC3B,MAAM,iCAAiC,CAAC;AAEzC,OAAO,IAA0B,MAAM,MAAM,CAAC;AAC9C,OAAO,OAAO,MAAM,SAAS,CAAC;AAE9B,OAAO,
|
|
1
|
+
{"version":3,"file":"startProviderApi.js","sourceRoot":"","sources":["../../src/api/startProviderApi.ts"],"names":[],"mappings":"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"}
|