@prosopo/provider 2.5.5 → 2.7.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/CHANGELOG.md +57 -0
- package/dist/api/captcha.d.ts.map +1 -1
- package/dist/api/captcha.js +1 -1
- package/dist/api/captcha.js.map +1 -1
- package/dist/api/ja4Middleware.d.ts +6 -0
- package/dist/api/ja4Middleware.d.ts.map +1 -1
- package/dist/api/ja4Middleware.js +7 -7
- package/dist/api/ja4Middleware.js.map +1 -1
- package/dist/cjs/api/admin/apiAdminRoutesProvider.cjs +32 -0
- package/dist/cjs/api/admin/apiRegisterSiteKeyEndpoint.cjs +25 -0
- package/dist/cjs/api/admin/apiRemoveDetectorKeyEndpoint.cjs +32 -0
- package/dist/cjs/api/admin/apiUpdateDetectorKeyEndpoint.cjs +32 -0
- package/dist/cjs/api/admin/createApiAdminRoutesProvider.cjs +10 -0
- package/dist/cjs/api/authMiddleware.cjs +81 -0
- package/dist/cjs/api/blacklistRequestInspector.cjs +73 -0
- package/dist/cjs/api/block.cjs +24 -0
- package/dist/cjs/api/captcha.cjs +482 -0
- package/dist/cjs/api/domainMiddleware.cjs +89 -0
- package/dist/cjs/api/headerCheckMiddleware.cjs +29 -0
- package/dist/cjs/api/ignoreMiddleware.cjs +14 -0
- package/dist/cjs/api/ja4Middleware.cjs +73 -0
- package/dist/cjs/api/public.cjs +27 -0
- package/dist/cjs/api/requestLoggerMiddleware.cjs +14 -0
- package/dist/cjs/api/robotsMiddleware.cjs +12 -0
- package/dist/cjs/api/validateAddress.cjs +19 -0
- package/dist/cjs/api/verify.cjs +138 -0
- package/dist/cjs/index.cjs +41 -0
- package/dist/cjs/rules/lang.cjs +16 -0
- package/dist/cjs/schedulers/captchaScheduler.cjs +31 -0
- package/dist/cjs/schedulers/getClientList.cjs +29 -0
- package/dist/cjs/tasks/captchaManager.cjs +90 -0
- package/dist/cjs/tasks/client/clientTasks.cjs +281 -0
- package/dist/cjs/tasks/dataset/datasetTasks.cjs +30 -0
- package/dist/cjs/tasks/dataset/datasetTasksUtils.cjs +34 -0
- package/dist/cjs/tasks/detection/decodePayload.cjs +475 -0
- package/dist/cjs/tasks/detection/getBotScore.cjs +13 -0
- package/dist/cjs/tasks/frictionless/frictionlessTasks.cjs +121 -0
- package/dist/cjs/tasks/frictionless/frictionlessTasksUtils.cjs +11 -0
- package/dist/cjs/tasks/imgCaptcha/imgCaptchaTasks.cjs +366 -0
- package/dist/cjs/tasks/imgCaptcha/imgCaptchaTasksUtils.cjs +25 -0
- package/dist/cjs/tasks/index.cjs +4 -0
- package/dist/cjs/tasks/powCaptcha/powTasks.cjs +155 -0
- package/dist/cjs/tasks/powCaptcha/powTasksUtils.cjs +26 -0
- package/dist/cjs/tasks/tasks.cjs +51 -0
- package/dist/cjs/util.cjs +58 -0
- package/dist/schedulers/captchaScheduler.d.ts +1 -1
- package/dist/schedulers/captchaScheduler.d.ts.map +1 -1
- package/dist/schedulers/captchaScheduler.js +1 -7
- package/dist/schedulers/captchaScheduler.js.map +1 -1
- package/dist/schedulers/getClientList.d.ts +1 -1
- package/dist/schedulers/getClientList.d.ts.map +1 -1
- package/dist/schedulers/getClientList.js +1 -7
- package/dist/schedulers/getClientList.js.map +1 -1
- package/dist/tasks/client/clientTasks.d.ts +5 -2
- package/dist/tasks/client/clientTasks.d.ts.map +1 -1
- package/dist/tasks/client/clientTasks.js +55 -9
- package/dist/tasks/client/clientTasks.js.map +1 -1
- package/dist/tasks/imgCaptcha/imgCaptchaTasks.d.ts +1 -1
- package/dist/tasks/imgCaptcha/imgCaptchaTasks.d.ts.map +1 -1
- package/dist/tasks/imgCaptcha/imgCaptchaTasks.js +13 -3
- package/dist/tasks/imgCaptcha/imgCaptchaTasks.js.map +1 -1
- package/dist/tests/unit/api/ja4Middleware.unit.test.d.ts +2 -0
- package/dist/tests/unit/api/ja4Middleware.unit.test.d.ts.map +1 -0
- package/dist/tests/unit/api/ja4Middleware.unit.test.js +57 -0
- package/dist/tests/unit/api/ja4Middleware.unit.test.js.map +1 -0
- package/dist/tests/unit/schedulers/captchaScheduler.unit.test.js +2 -2
- package/dist/tests/unit/schedulers/captchaScheduler.unit.test.js.map +1 -1
- package/dist/tests/unit/tasks/captchaManager.unit.test.js +1 -0
- package/dist/tests/unit/tasks/captchaManager.unit.test.js.map +1 -1
- package/dist/tests/unit/tasks/client/clientTasks.unit.test.js +11 -0
- package/dist/tests/unit/tasks/client/clientTasks.unit.test.js.map +1 -1
- package/dist/tests/unit/tasks/imgCaptcha/imgCaptchaTasks.unit.test.js +2 -2
- package/dist/tests/unit/tasks/imgCaptcha/imgCaptchaTasks.unit.test.js.map +1 -1
- package/package.json +16 -15
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"captchaScheduler.d.ts","sourceRoot":"","sources":["../../src/schedulers/captchaScheduler.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAE3D,OAAO,EAAE,KAAK,mBAAmB,EAAsB,MAAM,gBAAgB,CAAC;AAK9E,wBAAsB,uBAAuB,CAC5C,IAAI,EAAE,WAAW,EACjB,MAAM,EAAE,mBAAmB,
|
|
1
|
+
{"version":3,"file":"captchaScheduler.d.ts","sourceRoot":"","sources":["../../src/schedulers/captchaScheduler.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAE3D,OAAO,EAAE,KAAK,mBAAmB,EAAsB,MAAM,gBAAgB,CAAC;AAK9E,wBAAsB,uBAAuB,CAC5C,IAAI,EAAE,WAAW,EACjB,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,mBAAmB,iBA0B3B"}
|
|
@@ -3,16 +3,10 @@ import { ScheduledTaskNames } from "@prosopo/types";
|
|
|
3
3
|
import { CronJob } from "cron";
|
|
4
4
|
import { Tasks } from "../tasks/tasks.js";
|
|
5
5
|
import { checkIfTaskIsRunning } from "../util.js";
|
|
6
|
-
export async function storeCaptchasExternally(pair, config) {
|
|
6
|
+
export async function storeCaptchasExternally(pair, cronSchedule, config) {
|
|
7
7
|
const env = new ProviderEnvironment(config, pair);
|
|
8
8
|
await env.isReady();
|
|
9
9
|
const tasks = new Tasks(env);
|
|
10
|
-
const defaultSchedule = "0 * * * *";
|
|
11
|
-
const cronSchedule = config.scheduledTasks?.captchaScheduler
|
|
12
|
-
? config.scheduledTasks.captchaScheduler.schedule
|
|
13
|
-
? config.scheduledTasks.captchaScheduler.schedule
|
|
14
|
-
: defaultSchedule
|
|
15
|
-
: defaultSchedule;
|
|
16
10
|
const job = new CronJob(cronSchedule, async () => {
|
|
17
11
|
const taskRunning = await checkIfTaskIsRunning(ScheduledTaskNames.StoreCommitmentsExternal, env.getDb());
|
|
18
12
|
env.logger.info(`${ScheduledTaskNames.StoreCommitmentsExternal} task running: ${taskRunning}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"captchaScheduler.js","sourceRoot":"","sources":["../../src/schedulers/captchaScheduler.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAA4B,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAC9E,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAElD,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC5C,IAAiB,EACjB,MAA2B;IAE3B,MAAM,GAAG,GAAG,IAAI,mBAAmB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAClD,MAAM,GAAG,CAAC,OAAO,EAAE,CAAC;IAEpB,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"captchaScheduler.js","sourceRoot":"","sources":["../../src/schedulers/captchaScheduler.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAA4B,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAC9E,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAElD,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC5C,IAAiB,EACjB,YAAoB,EACpB,MAA2B;IAE3B,MAAM,GAAG,GAAG,IAAI,mBAAmB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAClD,MAAM,GAAG,CAAC,OAAO,EAAE,CAAC;IAEpB,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC;IAE7B,MAAM,GAAG,GAAG,IAAI,OAAO,CAAC,YAAY,EAAE,KAAK,IAAI,EAAE;QAChD,MAAM,WAAW,GAAG,MAAM,oBAAoB,CAC7C,kBAAkB,CAAC,wBAAwB,EAC3C,GAAG,CAAC,KAAK,EAAE,CACX,CAAC;QACF,GAAG,CAAC,MAAM,CAAC,IAAI,CACd,GAAG,kBAAkB,CAAC,wBAAwB,kBAAkB,WAAW,EAAE,CAC7E,CAAC;QACF,IAAI,CAAC,WAAW,EAAE,CAAC;YAClB,GAAG,CAAC,MAAM,CAAC,IAAI,CACd,GAAG,kBAAkB,CAAC,wBAAwB,WAAW,CACzD,CAAC;YACF,MAAM,KAAK,CAAC,iBAAiB,CAAC,wBAAwB,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;gBACtE,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACvB,CAAC,CAAC,CAAC;QACJ,CAAC;IACF,CAAC,CAAC,CAAC;IAEH,GAAG,CAAC,KAAK,EAAE,CAAC;AACb,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import type { KeyringPair } from "@polkadot/keyring/types";
|
|
2
2
|
import { type ProsopoConfigOutput } from "@prosopo/types";
|
|
3
|
-
export declare function getClientList(pair: KeyringPair, config: ProsopoConfigOutput): Promise<void>;
|
|
3
|
+
export declare function getClientList(pair: KeyringPair, cronSchedule: string, config: ProsopoConfigOutput): Promise<void>;
|
|
4
4
|
//# sourceMappingURL=getClientList.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getClientList.d.ts","sourceRoot":"","sources":["../../src/schedulers/getClientList.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAE3D,OAAO,EAAE,KAAK,mBAAmB,EAAsB,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"getClientList.d.ts","sourceRoot":"","sources":["../../src/schedulers/getClientList.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAE3D,OAAO,EAAE,KAAK,mBAAmB,EAAsB,MAAM,gBAAgB,CAAC;AAW9E,wBAAsB,aAAa,CAClC,IAAI,EAAE,WAAW,EACjB,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,mBAAmB,iBAwB3B"}
|
|
@@ -3,16 +3,10 @@ import { ScheduledTaskNames } from "@prosopo/types";
|
|
|
3
3
|
import { CronJob } from "cron";
|
|
4
4
|
import { Tasks } from "../tasks/tasks.js";
|
|
5
5
|
import { checkIfTaskIsRunning } from "../util.js";
|
|
6
|
-
export async function getClientList(pair, config) {
|
|
6
|
+
export async function getClientList(pair, cronSchedule, config) {
|
|
7
7
|
const env = new ProviderEnvironment(config, pair);
|
|
8
8
|
await env.isReady();
|
|
9
9
|
const tasks = new Tasks(env);
|
|
10
|
-
const defaultSchedule = "0 * * * *";
|
|
11
|
-
const cronSchedule = config.scheduledTasks?.clientListScheduler
|
|
12
|
-
? config.scheduledTasks.clientListScheduler.schedule
|
|
13
|
-
? config.scheduledTasks.clientListScheduler.schedule
|
|
14
|
-
: defaultSchedule
|
|
15
|
-
: defaultSchedule;
|
|
16
10
|
const job = new CronJob(cronSchedule, async () => {
|
|
17
11
|
const taskRunning = await checkIfTaskIsRunning(ScheduledTaskNames.GetClientList, env.getDb());
|
|
18
12
|
env.logger.info(`${ScheduledTaskNames.GetClientList} task running: ${taskRunning}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getClientList.js","sourceRoot":"","sources":["../../src/schedulers/getClientList.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAA4B,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAC9E,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"getClientList.js","sourceRoot":"","sources":["../../src/schedulers/getClientList.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAA4B,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAC9E,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAQlD,MAAM,CAAC,KAAK,UAAU,aAAa,CAClC,IAAiB,EACjB,YAAoB,EACpB,MAA2B;IAE3B,MAAM,GAAG,GAAG,IAAI,mBAAmB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAClD,MAAM,GAAG,CAAC,OAAO,EAAE,CAAC;IAEpB,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC;IAE7B,MAAM,GAAG,GAAG,IAAI,OAAO,CAAC,YAAY,EAAE,KAAK,IAAI,EAAE;QAChD,MAAM,WAAW,GAAG,MAAM,oBAAoB,CAC7C,kBAAkB,CAAC,aAAa,EAChC,GAAG,CAAC,KAAK,EAAE,CACX,CAAC;QACF,GAAG,CAAC,MAAM,CAAC,IAAI,CACd,GAAG,kBAAkB,CAAC,aAAa,kBAAkB,WAAW,EAAE,CAClE,CAAC;QACF,IAAI,CAAC,WAAW,EAAE,CAAC;YAClB,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,kBAAkB,CAAC,aAAa,WAAW,CAAC,CAAC;YAChE,MAAM,KAAK,CAAC,iBAAiB,CAAC,aAAa,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;gBAC3D,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACvB,CAAC,CAAC,CAAC;QACJ,CAAC;IACF,CAAC,CAAC,CAAC;IAEH,GAAG,CAAC,KAAK,EAAE,CAAC;AACb,CAAC"}
|
|
@@ -1,18 +1,21 @@
|
|
|
1
1
|
import { type Logger } from "@prosopo/common";
|
|
2
|
+
import { CaptchaDatabase } from "@prosopo/database";
|
|
2
3
|
import { type IUserSettings, type ProsopoConfigOutput, type Tier } from "@prosopo/types";
|
|
3
|
-
import type
|
|
4
|
+
import { type IProviderDatabase } from "@prosopo/types-database";
|
|
4
5
|
export declare class ClientTaskManager {
|
|
5
6
|
config: ProsopoConfigOutput;
|
|
6
7
|
logger: Logger;
|
|
7
8
|
providerDB: IProviderDatabase;
|
|
9
|
+
captchaDB: CaptchaDatabase | undefined;
|
|
8
10
|
constructor(config: ProsopoConfigOutput, logger: Logger, db: IProviderDatabase);
|
|
11
|
+
getCaptchaDB(mongoCaptchaUri: string): CaptchaDatabase;
|
|
9
12
|
storeCommitmentsExternal(): Promise<void>;
|
|
10
13
|
getClientList(): Promise<void>;
|
|
11
14
|
registerSiteKey(siteKey: string, tier: Tier, settings: IUserSettings): Promise<void>;
|
|
12
15
|
updateDetectorKey(detectorKey: string): Promise<void>;
|
|
13
16
|
removeDetectorKey(detectorKey: string): Promise<void>;
|
|
14
17
|
isSubdomainOrExactMatch(referrer: string, clientDomain: string): boolean;
|
|
15
|
-
private
|
|
18
|
+
private isRecordUpdated;
|
|
16
19
|
private processBatchesWithCursor;
|
|
17
20
|
}
|
|
18
21
|
//# sourceMappingURL=clientTasks.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clientTasks.d.ts","sourceRoot":"","sources":["../../../src/tasks/client/clientTasks.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,KAAK,MAAM,EAAmB,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"clientTasks.d.ts","sourceRoot":"","sources":["../../../src/tasks/client/clientTasks.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,KAAK,MAAM,EAAmB,MAAM,iBAAiB,CAAC;AAC/D,OAAO,EAAE,eAAe,EAAkB,MAAM,mBAAmB,CAAC;AACpE,OAAO,EACN,KAAK,aAAa,EAClB,KAAK,mBAAmB,EAGxB,KAAK,IAAI,EACT,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAGN,KAAK,iBAAiB,EAMtB,MAAM,yBAAyB,CAAC;AAoBjC,qBAAa,iBAAiB;IAC7B,MAAM,EAAE,mBAAmB,CAAC;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,iBAAiB,CAAC;IAC9B,SAAS,EAAE,eAAe,GAAG,SAAS,CAAC;gBAEtC,MAAM,EAAE,mBAAmB,EAC3B,MAAM,EAAE,MAAM,EACd,EAAE,EAAE,iBAAiB;IAWtB,YAAY,CAAC,eAAe,EAAE,MAAM,GAAG,eAAe;IAmBhD,wBAAwB,IAAI,OAAO,CAAC,IAAI,CAAC;IAqJzC,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAgE9B,eAAe,CACpB,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,IAAI,EACV,QAAQ,EAAE,aAAa,GACrB,OAAO,CAAC,IAAI,CAAC;IAWV,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAUrD,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAU3D,uBAAuB,CAAC,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO;IAoBxE,OAAO,CAAC,eAAe;YAWT,wBAAwB;CAatC"}
|
|
@@ -24,6 +24,15 @@ export class ClientTaskManager {
|
|
|
24
24
|
this.logger = logger;
|
|
25
25
|
this.providerDB = db;
|
|
26
26
|
}
|
|
27
|
+
getCaptchaDB(mongoCaptchaUri) {
|
|
28
|
+
if (this.captchaDB) {
|
|
29
|
+
return this.captchaDB;
|
|
30
|
+
}
|
|
31
|
+
if (!this.captchaDB) {
|
|
32
|
+
this.captchaDB = new CaptchaDatabase(mongoCaptchaUri, undefined, undefined, this.logger);
|
|
33
|
+
}
|
|
34
|
+
return this.captchaDB;
|
|
35
|
+
}
|
|
27
36
|
async storeCommitmentsExternal() {
|
|
28
37
|
if (!this.config.mongoCaptchaUri) {
|
|
29
38
|
this.logger.info("Mongo env not set");
|
|
@@ -33,40 +42,77 @@ export class ClientTaskManager {
|
|
|
33
42
|
const taskID = await this.providerDB.createScheduledTaskStatus(ScheduledTaskNames.StoreCommitmentsExternal, ScheduledTaskStatus.Running);
|
|
34
43
|
try {
|
|
35
44
|
const BATCH_SIZE = 1000;
|
|
36
|
-
const captchaDB =
|
|
45
|
+
const captchaDB = this.getCaptchaDB(this.config.mongoCaptchaUri);
|
|
37
46
|
let processedCommitments = 0;
|
|
38
47
|
await this.processBatchesWithCursor(async (skip) => await this.providerDB.getUnstoredDappUserCommitments(BATCH_SIZE, skip), async (batch) => {
|
|
39
|
-
const lastUpdated = lastTask?.updated || 0;
|
|
40
48
|
const filteredBatch = lastTask?.updated
|
|
41
|
-
? batch.filter((commitment) => this.
|
|
49
|
+
? batch.filter((commitment) => this.isRecordUpdated(commitment))
|
|
42
50
|
: batch;
|
|
43
51
|
if (filteredBatch.length > 0) {
|
|
44
|
-
await captchaDB.saveCaptchas(filteredBatch, []);
|
|
52
|
+
await captchaDB.saveCaptchas([], filteredBatch, []);
|
|
45
53
|
await this.providerDB.markDappUserCommitmentsStored(filteredBatch.map((commitment) => commitment.id));
|
|
46
54
|
}
|
|
47
55
|
processedCommitments += filteredBatch.length;
|
|
48
56
|
});
|
|
49
57
|
let processedPowRecords = 0;
|
|
50
58
|
await this.processBatchesWithCursor(async (skip) => await this.providerDB.getUnstoredDappUserPoWCommitments(BATCH_SIZE, skip), async (batch) => {
|
|
51
|
-
const lastUpdated = lastTask?.updated || 0;
|
|
52
59
|
const filteredBatch = lastTask?.updated
|
|
53
|
-
? batch.filter((record) => this.
|
|
60
|
+
? batch.filter((record) => this.isRecordUpdated(record))
|
|
54
61
|
: batch;
|
|
55
62
|
if (filteredBatch.length > 0) {
|
|
56
|
-
await captchaDB.saveCaptchas([], filteredBatch);
|
|
63
|
+
await captchaDB.saveCaptchas([], [], filteredBatch);
|
|
57
64
|
await this.providerDB.markDappUserPoWCommitmentsStored(filteredBatch.map((record) => record.challenge));
|
|
58
65
|
}
|
|
59
66
|
processedPowRecords += filteredBatch.length;
|
|
60
67
|
});
|
|
68
|
+
let processedSessionRecords = 0;
|
|
69
|
+
await this.processBatchesWithCursor(async (skip) => await this.providerDB.getUnstoredSessionRecords(BATCH_SIZE, skip), async (batch) => {
|
|
70
|
+
const filteredBatch = lastTask?.updated
|
|
71
|
+
? batch.filter((record) => this.isRecordUpdated(record))
|
|
72
|
+
: batch;
|
|
73
|
+
const frictionlessTokenRecords = await this.providerDB.getFrictionlessTokenRecordsByTokenIds(filteredBatch.map((record) => record.tokenId));
|
|
74
|
+
this.logger.info(`Frictionless token records: ${frictionlessTokenRecords.length}`);
|
|
75
|
+
const filteredBatchWithScores = filteredBatch.map((record) => {
|
|
76
|
+
const tokenRecord = frictionlessTokenRecords.find((tokenRecord) => tokenRecord._id?.toString() === record.tokenId.toString());
|
|
77
|
+
if (!tokenRecord) {
|
|
78
|
+
this.logger.error({
|
|
79
|
+
message: "No token record found",
|
|
80
|
+
context: { tokenId: record.tokenId },
|
|
81
|
+
});
|
|
82
|
+
return {
|
|
83
|
+
...record,
|
|
84
|
+
score: 0,
|
|
85
|
+
scoreComponents: {
|
|
86
|
+
baseScore: 0,
|
|
87
|
+
},
|
|
88
|
+
threshold: 0,
|
|
89
|
+
};
|
|
90
|
+
}
|
|
91
|
+
return {
|
|
92
|
+
...record,
|
|
93
|
+
score: tokenRecord?.score || 0,
|
|
94
|
+
scoreComponents: tokenRecord?.scoreComponents,
|
|
95
|
+
threshold: tokenRecord?.threshold || 0,
|
|
96
|
+
};
|
|
97
|
+
});
|
|
98
|
+
if (filteredBatch.length > 0) {
|
|
99
|
+
await captchaDB.saveCaptchas(filteredBatchWithScores, [], []);
|
|
100
|
+
await this.providerDB.markSessionRecordsStored(filteredBatch.map((record) => record.sessionId));
|
|
101
|
+
}
|
|
102
|
+
processedSessionRecords += filteredBatch.length;
|
|
103
|
+
});
|
|
61
104
|
await this.providerDB.updateScheduledTaskStatus(taskID, ScheduledTaskStatus.Completed, {
|
|
62
105
|
data: {
|
|
106
|
+
processedSessionRecords,
|
|
63
107
|
processedCommitments,
|
|
64
108
|
processedPowRecords,
|
|
65
109
|
},
|
|
66
110
|
});
|
|
111
|
+
this.captchaDB?.close();
|
|
67
112
|
}
|
|
68
113
|
catch (e) {
|
|
69
114
|
this.logger.error(e);
|
|
115
|
+
this.captchaDB?.close();
|
|
70
116
|
await this.providerDB.updateScheduledTaskStatus(taskID, ScheduledTaskStatus.Failed, { error: String(e) });
|
|
71
117
|
}
|
|
72
118
|
}
|
|
@@ -152,8 +198,8 @@ export class ClientTaskManager {
|
|
|
152
198
|
return false;
|
|
153
199
|
}
|
|
154
200
|
}
|
|
155
|
-
|
|
156
|
-
const { lastUpdatedTimestamp, storedAtTimestamp } =
|
|
201
|
+
isRecordUpdated(record) {
|
|
202
|
+
const { lastUpdatedTimestamp, storedAtTimestamp } = record;
|
|
157
203
|
return (!lastUpdatedTimestamp ||
|
|
158
204
|
!storedAtTimestamp ||
|
|
159
205
|
lastUpdatedTimestamp > storedAtTimestamp);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clientTasks.js","sourceRoot":"","sources":["../../../src/tasks/client/clientTasks.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAe,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAC/D,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACpE,OAAO,EAGN,kBAAkB,EAClB,mBAAmB,GAEnB,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"clientTasks.js","sourceRoot":"","sources":["../../../src/tasks/client/clientTasks.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@ export declare class ImgCaptchaManager extends CaptchaManager {
|
|
|
7
7
|
config: ProsopoConfigOutput;
|
|
8
8
|
constructor(db: IProviderDatabase, pair: KeyringPair, config: ProsopoConfigOutput, logger?: Logger);
|
|
9
9
|
getCaptchaWithProof(datasetId: Hash, solved: boolean, size: number): Promise<Captcha[]>;
|
|
10
|
-
getRandomCaptchasAndRequestHash(datasetId: Hash, userAccount: string, ipAddress: IPAddress, captchaConfig: ProsopoCaptchaCountConfigSchemaOutput, frictionlessTokenId?: FrictionlessTokenId): Promise<{
|
|
10
|
+
getRandomCaptchasAndRequestHash(datasetId: Hash, userAccount: string, ipAddress: IPAddress, captchaConfig: ProsopoCaptchaCountConfigSchemaOutput, threshold: number, frictionlessTokenId?: FrictionlessTokenId): Promise<{
|
|
11
11
|
captchas: Captcha[];
|
|
12
12
|
requestHash: string;
|
|
13
13
|
timestamp: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"imgCaptchaTasks.d.ts","sourceRoot":"","sources":["../../../src/tasks/imgCaptcha/imgCaptchaTasks.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAG3D,OAAO,EAAE,KAAK,MAAM,EAAmB,MAAM,iBAAiB,CAAC;AAM/D,OAAO,EAEN,KAAK,OAAO,EACZ,KAAK,eAAe,EAGpB,KAAK,sBAAsB,EAC3B,KAAK,IAAI,EACT,KAAK,SAAS,EACd,KAAK,yBAAyB,EAC9B,KAAK,qCAAqC,EAC1C,KAAK,mBAAmB,EACxB,KAAK,cAAc,EACnB,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EACX,YAAY,EACZ,mBAAmB,EACnB,iBAAiB,EACjB,qBAAqB,EACrB,cAAc,EACd,MAAM,yBAAyB,CAAC;AAIjC,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAItD,qBAAa,iBAAkB,SAAQ,cAAc;IACpD,MAAM,EAAE,mBAAmB,CAAC;gBAG3B,EAAE,EAAE,iBAAiB,EACrB,IAAI,EAAE,WAAW,EACjB,MAAM,EAAE,mBAAmB,EAC3B,MAAM,CAAC,EAAE,MAAM;IAMV,mBAAmB,CACxB,SAAS,EAAE,IAAI,EACf,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,MAAM,GACV,OAAO,CAAC,OAAO,EAAE,CAAC;IAgBf,+BAA+B,CACpC,SAAS,EAAE,IAAI,EACf,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,SAAS,EACpB,aAAa,EAAE,qCAAqC,EACpD,mBAAmB,CAAC,EAAE,mBAAmB,GACvC,OAAO,CAAC;QACV,QAAQ,EAAE,OAAO,EAAE,CAAC;QACpB,WAAW,EAAE,MAAM,CAAC;QACpB,SAAS,EAAE,MAAM,CAAC;QAClB,iBAAiB,EAAE,MAAM,CAAC;KAC1B,CAAC;
|
|
1
|
+
{"version":3,"file":"imgCaptchaTasks.d.ts","sourceRoot":"","sources":["../../../src/tasks/imgCaptcha/imgCaptchaTasks.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAG3D,OAAO,EAAE,KAAK,MAAM,EAAmB,MAAM,iBAAiB,CAAC;AAM/D,OAAO,EAEN,KAAK,OAAO,EACZ,KAAK,eAAe,EAGpB,KAAK,sBAAsB,EAC3B,KAAK,IAAI,EACT,KAAK,SAAS,EACd,KAAK,yBAAyB,EAC9B,KAAK,qCAAqC,EAC1C,KAAK,mBAAmB,EACxB,KAAK,cAAc,EACnB,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EACX,YAAY,EACZ,mBAAmB,EACnB,iBAAiB,EACjB,qBAAqB,EACrB,cAAc,EACd,MAAM,yBAAyB,CAAC;AAIjC,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAItD,qBAAa,iBAAkB,SAAQ,cAAc;IACpD,MAAM,EAAE,mBAAmB,CAAC;gBAG3B,EAAE,EAAE,iBAAiB,EACrB,IAAI,EAAE,WAAW,EACjB,MAAM,EAAE,mBAAmB,EAC3B,MAAM,CAAC,EAAE,MAAM;IAMV,mBAAmB,CACxB,SAAS,EAAE,IAAI,EACf,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,MAAM,GACV,OAAO,CAAC,OAAO,EAAE,CAAC;IAgBf,+BAA+B,CACpC,SAAS,EAAE,IAAI,EACf,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,SAAS,EACpB,aAAa,EAAE,qCAAqC,EACpD,SAAS,EAAE,MAAM,EACjB,mBAAmB,CAAC,EAAE,mBAAmB,GACvC,OAAO,CAAC;QACV,QAAQ,EAAE,OAAO,EAAE,CAAC;QACpB,WAAW,EAAE,MAAM,CAAC;QACpB,SAAS,EAAE,MAAM,CAAC;QAClB,iBAAiB,EAAE,MAAM,CAAC;KAC1B,CAAC;IAqFI,gBAAgB,CACrB,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,eAAe,EAAE,EAC3B,sBAAsB,EAAE,MAAM,EAC9B,SAAS,EAAE,MAAM,EACjB,4BAA4B,EAAE,MAAM,EACpC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,cAAc,EACvB,GAAG,EAAE,MAAM,GACT,OAAO,CAAC,sBAAsB,CAAC;IA2I5B,6CAA6C,CAClD,QAAQ,EAAE,eAAe,EAAE,GACzB,OAAO,CAAC;QACV,cAAc,EAAE,OAAO,EAAE,CAAC;QAC1B,gBAAgB,EAAE,eAAe,EAAE,CAAC;QACpC,UAAU,EAAE,MAAM,EAAE,CAAC;KACrB,CAAC;IAqCI,wCAAwC,CAC7C,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,qBAAqB,EACpC,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,EAAE,GAClB,OAAO,CAAC,OAAO,CAAC;IA2Bb,yBAAyB,CAC9B,YAAY,EAAE,MAAM,GAClB,OAAO,CAAC,cAAc,CAAC;IAepB,8BAA8B,CACnC,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,GACjB,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC;IAehC,0BAA0B,CAC/B,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,YAAY,EAAE,MAAM,GAAG,SAAS,EAChC,eAAe,CAAC,EAAE,MAAM,GACtB,OAAO,CAAC,yBAAyB,CAAC;IA+DrC,cAAc,CAAC,cAAc,EAAE,MAAM,GAAG,MAAM;IAIrC,uBAAuB,CAC/B,QAAQ,EAAE,OAAO,EACjB,YAAY,EAAE,YAAY,EAC1B,WAAW,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,EACpC,KAAK,CAAC,EAAE,MAAM,EACd,YAAY,CAAC,EAAE,IAAI,GACjB,yBAAyB;CAa5B"}
|
|
@@ -28,7 +28,7 @@ export class ImgCaptchaManager extends CaptchaManager {
|
|
|
28
28
|
}
|
|
29
29
|
return captchaDocs;
|
|
30
30
|
}
|
|
31
|
-
async getRandomCaptchasAndRequestHash(datasetId, userAccount, ipAddress, captchaConfig, frictionlessTokenId) {
|
|
31
|
+
async getRandomCaptchasAndRequestHash(datasetId, userAccount, ipAddress, captchaConfig, threshold, frictionlessTokenId) {
|
|
32
32
|
const dataset = await this.db.getDatasetDetails(datasetId);
|
|
33
33
|
if (!dataset) {
|
|
34
34
|
throw new ProsopoEnvError("DATABASE.DATASET_GET_FAILED", {
|
|
@@ -58,7 +58,7 @@ export class ImgCaptchaManager extends CaptchaManager {
|
|
|
58
58
|
.map((captcha) => captcha.timeLimitMs || DEFAULT_IMAGE_CAPTCHA_TIMEOUT)
|
|
59
59
|
.reduce((a, b) => a + b, 0);
|
|
60
60
|
const deadlineTs = timeLimit + currentTime;
|
|
61
|
-
await this.db.storePendingImageCommitment(userAccount, requestHash, salt, deadlineTs, currentTime, ipAddress.bigInt(), frictionlessTokenId);
|
|
61
|
+
await this.db.storePendingImageCommitment(userAccount, requestHash, salt, deadlineTs, currentTime, ipAddress.bigInt(), threshold, frictionlessTokenId);
|
|
62
62
|
return {
|
|
63
63
|
captchas,
|
|
64
64
|
requestHash,
|
|
@@ -119,7 +119,17 @@ export class ImgCaptchaManager extends CaptchaManager {
|
|
|
119
119
|
ja4,
|
|
120
120
|
};
|
|
121
121
|
await this.db.storeUserImageCaptchaSolution(receivedCaptchas, commit);
|
|
122
|
-
|
|
122
|
+
const solutionRecords = await Promise.all(storedCaptchas.map(async (captcha) => {
|
|
123
|
+
const solutionRecord = await this.db.getSolutionByCaptchaId(captcha.captchaId);
|
|
124
|
+
if (!solutionRecord) {
|
|
125
|
+
throw new ProsopoEnvError("CAPTCHA.SOLUTION_NOT_FOUND", {
|
|
126
|
+
context: { failedFuncName: this.dappUserSolution.name },
|
|
127
|
+
});
|
|
128
|
+
}
|
|
129
|
+
return solutionRecord;
|
|
130
|
+
}));
|
|
131
|
+
const totalImages = storedCaptchas[0]?.items.length || 0;
|
|
132
|
+
if (compareCaptchaSolutions(receivedCaptchas, solutionRecords, totalImages, pendingRecord.threshold)) {
|
|
123
133
|
response = {
|
|
124
134
|
captchas: captchaIds.map((id) => ({
|
|
125
135
|
captchaId: id,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"imgCaptchaTasks.js","sourceRoot":"","sources":["../../../src/tasks/imgCaptcha/imgCaptchaTasks.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"imgCaptchaTasks.js","sourceRoot":"","sources":["../../../src/tasks/imgCaptcha/imgCaptchaTasks.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACrE,OAAO,EAAe,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAC/D,OAAO,EACN,uBAAuB,EACvB,yBAAyB,EACzB,4BAA4B,GAC5B,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACN,SAAS,EAGT,aAAa,EACb,6BAA6B,GAQ7B,MAAM,gBAAgB,CAAC;AAQxB,OAAO,EAAE,EAAE,EAAE,MAAM,eAAe,CAAC;AACnC,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,wBAAwB,EAAE,MAAM,2CAA2C,CAAC;AACrF,OAAO,EAAE,2BAA2B,EAAE,MAAM,2BAA2B,CAAC;AAExE,MAAM,OAAO,iBAAkB,SAAQ,cAAc;IAGpD,YACC,EAAqB,EACrB,IAAiB,EACjB,MAA2B,EAC3B,MAAe;QAEf,KAAK,CAAC,EAAE,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;QACxB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACtB,CAAC;IAED,KAAK,CAAC,mBAAmB,CACxB,SAAe,EACf,MAAe,EACf,IAAY;QAEZ,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,gBAAgB,CAAC,MAAM,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;QAC5E,IAAI,CAAC,WAAW,EAAE,CAAC;YAClB,MAAM,IAAI,eAAe,CAAC,6BAA6B,EAAE;gBACxD,OAAO,EAAE;oBACR,cAAc,EAAE,IAAI,CAAC,mBAAmB,CAAC,IAAI;oBAC7C,SAAS;oBACT,MAAM;oBACN,IAAI;iBACJ;aACD,CAAC,CAAC;QACJ,CAAC;QAED,OAAO,WAAW,CAAC;IACpB,CAAC;IAED,KAAK,CAAC,+BAA+B,CACpC,SAAe,EACf,WAAmB,EACnB,SAAoB,EACpB,aAAoD,EACpD,SAAiB,EACjB,mBAAyC;QAOzC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC;QAC3D,IAAI,CAAC,OAAO,EAAE,CAAC;YACd,MAAM,IAAI,eAAe,CAAC,6BAA6B,EAAE;gBACxD,OAAO,EAAE;oBACR,cAAc,EAAE,IAAI,CAAC,+BAA+B,CAAC,IAAI;oBACzD,OAAO;oBACP,SAAS;iBACT;aACD,CAAC,CAAC;QACJ,CAAC;QAED,MAAM,aAAa,GAAW,IAAI,CAAC,GAAG,CACrC,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,QAAQ,CAAC,KAAK,CAAC,CACxC,CAAC;QACF,MAAM,WAAW,GAAW,IAAI,CAAC,GAAG,CACnC,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,KAAK,CAAC,CACtC,CAAC;QAEF,IAAI,CAAC,WAAW,EAAE,CAAC;YAClB,MAAM,IAAI,eAAe,CAAC,+BAA+B,CAAC,CAAC;QAC5D,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,SAAS,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC;QAE5E,IAAI,QAAQ,GAAc,EAAE,CAAC;QAC7B,IAAI,aAAa,EAAE,CAAC;YACnB,QAAQ,GAAG,MAAM,IAAI,CAAC,mBAAmB,CACxC,SAAS,EACT,KAAK,EACL,aAAa,CACb,CAAC;QACH,CAAC;QACD,MAAM,QAAQ,GAAc,YAAY,CAAC,CAAC,GAAG,MAAM,EAAE,GAAG,QAAQ,CAAC,CAAC,CAAC;QACnE,MAAM,IAAI,GAAG,WAAW,EAAE,CAAC;QAE3B,MAAM,WAAW,GAAG,yBAAyB,CAC5C,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,EAChC,WAAW,EACX,IAAI,CACJ,CAAC;QAEF,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC/B,MAAM,iBAAiB,GAAG,QAAQ,CACjC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,CACxC,CAAC;QAEF,MAAM,SAAS,GAAG,QAAQ;aAExB,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,WAAW,IAAI,6BAA6B,CAAC;aACtE,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;QAC7B,MAAM,UAAU,GAAG,SAAS,GAAG,WAAW,CAAC;QAE3C,MAAM,IAAI,CAAC,EAAE,CAAC,2BAA2B,CACxC,WAAW,EACX,WAAW,EACX,IAAI,EACJ,UAAU,EACV,WAAW,EACX,SAAS,CAAC,MAAM,EAAE,EAClB,SAAS,EACT,mBAAmB,CACnB,CAAC;QACF,OAAO;YACN,QAAQ;YACR,WAAW;YACX,SAAS,EAAE,WAAW;YACtB,iBAAiB;SACjB,CAAC;IACH,CAAC;IAgBD,KAAK,CAAC,gBAAgB,CACrB,WAAmB,EACnB,WAAmB,EACnB,WAAmB,EACnB,QAA2B,EAC3B,sBAA8B,EAC9B,SAAiB,EACjB,4BAAoC,EACpC,SAAiB,EACjB,OAAuB,EACvB,GAAW;QAGX,MAAM,YAAY,GAAG,eAAe,CACnC,WAAW,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,EACjC,sBAAsB,EACtB,WAAW,CACX,CAAC;QACF,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC;YAE3B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,kCAAkC,CAAC,CAAC;YACrD,MAAM,IAAI,eAAe,CAAC,2BAA2B,EAAE;gBACtD,OAAO,EAAE,EAAE,cAAc,EAAE,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,WAAW,EAAE;aACpE,CAAC,CAAC;QACJ,CAAC;QAGD,MAAM,kCAAkC,GAAG,eAAe,CACzD,WAAW,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC,EACnC,4BAA4B,EAC5B,IAAI,CAAC,IAAI,CAAC,OAAO,CACjB,CAAC;QAEF,IAAI,CAAC,kCAAkC,CAAC,OAAO,EAAE,CAAC;YACjD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,wCAAwC,CAAC,CAAC;YAE3D,MAAM,IAAI,eAAe,CAAC,2BAA2B,EAAE;gBACtD,OAAO,EAAE;oBACR,cAAc,EAAE,IAAI,CAAC,gBAAgB,CAAC,IAAI;oBAC1C,WAAW;oBACX,KAAK,EAAE,kCAAkC;iBACzC;aACD,CAAC,CAAC;QACJ,CAAC;QAED,IAAI,QAAQ,GAA2B;YACtC,QAAQ,EAAE,EAAE;YACZ,QAAQ,EAAE,KAAK;SACf,CAAC;QAEF,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,yBAAyB,CAAC,WAAW,CAAC,CAAC;QAE3E,MAAM,oBAAoB,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAC1E,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,wCAAwC,CACzE,WAAW,EACX,aAAa,EACb,WAAW,EACX,oBAAoB,CACpB,CAAC;QACF,IAAI,cAAc,EAAE,CAAC;YACpB,MAAM,EAAE,cAAc,EAAE,gBAAgB,EAAE,UAAU,EAAE,GACrD,MAAM,IAAI,CAAC,6CAA6C,CAAC,QAAQ,CAAC,CAAC;YAEpE,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,GAC3B,2BAA2B,CAAC,gBAAgB,CAAC,CAAC;YAE/C,MAAM,SAAS,GAAG,EAAE,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;YAElD,IAAI,CAAC,SAAS,EAAE,CAAC;gBAChB,MAAM,IAAI,eAAe,CAAC,qBAAqB,EAAE;oBAChD,OAAO,EAAE,EAAE,cAAc,EAAE,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE;iBACvD,CAAC,CAAC;YACJ,CAAC;YAID,MAAM,IAAI,CAAC,EAAE,CAAC,kCAAkC,CAAC,WAAW,CAAC,CAAC;YAC9D,MAAM,MAAM,GAAmB;gBAC9B,EAAE,EAAE,YAAY;gBAChB,WAAW,EAAE,WAAW;gBACxB,WAAW;gBACX,eAAe,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO;gBAClC,SAAS;gBACT,MAAM,EAAE,EAAE,MAAM,EAAE,aAAa,CAAC,OAAO,EAAE;gBACzC,aAAa,EAAE,sBAAsB;gBACrC,aAAa,EAAE,IAAI;gBACnB,aAAa,EAAE,KAAK;gBACpB,oBAAoB,EAAE,SAAS;gBAC/B,SAAS;gBACT,OAAO;gBACP,mBAAmB,EAAE,aAAa,CAAC,mBAAmB;gBACtD,GAAG;aACH,CAAC;YACF,MAAM,IAAI,CAAC,EAAE,CAAC,6BAA6B,CAAC,gBAAgB,EAAE,MAAM,CAAC,CAAC;YAEtE,MAAM,eAAe,GAAG,MAAM,OAAO,CAAC,GAAG,CACxC,cAAc,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;gBACpC,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,sBAAsB,CAC1D,OAAO,CAAC,SAAS,CACjB,CAAC;gBACF,IAAI,CAAC,cAAc,EAAE,CAAC;oBACrB,MAAM,IAAI,eAAe,CAAC,4BAA4B,EAAE;wBACvD,OAAO,EAAE,EAAE,cAAc,EAAE,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE;qBACvD,CAAC,CAAC;gBACJ,CAAC;gBACD,OAAO,cAAc,CAAC;YACvB,CAAC,CAAC,CACF,CAAC;YAEF,MAAM,WAAW,GAAG,cAAc,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,MAAM,IAAI,CAAC,CAAC;YAEzD,IACC,uBAAuB,CACtB,gBAAgB,EAChB,eAAe,EACf,WAAW,EACX,aAAa,CAAC,SAAS,CACvB,EACA,CAAC;gBACF,QAAQ,GAAG;oBACV,QAAQ,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;wBACjC,SAAS,EAAE,EAAE;wBACb,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;qBACrB,CAAC,CAAC;oBACH,QAAQ,EAAE,IAAI;iBACd,CAAC;gBACF,MAAM,IAAI,CAAC,EAAE,CAAC,yBAAyB,CAAC,YAAY,CAAC,CAAC;YACvD,CAAC;iBAAM,CAAC;gBACP,MAAM,IAAI,CAAC,EAAE,CAAC,4BAA4B,CACzC,YAAY,EACZ,0BAA0B,CAC1B,CAAC;gBACF,QAAQ,GAAG;oBACV,QAAQ,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;wBACjC,SAAS,EAAE,EAAE;wBACb,KAAK,EAAE,CAAC,EAAE,CAAC;qBACX,CAAC,CAAC;oBACH,QAAQ,EAAE,KAAK;iBACf,CAAC;YACH,CAAC;QACF,CAAC;aAAM,CAAC;YACP,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;QAC5C,CAAC;QACD,OAAO,QAAQ,CAAC;IACjB,CAAC;IAMD,KAAK,CAAC,6CAA6C,CAClD,QAA2B;QAM3B,MAAM,gBAAgB,GAAG,4BAA4B,CAAC,QAAQ,CAAC,CAAC;QAChE,MAAM,UAAU,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACxE,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;QAChE,IAAI,CAAC,cAAc,IAAI,gBAAgB,CAAC,MAAM,KAAK,cAAc,CAAC,MAAM,EAAE,CAAC;YAC1E,MAAM,IAAI,eAAe,CAAC,4BAA4B,EAAE;gBACvD,OAAO,EAAE;oBACR,cAAc,EACb,IAAI,CAAC,6CAA6C,CAAC,IAAI;oBAExD,QAAQ;iBACR;aACD,CAAC,CAAC;QACJ,CAAC;QACD,IACC,CAAC,cAAc,CAAC,KAAK,CACpB,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,SAAS,KAAK,EAAE,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,SAAS,CAClE,EACA,CAAC;YACF,MAAM,IAAI,eAAe,CAAC,+BAA+B,EAAE;gBAC1D,OAAO,EAAE;oBACR,cAAc,EACb,IAAI,CAAC,6CAA6C,CAAC,IAAI;oBACxD,QAAQ;iBACR;aACD,CAAC,CAAC;QACJ,CAAC;QACD,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,UAAU,EAAE,CAAC;IACzD,CAAC;IASD,KAAK,CAAC,wCAAwC,CAC7C,WAAmB,EACnB,aAAoC,EACpC,WAAmB,EACnB,UAAoB;QAEpB,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAE/B,IAAI,CAAC,aAAa,EAAE,CAAC;YACpB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;YAC5C,OAAO,KAAK,CAAC;QACd,CAAC;QAED,IAAI,aAAa,CAAC,iBAAiB,GAAG,WAAW,EAAE,CAAC;YAEnD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,gDAAgD,CAAC,CAAC;YACnE,OAAO,KAAK,CAAC;QACd,CAAC;QACD,IAAI,aAAa,EAAE,CAAC;YACnB,MAAM,mBAAmB,GAAG,yBAAyB,CACpD,UAAU,EACV,WAAW,EACX,aAAa,CAAC,IAAI,CAClB,CAAC;YACF,OAAO,WAAW,KAAK,mBAAmB,CAAC;QAC5C,CAAC;QACD,OAAO,KAAK,CAAC;IACd,CAAC;IAKD,KAAK,CAAC,yBAAyB,CAC9B,YAAoB;QAEpB,MAAM,gBAAgB,GACrB,MAAM,IAAI,CAAC,EAAE,CAAC,yBAAyB,CAAC,YAAY,CAAC,CAAC;QACvD,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACvB,MAAM,IAAI,eAAe,CAAC,sCAAsC,EAAE;gBACjE,OAAO,EAAE;oBACR,cAAc,EAAE,IAAI,CAAC,yBAAyB,CAAC,IAAI;oBACnD,YAAY,EAAE,YAAY;iBAC1B;aACD,CAAC,CAAC;QACJ,CAAC;QACD,OAAO,gBAAgB,CAAC;IACzB,CAAC;IAGD,KAAK,CAAC,8BAA8B,CACnC,WAAmB,EACnB,WAAmB;QAEnB,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,8BAA8B,CACrE,WAAW,EACX,WAAW,CACX,CAAC;QACF,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAClC,KAAK,MAAM,gBAAgB,IAAI,iBAAiB,EAAE,CAAC;gBAClD,IAAI,gBAAgB,CAAC,MAAM,CAAC,MAAM,KAAK,aAAa,CAAC,QAAQ,EAAE,CAAC;oBAC/D,OAAO,gBAAgB,CAAC;gBACzB,CAAC;YACF,CAAC;QACF,CAAC;QACD,OAAO,SAAS,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,0BAA0B,CAC/B,IAAY,EACZ,IAAY,EACZ,YAAgC,EAChC,eAAwB;QAExB,MAAM,QAAQ,GAAG,MAAM,CAAC,YAAY;YACnC,CAAC,CAAC,IAAI,CAAC,yBAAyB,CAAC,YAAY,CAAC;YAC9C,CAAC,CAAC,IAAI,CAAC,8BAA8B,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;QAGpD,IAAI,CAAC,QAAQ,EAAE,CAAC;YACf,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,kCAAkC,CAAC,CAAC;YACtD,OAAO,EAAE,MAAM,EAAE,mCAAmC,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;QACzE,CAAC;QAED,IAAI,QAAQ,CAAC,aAAa,EAAE,CAAC;YAC5B,OAAO,EAAE,MAAM,EAAE,2BAA2B,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;QACjE,CAAC;QAED,MAAM,IAAI,CAAC,EAAE,CAAC,8BAA8B,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC;QAG5D,IAAI,QAAQ,CAAC,MAAM,CAAC,MAAM,KAAK,aAAa,CAAC,WAAW,EAAE,CAAC;YAC1D,OAAO,EAAE,MAAM,EAAE,uBAAuB,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;QAC7D,CAAC;QAED,eAAe,GAAG,eAAe,IAAI,EAAE,GAAG,IAAI,CAAC;QAG/C,IAAI,eAAe,EAAE,CAAC;YACrB,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAC/B,MAAM,mBAAmB,GAAG,WAAW,GAAG,QAAQ,CAAC,oBAAoB,CAAC;YAGxE,IAAI,mBAAmB,GAAG,eAAe,EAAE,CAAC;gBAC3C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;gBAC9C,OAAO;oBACN,MAAM,EAAE,oCAAoC;oBAC5C,QAAQ,EAAE,KAAK;iBACf,CAAC;YACH,CAAC;QACF,CAAC;QAED,MAAM,UAAU,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,KAAK,aAAa,CAAC,QAAQ,CAAC;QAErE,IAAI,KAAyB,CAAC;QAC9B,IAAI,QAAQ,CAAC,mBAAmB,EAAE,CAAC;YAClC,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,mCAAmC,CACpE,QAAQ,CAAC,mBAAmB,CAC5B,CAAC;YACF,IAAI,WAAW,EAAE,CAAC;gBACjB,KAAK,GAAG,wBAAwB,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;gBAC/D,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;oBAChB,gBAAgB,EAAE,WAAW,EAAE,eAAe;oBAC9C,KAAK,EAAE,KAAK;iBACZ,CAAC,CAAC;YACJ,CAAC;QACF,CAAC;QAED,OAAO;YACN,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,uBAAuB;YAClE,QAAQ,EAAE,UAAU;YACpB,YAAY,EAAE,QAAQ,CAAC,EAAE,CAAC,QAAQ,EAAE;YACpC,GAAG,CAAC,KAAK,IAAI,EAAE,KAAK,EAAE,CAAC;SACvB,CAAC;IACH,CAAC;IAED,cAAc,CAAC,cAAsB;QACpC,OAAO,cAAc,CAAC,IAAI,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IACpD,CAAC;IAEQ,uBAAuB,CAC/B,QAAiB,EACjB,YAA0B,EAC1B,WAAoC,EACpC,KAAc,EACd,YAAmB;QAEnB,OAAO;YACN,GAAG,KAAK,CAAC,uBAAuB,CAC/B,QAAQ,EACR,YAAY,EACZ,WAAW,EACX,KAAK,CACL;YACD,GAAG,CAAC,YAAY,IAAI;gBACnB,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE,YAAY;aACtC,CAAC;SACF,CAAC;IACH,CAAC;CACD"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ja4Middleware.unit.test.d.ts","sourceRoot":"","sources":["../../../../src/tests/unit/api/ja4Middleware.unit.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,57 @@
|
|
|
1
|
+
import { describe, expect, it, vi } from "vitest";
|
|
2
|
+
import { DEFAULT_JA4, getJA4, ja4Middleware, } from "../../../api/ja4Middleware.js";
|
|
3
|
+
describe("ja4Middleware", () => {
|
|
4
|
+
it("should return default JA4 if an error occurs", async () => {
|
|
5
|
+
const mockReq = {
|
|
6
|
+
headers: {},
|
|
7
|
+
logger: {
|
|
8
|
+
error: vi.fn(),
|
|
9
|
+
},
|
|
10
|
+
};
|
|
11
|
+
const mockRes = {};
|
|
12
|
+
const mockNext = vi.fn();
|
|
13
|
+
const ja4MiddlewareInstance = ja4Middleware({});
|
|
14
|
+
await ja4MiddlewareInstance(mockReq, mockRes, mockNext);
|
|
15
|
+
expect(mockReq.ja4).toBe(DEFAULT_JA4);
|
|
16
|
+
});
|
|
17
|
+
});
|
|
18
|
+
describe("getJA4", () => {
|
|
19
|
+
it("should return default JA4 in development mode", async () => {
|
|
20
|
+
const mockHeaders = {
|
|
21
|
+
"x-tls-clienthello": "test",
|
|
22
|
+
"x-tls-version": "test",
|
|
23
|
+
"x-tls-server-name": "test",
|
|
24
|
+
};
|
|
25
|
+
const ja4 = await getJA4(mockHeaders);
|
|
26
|
+
expect(ja4.ja4PlusFingerprint).toBe(DEFAULT_JA4);
|
|
27
|
+
});
|
|
28
|
+
it("should return the correct JA4 for a known ClientHello", async () => {
|
|
29
|
+
const mockHeaders = {
|
|
30
|
+
"x-tls-clienthello": "FgMBBtwBAAbYAwP4jX7brHtVr6Ia4VAehhyjHK4SZR03oAOwwGfasIzCDiANg5ngnOadLnNOXW0OCDPUfVyqYbkUUB1vXMgc6m7WxwAgSkoTARMCEwPAK8AvwCzAMMypzKjAE8AUAJwAnQAvADUBAAZvqqoAAAANABIAEAQDCAQEAQUDCAUFAQgGBgEACgAMAAqamhHsAB0AFwAYAC0AAgEBAAsAAgEAACsABwa6ugMEAwMAMwTvBO2amgABABHsBMA+oLnpV7t0uBx9ApK4G7M5bCk8XJn7RR2N282+1Mb2RZJgAS7asw9pxjx8JA4nDDYhoAb66ciMKSpf2U1CYHQP7BOtEskjRV7PGZ/sBajsgHmUYV5bYFXI+SSGk0oU01H168qjSDhupKOEoYQCU6KiWCI4h1kPUZ5KpydYMGbsu73tWKNx4DHgAMNYQk1+EZu1ADXPgFxQ95iqFFYb57+POBOV60oMS6XGmh1UG69caTIYSkmR2Mf7pJzwqW8heJVemwgeI2Fo0m12qpsSGZfzFgyfJ45FxJp9Jj0lQYxKSV3dIsGVdblxmwP6MAFs+Vg2ELrbVBNXhDYdXDhEcRR/m8qUmW8zeRuIxnUVm3I31Q0/hFTpFZsJFzWBNjrJyiSD+WuGmUuINBA+2mOxhUaUqFxDeHZ5cjcJKa7XWjRfZZ4ItLnApHVy958CehzzQqMh18BuWLuXIAO/0gP5Gpw5xb7r1zwP0r+tc6u+5VVcc2/k0hGmRZcMVQY9UJ+pQHD0GqJ1VlL+5KmX96ADR3NGqIw/aBaOwXSARmAADWVSIR0ARX5UhYfY13hNqWrYwcD4sqWasLKU240L6Ge5J5X2oUlS9DSupEcn1T+mARM0lhG7JXP79q61c5qrp8TERqYdizlCpz4HWGxZEhVt8JAiN38xO6Gl5QCeLD9l1o9wGhcaLLPYsp9m9aHdClsr1Xo4uEEwNjlztKrp4W/lgqvceLMN3GugMso5kFks55YkXLP8e8aPiwlxlJdqyc6i25nwdyIWWTkSTKTA2KV2o7gidmG2MWLLYxzORG6ZBgniFjcJhAZg4rO6isicaI1M0wACc8RvRKr3BmOMF464pjt1RcLqqTPaNzcfpEXBtTPJKc5lASMNq8cR8XorJidJe6N0iqyta5mjxwxhO2w2GT8KSzmyyFBP1snqIpF5pyqgU6sDHAaHeKDlShpT26t956yF3MD763KlNi1P+aPt6Ucteawke7RzYKJPnFzFKXA/khqSJXIwp8qJKgAf4oBeiUGf1MLhk8U2ExZqqaMsFazXMZznrBdoEzCNh5JpQl/iI6blBRFTsUOCaL3gZQci4IaSgZkaglbB6QOHUoYTTDp1gyD/AaQRwxoqA1mXZq17M1sbRRFfACOGDM+1xB+ZpGHuu2fqzIbqixZb6QIfFDoRtCo8RQOUdMS6B8gF8FGCWclYli7pAShRwjvfaVpnul7NmYC2dct2ynaoZwcXxAu/AK0EiXCNADfFQiV1ELnJ8BZGWc6u1oJNFpgGabG22x06krUTfG0Ns7aUhxrtgr23SbChfFsty0f0Gpj08TA60Ch/AK90RC4eSCW2CmFz9V8agBBFtl018x29eKIawmeRfJZCg5swRbODrGxS4VfCt6CxKhO4978AQwvh92jrFCwn2wSS+M+35ai7+Szxs5iVu5pklke/ZYDw5CMg92aDeaElQb8TWJU+hz0/dMpFEp0HWY3ma4zF+EcPA46jMYRoUz8LRLRIqRcxs4aM0ZhzyY7B8BesCTqD9Bi1abQwZG4WXK71/uive4tRzs71AMwdW5IKmcc+zjRoD5Mje7JXmI/k0gGuHSscK2V0uKGakmMzsqvHydrnpScVZZIn8FNGAB0AIIomWlbbQKl9+Mlk2Y/h7JFtnBhwtat3s8I6lo3vRvYgABIAAP8BAAEAAAAAGAAWAAATcHJvbm9kZTcucHJvc29wby5pbwAXAABEzQAFAAMCaDIABQAFAQAAAAD+DQDaAAABAAFIACDSR8tknJNdRYKXKVh8qXdYZ4eBCc/hUI+9sfwU0QuTOACwcfX2f9cmufwLCkLewiA8bJc3L65UGitAbRb3nulBlWkpNlCczIYCbVDSTa0ee5HYfYAYItAv6IYq36i4J9PcMynbp89f7zOvPRhjSk/Cn0qCw15U4UV1++h5U1KztW0gTJAHgwdhiiGvEsrLbuE240ma4GJNeJ6QQ/wxM+gPMMBnioIJETqSgAEfVX19jW5pG4iwoBSRN/n2w90Y7zffTnkeWA8gQP1LYtAXw+bGusEAGwADAgACABAADgAMAmgyCGh0dHAvMS4xACMAAOrqAAEA",
|
|
31
|
+
"x-tls-proto": "h2",
|
|
32
|
+
"x-tls-proto-mutual": "true",
|
|
33
|
+
"x-tls-public-key": "",
|
|
34
|
+
"x-tls-public-key-sha256": "",
|
|
35
|
+
"x-tls-resumed": "false",
|
|
36
|
+
"x-tls-server-name": "pronode7.prosopo.io",
|
|
37
|
+
"x-tls-version": "tls1.3",
|
|
38
|
+
};
|
|
39
|
+
const ja4 = await getJA4(mockHeaders);
|
|
40
|
+
expect(ja4.ja4PlusFingerprint).toBe("t13d1516h2_8daaf6152771_8eba31f8906f");
|
|
41
|
+
});
|
|
42
|
+
it("should return the correct JA4 for a known ClientHello 2", async () => {
|
|
43
|
+
const mockHeaders = {
|
|
44
|
+
"x-tls-clienthello": "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",
|
|
45
|
+
"x-tls-proto": "h2",
|
|
46
|
+
"x-tls-proto-mutual": "true",
|
|
47
|
+
"x-tls-public-key": "",
|
|
48
|
+
"x-tls-public-key-sha256": "",
|
|
49
|
+
"x-tls-resumed": "false",
|
|
50
|
+
"x-tls-server-name": "pronode8.prosopo.io",
|
|
51
|
+
"x-tls-version": "tls1.3",
|
|
52
|
+
};
|
|
53
|
+
const ja4 = await getJA4(mockHeaders);
|
|
54
|
+
expect(ja4.ja4PlusFingerprint).toBe("t13d1516h2_8daaf6152771_8eba31f8906f");
|
|
55
|
+
});
|
|
56
|
+
});
|
|
57
|
+
//# sourceMappingURL=ja4Middleware.unit.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ja4Middleware.unit.test.js","sourceRoot":"","sources":["../../../../src/tests/unit/api/ja4Middleware.unit.test.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAClD,OAAO,EACN,WAAW,EACX,MAAM,EACN,aAAa,GACb,MAAM,+BAA+B,CAAC;AAEvC,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;IAC9B,EAAE,CAAC,8CAA8C,EAAE,KAAK,IAAI,EAAE;QAC7D,MAAM,OAAO,GAKC;YACb,OAAO,EAAE,EAAE;YACX,MAAM,EAAE;gBACP,KAAK,EAAE,EAAE,CAAC,EAAE,EAAE;aACd;SACqB,CAAC;QAExB,MAAM,OAAO,GAAG,EAAyB,CAAC;QAC1C,MAAM,QAAQ,GAAG,EAAE,CAAC,EAAE,EAA6B,CAAC;QAEpD,MAAM,qBAAqB,GAAG,aAAa,CAAC,EAAyB,CAAC,CAAC;QACvE,MAAM,qBAAqB,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;QAExD,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IACvC,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,QAAQ,EAAE,GAAG,EAAE;IACvB,EAAE,CAAC,+CAA+C,EAAE,KAAK,IAAI,EAAE;QAC9D,MAAM,WAAW,GAAG;YACnB,mBAAmB,EAAE,MAAM;YAC3B,eAAe,EAAE,MAAM;YACvB,mBAAmB,EAAE,MAAM;SAC3B,CAAC;QAEF,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,CAAC;QAEtC,MAAM,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAClD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uDAAuD,EAAE,KAAK,IAAI,EAAE;QACtE,MAAM,WAAW,GAAG;YACnB,mBAAmB,EAClB,8yEAA8yE;YAC/yE,aAAa,EAAE,IAAI;YACnB,oBAAoB,EAAE,MAAM;YAC5B,kBAAkB,EAAE,EAAE;YACtB,yBAAyB,EAAE,EAAE;YAC7B,eAAe,EAAE,OAAO;YACxB,mBAAmB,EAAE,qBAAqB;YAC1C,eAAe,EAAE,QAAQ;SACzB,CAAC;QACF,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,CAAC;QACtC,MAAM,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC,sCAAsC,CAAC,CAAC;IAC7E,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yDAAyD,EAAE,KAAK,IAAI,EAAE;QACxE,MAAM,WAAW,GAAG;YACnB,mBAAmB,EAClB,01EAA01E;YAC31E,aAAa,EAAE,IAAI;YACnB,oBAAoB,EAAE,MAAM;YAC5B,kBAAkB,EAAE,EAAE;YACtB,yBAAyB,EAAE,EAAE;YAC7B,eAAe,EAAE,OAAO;YACxB,mBAAmB,EAAE,qBAAqB;YAC1C,eAAe,EAAE,QAAQ;SACzB,CAAC;QACF,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,CAAC;QACtC,MAAM,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC,sCAAsC,CAAC,CAAC;IAC7E,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC"}
|
|
@@ -49,13 +49,13 @@ describe("storeCaptchasExternally", () => {
|
|
|
49
49
|
};
|
|
50
50
|
});
|
|
51
51
|
it("should initialize environment and start cron job", async () => {
|
|
52
|
-
await storeCaptchasExternally(mockPair, mockConfig);
|
|
52
|
+
await storeCaptchasExternally(mockPair, "0 * * * *", mockConfig);
|
|
53
53
|
expect(ProviderEnvironment).toHaveBeenCalledWith(mockConfig, mockPair);
|
|
54
54
|
expect(Tasks).toHaveBeenCalled();
|
|
55
55
|
expect(CronJob).toHaveBeenCalledWith("0 * * * *", expect.any(Function));
|
|
56
56
|
});
|
|
57
57
|
it("should log message when cron job runs", async () => {
|
|
58
|
-
await storeCaptchasExternally(mockPair, mockConfig);
|
|
58
|
+
await storeCaptchasExternally(mockPair, "0 * * * *", mockConfig);
|
|
59
59
|
const envInstance = ProviderEnvironment.mock.results[0].value;
|
|
60
60
|
expect(envInstance.logger.info).toHaveBeenCalledWith("StoreCommitmentsExternal task running: false");
|
|
61
61
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"captchaScheduler.unit.test.js","sourceRoot":"","sources":["../../../../src/tests/unit/schedulers/captchaScheduler.unit.test.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAEnD,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC9D,OAAO,EAAE,uBAAuB,EAAE,MAAM,yCAAyC,CAAC;AAClF,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAEhD,EAAE,CAAC,IAAI,CAAC,cAAc,EAAE,GAAG,EAAE,CAAC,CAAC;IAC9B,mBAAmB,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAAC,CAAC;QACtD,OAAO,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,IAAI,CAAC;QACxC,MAAM,EAAE;YACP,KAAK,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,kBAAkB,CAAC,OAAO,CAAC,KAAK,CAAC;YAChD,GAAG,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,kBAAkB,CAAC,OAAO,CAAC,GAAG,CAAC;YAC5C,IAAI,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,kBAAkB,CAAC,OAAO,CAAC,IAAI,CAAC;YAC9C,KAAK,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,kBAAkB,CAAC,OAAO,CAAC,KAAK,CAAC;SAChD;QACD,KAAK,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC;YAC9B,0BAA0B,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,SAAS,CAAC;SAChE,CAAC;QACF,EAAE,EAAE;YACH,0BAA0B,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,SAAS,CAAC;SAChE;KACD,CAAC,CAAC;CACH,CAAC,CAAC,CAAC;AAEJ,EAAE,CAAC,IAAI,CAAC,yBAAyB,EAAE,GAAG,EAAE,CAAC,CAAC;IACzC,KAAK,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAAC,CAAC;QACxC,iBAAiB,EAAE;YAClB,wBAAwB,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,SAAS,CAAC;SAC9D;KACD,CAAC,CAAC;CACH,CAAC,CAAC,CAAC;AAEJ,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;IACtB,OAAO,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,kBAAkB,CAAC,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;QAC1D,KAAK,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,kBAAkB,CAAC,MAAM,CAAC;KACzC,CAAC,CAAC;CACH,CAAC,CAAC,CAAC;AAEJ,EAAE,CAAC,IAAI,CAAC,kBAAkB,EAAE,GAAG,EAAE,CAAC,CAAC;IAClC,oBAAoB,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,KAAK,CAAC;CACtD,CAAC,CAAC,CAAC;AAEJ,QAAQ,CAAC,yBAAyB,EAAE,GAAG,EAAE;IACxC,IAAI,QAAqB,CAAC;IAC1B,IAAI,UAA+B,CAAC;IAEpC,UAAU,CAAC,GAAG,EAAE;QACf,QAAQ,GAAG,EAAiB,CAAC;QAC7B,UAAU,GAAG;YACZ,cAAc,EAAE;gBACf,gBAAgB,EAAE;oBACjB,QAAQ,EAAE,WAAW;iBACrB;aACD;SACsB,CAAC;IAC1B,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kDAAkD,EAAE,KAAK,IAAI,EAAE;QACjE,MAAM,uBAAuB,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"captchaScheduler.unit.test.js","sourceRoot":"","sources":["../../../../src/tests/unit/schedulers/captchaScheduler.unit.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"captchaManager.unit.test.js","sourceRoot":"","sources":["../../../../src/tests/unit/tasks/captchaManager.unit.test.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,WAAW,EAAsB,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAOvE,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAElE,MAAM,mBAAmB,GAAkB;IAC1C,qBAAqB,EAAE,GAAG;IAC1B,OAAO,EAAE,EAAE;IACX,WAAW,EAAE,WAAW,CAAC,YAAY;IACrC,aAAa,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"captchaManager.unit.test.js","sourceRoot":"","sources":["../../../../src/tests/unit/tasks/captchaManager.unit.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,6 +21,11 @@ vi.mock("@prosopo/database", async (importOriginal) => {
|
|
|
21
21
|
console.log("mock of savecaptchas");
|
|
22
22
|
});
|
|
23
23
|
}
|
|
24
|
+
close() {
|
|
25
|
+
return vi.fn(() => {
|
|
26
|
+
console.log("mock of close");
|
|
27
|
+
});
|
|
28
|
+
}
|
|
24
29
|
}
|
|
25
30
|
return {
|
|
26
31
|
...actual,
|
|
@@ -51,6 +56,10 @@ describe("ClientTaskManager", () => {
|
|
|
51
56
|
collections.schedulers.time = 0;
|
|
52
57
|
providerDB = {
|
|
53
58
|
storeDataset: vi.fn(),
|
|
59
|
+
getUnstoredFrictionlessTokenRecords: vi.fn().mockResolvedValue([]),
|
|
60
|
+
markFrictionlessTokenRecordsStored: vi.fn(),
|
|
61
|
+
getUnstoredSessionRecords: vi.fn().mockResolvedValue([]),
|
|
62
|
+
markSessionRecordsStored: vi.fn(),
|
|
54
63
|
getUnstoredDappUserCommitments: vi.fn().mockResolvedValue([]),
|
|
55
64
|
markDappUserCommitmentsStored: vi.fn(),
|
|
56
65
|
markDappUserPoWCommitmentsStored: vi.fn(),
|
|
@@ -157,6 +166,7 @@ describe("ClientTaskManager", () => {
|
|
|
157
166
|
});
|
|
158
167
|
expect(providerDB.updateScheduledTaskStatus).toHaveBeenCalledWith(Number.parseInt(mockLastScheduledTask._id) + 1, ScheduledTaskStatus.Completed, {
|
|
159
168
|
data: {
|
|
169
|
+
processedSessionRecords: 0,
|
|
160
170
|
processedCommitments: 0,
|
|
161
171
|
processedPowRecords: 1,
|
|
162
172
|
},
|
|
@@ -179,6 +189,7 @@ describe("ClientTaskManager", () => {
|
|
|
179
189
|
expect(providerDB.markDappUserPoWCommitmentsStored).not.toHaveBeenCalled();
|
|
180
190
|
expect(providerDB.updateScheduledTaskStatus).toHaveBeenCalledWith(Number.parseInt(mockLastScheduledTask._id) + 1, ScheduledTaskStatus.Completed, {
|
|
181
191
|
data: {
|
|
192
|
+
processedSessionRecords: 0,
|
|
182
193
|
processedCommitments: 0,
|
|
183
194
|
processedPowRecords: 0,
|
|
184
195
|
},
|