@prosopo/provider 3.1.2 → 3.2.0

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.
Files changed (24) hide show
  1. package/CHANGELOG.md +26 -0
  2. package/dist/api/blacklistRequestInspector.d.ts +8 -13
  3. package/dist/api/blacklistRequestInspector.d.ts.map +1 -1
  4. package/dist/api/blacklistRequestInspector.js +8 -7
  5. package/dist/api/blacklistRequestInspector.js.map +1 -1
  6. package/dist/api/ja4Middleware.d.ts.map +1 -1
  7. package/dist/api/ja4Middleware.js +4 -1
  8. package/dist/api/ja4Middleware.js.map +1 -1
  9. package/dist/cjs/api/blacklistRequestInspector.cjs +4 -6
  10. package/dist/cjs/api/ja4Middleware.cjs +4 -1
  11. package/dist/tasks/captchaManager.d.ts +6 -6
  12. package/dist/tests/integration/accessRules.integration.test.d.ts +2 -0
  13. package/dist/tests/integration/accessRules.integration.test.d.ts.map +1 -0
  14. package/dist/tests/integration/accessRules.integration.test.js +164 -0
  15. package/dist/tests/integration/accessRules.integration.test.js.map +1 -0
  16. package/dist/tests/integration/powCaptcha.integration.test.js +56 -49
  17. package/dist/tests/integration/powCaptcha.integration.test.js.map +1 -1
  18. package/dist/tests/integration/userAccessPolicy.d.ts +16 -0
  19. package/dist/tests/integration/userAccessPolicy.d.ts.map +1 -0
  20. package/dist/tests/integration/userAccessPolicy.js +55 -0
  21. package/dist/tests/integration/userAccessPolicy.js.map +1 -0
  22. package/dist/tests/unit/api/ja4Middleware.unit.test.js +2 -2
  23. package/dist/tests/unit/api/ja4Middleware.unit.test.js.map +1 -1
  24. package/package.json +7 -7
package/CHANGELOG.md CHANGED
@@ -1,5 +1,31 @@
1
1
  # @prosopo/provider
2
2
 
3
+ ## 3.2.0
4
+ ### Minor Changes
5
+
6
+ - b7c3258: Add tests for UAPs
7
+
8
+ ### Patch Changes
9
+
10
+ - Updated dependencies [b7c3258]
11
+ - @prosopo/user-access-policy@3.3.0
12
+ - @prosopo/env@3.1.0
13
+ - @prosopo/database@3.0.9
14
+ - @prosopo/types-database@3.0.9
15
+ - @prosopo/datasets@3.0.9
16
+ - @prosopo/types-env@2.7.13
17
+
18
+ ## 3.1.3
19
+ ### Patch Changes
20
+
21
+ - Updated dependencies [cdf7c29]
22
+ - @prosopo/user-access-policy@3.2.1
23
+ - @prosopo/database@3.0.8
24
+ - @prosopo/types-database@3.0.8
25
+ - @prosopo/env@3.0.8
26
+ - @prosopo/datasets@3.0.8
27
+ - @prosopo/types-env@2.7.12
28
+
3
29
  ## 3.1.2
4
30
  ### Patch Changes
5
31
 
package/dist/api/blacklistRequestInspector.d.ts CHANGED
@@ -1,18 +1,19 @@
1
1
  import type { Logger } from "@prosopo/common";
2
- import { type AccessRulesStorage } from "@prosopo/user-access-policy";
2
+ import { type AccessRulesStorage, type UserScopeApiInput } from "@prosopo/user-access-policy";
3
3
  import type { NextFunction, Request, Response } from "express";
4
- export declare const getRequestUserScope: (requestHeaders: Record<string, unknown>, ja4?: string, ip?: string, user?: string) => {
5
- ipAddress: bigint;
6
- userAgent?: string | undefined;
7
- ja4Hash?: string | undefined;
8
- userId?: string | undefined;
9
- };
4
+ export declare const getRequestUserScope: (requestHeaders: Record<string, unknown>, ja4?: string, ip?: string, user?: string) => Pick<UserScopeApiInput, "userId" | "ja4Hash" | "userAgent" | "ip">;
10
5
  export declare const getPrioritisedAccessRule: (userAccessRulesStorage: AccessRulesStorage, userScope: {
11
6
  [key: string]: bigint | string;
12
7
  }, clientId?: string) => Promise<{
13
8
  type?: any;
14
9
  captchaType?: any;
15
10
  userId?: string | undefined;
11
+ ja4Hash?: string | undefined;
12
+ numericIp?: bigint | undefined;
13
+ numericIpMaskMin?: bigint | undefined;
14
+ numericIpMaskMax?: bigint | undefined;
15
+ headersHash?: string | undefined;
16
+ userAgentHash?: string | undefined;
16
17
  clientId?: string | undefined;
17
18
  description?: any;
18
19
  solvedImagesCount?: any;
@@ -21,12 +22,6 @@ export declare const getPrioritisedAccessRule: (userAccessRulesStorage: AccessRu
21
22
  unsolvedImagesCount?: any;
22
23
  frictionlessScore?: any;
23
24
  ruleGroupId?: string | undefined;
24
- numericIp?: bigint | undefined;
25
- numericIpMaskMin?: bigint | undefined;
26
- numericIpMaskMax?: bigint | undefined;
27
- ja4Hash?: string | undefined;
28
- headersHash?: string | undefined;
29
- userAgentHash?: string | undefined;
30
25
  }[]>;
31
26
  export declare class BlacklistRequestInspector {
32
27
  private readonly userAccessRulesStorage;
package/dist/api/blacklistRequestInspector.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"blacklistRequestInspector.d.ts","sourceRoot":"","sources":["../../src/api/blacklistRequestInspector.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAE9C,OAAO,EAEN,KAAK,kBAAkB,EAGvB,MAAM,6BAA6B,CAAC;AAErC,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAE/D,eAAO,MAAM,mBAAmB,mBACf,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,QACjC,MAAM,OACP,MAAM,SACJ,MAAM;;;;;CAYb,CAAC;AAEF,eAAO,MAAM,wBAAwB,2BACZ,kBAAkB,aAC/B;IACV,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;CAC/B,aACU,MAAM;;;;;;;;;;;;;;;;;;IAqCjB,CAAC;AAEF,qBAAa,yBAAyB;IAEpC,OAAO,CAAC,QAAQ,CAAC,sBAAsB;IACvC,OAAO,CAAC,QAAQ,CAAC,0BAA0B;gBAD1B,sBAAsB,EAAE,kBAAkB,EAC1C,0BAA0B,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC;IAGpD,2BAA2B,CACvC,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,QAAQ,EACb,IAAI,EAAE,YAAY,GAChB,OAAO,CAAC,IAAI,CAAC;IA0BH,kBAAkB,CAC9B,cAAc,EAAE,MAAM,EACtB,KAAK,EAAE,MAAM,EACb,GAAG,EAAE,MAAM,EACX,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACvC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACpC,MAAM,EAAE,MAAM,GACZ,OAAO,CAAC,OAAO,CAAC;IAqDnB,SAAS,CAAC,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAInD,SAAS,CAAC,qBAAqB,CAC9B,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACvC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAClC;QACF,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;QAC3B,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;KAC7B;IAcD,SAAS,CAAC,cAAc,CACvB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,GAAG,EAAE,MAAM,GACT,OAAO;CAGV"}
1
+ {"version":3,"file":"blacklistRequestInspector.d.ts","sourceRoot":"","sources":["../../src/api/blacklistRequestInspector.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAE9C,OAAO,EAEN,KAAK,kBAAkB,EAEvB,KAAK,iBAAiB,EAEtB,MAAM,6BAA6B,CAAC;AAErC,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAE/D,eAAO,MAAM,mBAAmB,mBACf,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,QACjC,MAAM,OACP,MAAM,SACJ,MAAM,KACX,IAAI,CAAC,iBAAiB,EAAE,QAAQ,GAAG,SAAS,GAAG,WAAW,GAAG,IAAI,CAUnE,CAAC;AAEF,eAAO,MAAM,wBAAwB,2BACZ,kBAAkB,aAC/B;IACV,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;CAC/B,aACU,MAAM;;;;;;;;;;;;;;;;;;IAuCjB,CAAC;AAEF,qBAAa,yBAAyB;IAEpC,OAAO,CAAC,QAAQ,CAAC,sBAAsB;IACvC,OAAO,CAAC,QAAQ,CAAC,0BAA0B;gBAD1B,sBAAsB,EAAE,kBAAkB,EAC1C,0BAA0B,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC;IAGpD,2BAA2B,CACvC,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,QAAQ,EACb,IAAI,EAAE,YAAY,GAChB,OAAO,CAAC,IAAI,CAAC;IAwBH,kBAAkB,CAC9B,cAAc,EAAE,MAAM,EACtB,KAAK,EAAE,MAAM,EACb,GAAG,EAAE,MAAM,EACX,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACvC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACpC,MAAM,EAAE,MAAM,GACZ,OAAO,CAAC,OAAO,CAAC;IAqDnB,SAAS,CAAC,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAInD,SAAS,CAAC,qBAAqB,CAC9B,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACvC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAClC;QACF,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;QAC3B,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;KAC7B;IAcD,SAAS,CAAC,cAAc,CACvB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,GAAG,EAAE,MAAM,GACT,OAAO;CAGV"}
package/dist/api/blacklistRequestInspector.js CHANGED
@@ -1,8 +1,7 @@
1
1
  import { ApiPrefix } from "@prosopo/types";
2
2
  import { AccessPolicyType, ScopeMatch, userScopeInputSchema, } from "@prosopo/user-access-policy";
3
- import { getIPAddress, uniqueSubsets } from "@prosopo/util";
3
+ import { uniqueSubsets } from "@prosopo/util";
4
4
  export const getRequestUserScope = (requestHeaders, ja4, ip, user) => {
5
- const ipAddress = getIPAddress(ip || "");
6
5
  const userAgent = requestHeaders["user-agent"]
7
6
  ? requestHeaders["user-agent"].toString()
8
7
  : undefined;
@@ -10,15 +9,18 @@ export const getRequestUserScope = (requestHeaders, ja4, ip, user) => {
10
9
  ...(user && { userId: user }),
11
10
  ...(ja4 && { ja4Hash: ja4 }),
12
11
  ...(userAgent && { userAgent: userAgent }),
13
- ...(ipAddress && { ipAddress: ipAddress.bigInt() }),
12
+ ...(ip && { ip }),
14
13
  };
15
14
  };
16
15
  export const getPrioritisedAccessRule = async (userAccessRulesStorage, userScope, clientId) => {
17
16
  const userScopeKeys = Object.keys(userScope).filter((key) => userScope[key] !== undefined);
18
- const prioritisedUserScopes = uniqueSubsets(userScopeKeys).map((subset) => subset.reduce((acc, key) => {
17
+ const prioritisedUserScopes = uniqueSubsets(userScopeKeys)
18
+ .map((subset) => subset.reduce((acc, key) => {
19
19
  acc[key] = userScope[key];
20
20
  return acc;
21
- }, {}));
21
+ }, {}))
22
+ .filter((us) => Object.keys(us).length > 0)
23
+ .filter((us) => Object.values(us).some((value) => value !== undefined));
22
24
  const policyPromises = [];
23
25
  for (const clientOrUndefined of [clientId, undefined]) {
24
26
  for (const scope of prioritisedUserScopes) {
@@ -27,8 +29,8 @@ export const getPrioritisedAccessRule = async (userAccessRulesStorage, userScope
27
29
  policyScope: {
28
30
  clientId: clientOrUndefined,
29
31
  },
30
- policyScopeMatch: ScopeMatch.Exact,
31
32
  }),
33
+ policyScopeMatch: ScopeMatch.Exact,
32
34
  userScope: userScopeInputSchema.parse(scope),
33
35
  userScopeMatch: ScopeMatch.Exact,
34
36
  }));
@@ -43,7 +45,6 @@ export class BlacklistRequestInspector {
43
45
  }
44
46
  async abortRequestForBlockedUsers(request, res, next) {
45
47
  const rawIp = request.ip || "";
46
- console.log(`Raw IP: ${rawIp}`);
47
48
  request.logger.debug(() => ({
48
49
  data: { ja4: request.ja4 },
49
50
  }));
package/dist/api/blacklistRequestInspector.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"blacklistRequestInspector.js","sourceRoot":"","sources":["../../src/api/blacklistRequestInspector.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"blacklistRequestInspector.js","sourceRoot":"","sources":["../../src/api/blacklistRequestInspector.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,SAAS,EAAkB,MAAM,gBAAgB,CAAC;AAC3D,OAAO,EACN,gBAAgB,EAEhB,UAAU,EAEV,oBAAoB,GACpB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAgB,aAAa,EAAE,MAAM,eAAe,CAAC;AAG5D,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAClC,cAAuC,EACvC,GAAY,EACZ,EAAW,EACX,IAAa,EACwD,EAAE;IACvE,MAAM,SAAS,GAAG,cAAc,CAAC,YAAY,CAAC;QAC7C,CAAC,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC,QAAQ,EAAE;QACzC,CAAC,CAAC,SAAS,CAAC;IACb,OAAO;QACN,GAAG,CAAC,IAAI,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;QAC7B,GAAG,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC;QAC5B,GAAG,CAAC,SAAS,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC;QAC1C,GAAG,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;KACjB,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,wBAAwB,GAAG,KAAK,EAC5C,sBAA0C,EAC1C,SAEC,EACD,QAAiB,EAChB,EAAE;IACH,MAAM,aAAa,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,CAClD,CAAC,GAAG,EAAE,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,SAAS,CACrC,CAAC;IAEF,MAAM,qBAAqB,GAAG,aAAa,CAAC,aAAa,CAAC;SACxD,GAAG,CAAC,CAAC,MAAgB,EAAE,EAAE,CACzB,MAAM,CAAC,MAAM,CACZ,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;QACZ,GAAG,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC;QAC1B,OAAO,GAAG,CAAC;IACZ,CAAC,EACD,EAAiD,CACjD,CACD;SACA,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;SAC1C,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC;IAEzE,MAAM,cAAc,GAAG,EAAE,CAAC;IAC1B,KAAK,MAAM,iBAAiB,IAAI,CAAC,QAAQ,EAAE,SAAS,CAAC,EAAE,CAAC;QACvD,KAAK,MAAM,KAAK,IAAI,qBAAqB,EAAE,CAAC;YAC3C,cAAc,CAAC,IAAI,CAClB,sBAAsB,CAAC,SAAS,CAAC;gBAChC,GAAG,CAAC,iBAAiB,IAAI;oBACxB,WAAW,EAAE;wBACZ,QAAQ,EAAE,iBAAiB;qBAC3B;iBACD,CAAC;gBACF,gBAAgB,EAAE,UAAU,CAAC,KAAK;gBAClC,SAAS,EAAE,oBAAoB,CAAC,KAAK,CAAC,KAAK,CAAC;gBAE5C,cAAc,EAAE,UAAU,CAAC,KAAK;aAChC,CAAC,CACF,CAAC;QACH,CAAC;IACF,CAAC;IAED,OAAO,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;AACnD,CAAC,CAAC;AAEF,MAAM,OAAO,yBAAyB;IACrC,YACkB,sBAA0C,EAC1C,0BAA+C;QAD/C,2BAAsB,GAAtB,sBAAsB,CAAoB;QAC1C,+BAA0B,GAA1B,0BAA0B,CAAqB;IAC9D,CAAC;IAEG,KAAK,CAAC,2BAA2B,CACvC,OAAgB,EAChB,GAAa,EACb,IAAkB;QAElB,MAAM,KAAK,GAAG,OAAO,CAAC,EAAE,IAAI,EAAE,CAAC;QAE/B,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC;YAC3B,IAAI,EAAE,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE;SAC1B,CAAC,CAAC,CAAC;QAEJ,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,kBAAkB,CACvD,OAAO,CAAC,GAAG,EACX,KAAK,EACL,OAAO,CAAC,GAAG,EACX,OAAO,CAAC,OAAO,EACf,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,MAAM,CACd,CAAC;QAEF,IAAI,kBAAkB,EAAE,CAAC;YACxB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,cAAc,EAAE,CAAC,CAAC;YAChD,OAAO;QACR,CAAC;QAED,IAAI,EAAE,CAAC;IACR,CAAC;IAEM,KAAK,CAAC,kBAAkB,CAC9B,cAAsB,EACtB,KAAa,EACb,GAAW,EACX,cAAuC,EACvC,WAAoC,EACpC,MAAc;QAGd,IAAI,IAAI,CAAC,mBAAmB,CAAC,cAAc,CAAC,EAAE,CAAC;YAC9C,OAAO,KAAK,CAAC;QACd,CAAC;QAGD,IAAI,CAAC,KAAK,EAAE,CAAC;YACZ,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;gBAClB,IAAI,EAAE;oBACL,cAAc,EAAE,cAAc;oBAC9B,cAAc,EAAE,cAAc;oBAC9B,WAAW,EAAE,WAAW;iBACxB;gBACD,GAAG,EAAE,oBAAoB;aACzB,CAAC,CAAC,CAAC;YAEJ,OAAO,IAAI,CAAC;QACb,CAAC;QAED,MAAM,IAAI,CAAC,0BAA0B,EAAE,CAAC;QAExC,IAAI,CAAC;YACJ,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,qBAAqB,CACtD,cAAc,EACd,WAAW,CACX,CAAC;YAEF,MAAM,cAAc,GAAG,MAAM,wBAAwB,CACpD,IAAI,CAAC,sBAAsB,EAC3B,mBAAmB,CAAC,cAAc,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,CAAC,EACvD,QAAQ,CACR,CAAC;YACF,IACC,CAAC,cAAc;gBACf,cAAc,CAAC,MAAM,KAAK,CAAC;gBAC3B,CAAC,cAAc,CAAC,CAAC,CAAC,EACjB,CAAC;gBACF,OAAO,KAAK,CAAC;YACd,CAAC;YACD,MAAM,YAAY,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC;YAEvC,OAAO,gBAAgB,CAAC,KAAK,KAAK,YAAY,CAAC,IAAI,CAAC;QACrD,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACd,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC;gBACnB,GAAG;gBACH,GAAG,EAAE,wBAAwB;aAC7B,CAAC,CAAC,CAAC;YAEJ,OAAO,IAAI,CAAC;QACb,CAAC;IACF,CAAC;IAES,mBAAmB,CAAC,GAAW;QACxC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;IACjC,CAAC;IAES,qBAAqB,CAC9B,cAAuC,EACvC,WAAoC;QAKpC,MAAM,MAAM,GACX,IAAI,CAAC,cAAc,CAAC,cAAc,EAAE,cAAc,CAAC;YACnD,IAAI,CAAC,cAAc,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;QAC1C,MAAM,QAAQ,GACb,IAAI,CAAC,cAAc,CAAC,cAAc,EAAE,kBAAkB,CAAC;YACvD,IAAI,CAAC,cAAc,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;QAE1C,OAAO;YACN,MAAM,EAAE,QAAQ,KAAK,OAAO,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS;YACvD,QAAQ,EAAE,QAAQ,KAAK,OAAO,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS;SAC7D,CAAC;IACH,CAAC;IAES,cAAc,CACvB,MAA+B,EAC/B,GAAW;QAEX,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC;IACpB,CAAC;CACD"}
package/dist/api/ja4Middleware.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ja4Middleware.d.ts","sourceRoot":"","sources":["../../src/api/ja4Middleware.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAGrD,OAAO,EAAE,KAAK,MAAM,EAAa,MAAM,iBAAiB,CAAC;AACzD,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,WAAW,QAAQ,CAAC;AAEjC,eAAO,MAAM,MAAM,YAAmB,mBAAmB,WAAW,MAAM;;EAoHzE,CAAC;AAEF,eAAO,MAAM,aAAa,QAAS,mBAAmB,WAClC,OAAO,OAAO,QAAQ,QAAQ,YAAY,kBAW7D,CAAC"}
1
+ {"version":3,"file":"ja4Middleware.d.ts","sourceRoot":"","sources":["../../src/api/ja4Middleware.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAGrD,OAAO,EAAE,KAAK,MAAM,EAAa,MAAM,iBAAiB,CAAC;AACzD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAE9D,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAG/D,eAAO,MAAM,WAAW,QAAQ,CAAC;AAEjC,eAAO,MAAM,MAAM,YAAmB,mBAAmB,WAAW,MAAM;;EAsHzE,CAAC;AAEF,eAAO,MAAM,aAAa,QAAS,mBAAmB,WAClC,OAAO,OAAO,QAAQ,QAAQ,YAAY,kBAW7D,CAAC"}
package/dist/api/ja4Middleware.js CHANGED
@@ -2,12 +2,15 @@ import { createHash } from "node:crypto";
2
2
  import { Readable } from "node:stream";
3
3
  import { handleErrors } from "@prosopo/api-express-router";
4
4
  import { getLogger } from "@prosopo/common";
5
+ import { randomAsHex } from "@prosopo/util-crypto";
5
6
  import { readTlsClientHello } from "read-tls-client-hello";
6
7
  export const DEFAULT_JA4 = "ja4";
7
8
  export const getJA4 = async (headers, logger) => {
8
9
  logger = logger || getLogger("info", import.meta.url);
9
10
  if (process.env.NODE_ENV === "development") {
10
- return { ja4PlusFingerprint: DEFAULT_JA4 };
11
+ return {
12
+ ja4PlusFingerprint: `${DEFAULT_JA4}${randomAsHex().slice(28, 32)}`,
13
+ };
11
14
  }
12
15
  try {
13
16
  const xTlsClientHello = (headers["x-tls-clienthello"] || "").toString();
package/dist/api/ja4Middleware.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ja4Middleware.js","sourceRoot":"","sources":["../../src/api/ja4Middleware.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ja4Middleware.js","sourceRoot":"","sources":["../../src/api/ja4Middleware.ts"],"names":[],"mappings":"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"}
package/dist/cjs/api/blacklistRequestInspector.cjs CHANGED
@@ -4,13 +4,12 @@ const types = require("@prosopo/types");
4
4
  const userAccessPolicy = require("@prosopo/user-access-policy");
5
5
  const util = require("@prosopo/util");
6
6
  const getRequestUserScope = (requestHeaders, ja4, ip, user) => {
7
- const ipAddress = util.getIPAddress(ip || "");
8
7
  const userAgent = requestHeaders["user-agent"] ? requestHeaders["user-agent"].toString() : void 0;
9
8
  return {
10
9
  ...user && { userId: user },
11
10
  ...ja4 && { ja4Hash: ja4 },
12
11
  ...userAgent && { userAgent },
13
- ...ipAddress && { ipAddress: ipAddress.bigInt() }
12
+ ...ip && { ip }
14
13
  };
15
14
  };
16
15
  const getPrioritisedAccessRule = async (userAccessRulesStorage, userScope, clientId) => {
@@ -25,7 +24,7 @@ const getPrioritisedAccessRule = async (userAccessRulesStorage, userScope, clien
25
24
  },
26
25
  {}
27
26
  )
28
- );
27
+ ).filter((us) => Object.keys(us).length > 0).filter((us) => Object.values(us).some((value) => value !== void 0));
29
28
  const policyPromises = [];
30
29
  for (const clientOrUndefined of [clientId, void 0]) {
31
30
  for (const scope of prioritisedUserScopes) {
@@ -34,9 +33,9 @@ const getPrioritisedAccessRule = async (userAccessRulesStorage, userScope, clien
34
33
  ...clientOrUndefined && {
35
34
  policyScope: {
36
35
  clientId: clientOrUndefined
37
- },
38
- policyScopeMatch: userAccessPolicy.ScopeMatch.Exact
36
+ }
39
37
  },
38
+ policyScopeMatch: userAccessPolicy.ScopeMatch.Exact,
40
39
  userScope: userAccessPolicy.userScopeInputSchema.parse(scope),
41
40
  userScopeMatch: userAccessPolicy.ScopeMatch.Exact
42
41
  })
@@ -52,7 +51,6 @@ class BlacklistRequestInspector {
52
51
  }
53
52
  async abortRequestForBlockedUsers(request, res, next) {
54
53
  const rawIp = request.ip || "";
55
- console.log(`Raw IP: ${rawIp}`);
56
54
  request.logger.debug(() => ({
57
55
  data: { ja4: request.ja4 }
58
56
  }));
package/dist/cjs/api/ja4Middleware.cjs CHANGED
@@ -4,12 +4,15 @@ const node_crypto = require("node:crypto");
4
4
  const node_stream = require("node:stream");
5
5
  const apiExpressRouter = require("@prosopo/api-express-router");
6
6
  const common = require("@prosopo/common");
7
+ const utilCrypto = require("@prosopo/util-crypto");
7
8
  const readTlsClientHello = require("read-tls-client-hello");
8
9
  const DEFAULT_JA4 = "ja4";
9
10
  const getJA4 = async (headers, logger) => {
10
11
  logger = logger || common.getLogger("info", module);
11
12
  if (process.env.NODE_ENV === "development") {
12
- return { ja4PlusFingerprint: DEFAULT_JA4 };
13
+ return {
14
+ ja4PlusFingerprint: `${DEFAULT_JA4}${utilCrypto.randomAsHex().slice(28, 32)}`
15
+ };
13
16
  }
14
17
  try {
15
18
  const xTlsClientHello = (headers["x-tls-clienthello"] || "").toString();
package/dist/tasks/captchaManager.d.ts CHANGED
@@ -27,6 +27,12 @@ export declare class CaptchaManager {
27
27
  type?: any;
28
28
  captchaType?: any;
29
29
  userId?: string | undefined;
30
+ ja4Hash?: string | undefined;
31
+ numericIp?: bigint | undefined;
32
+ numericIpMaskMin?: bigint | undefined;
33
+ numericIpMaskMax?: bigint | undefined;
34
+ headersHash?: string | undefined;
35
+ userAgentHash?: string | undefined;
30
36
  clientId?: string | undefined;
31
37
  description?: any;
32
38
  solvedImagesCount?: any;
@@ -35,12 +41,6 @@ export declare class CaptchaManager {
35
41
  unsolvedImagesCount?: any;
36
42
  frictionlessScore?: any;
37
43
  ruleGroupId?: string | undefined;
38
- numericIp?: bigint | undefined;
39
- numericIpMaskMin?: bigint | undefined;
40
- numericIpMaskMax?: bigint | undefined;
41
- ja4Hash?: string | undefined;
42
- headersHash?: string | undefined;
43
- userAgentHash?: string | undefined;
44
44
  }[]>;
45
45
  getDetectorKeys(): Promise<string[]>;
46
46
  static canClientSeeScore(tier: Tier, score?: number): boolean | 0 | undefined;
package/dist/tests/integration/accessRules.integration.test.d.ts ADDED
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=accessRules.integration.test.d.ts.map
package/dist/tests/integration/accessRules.integration.test.d.ts.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"accessRules.integration.test.d.ts","sourceRoot":"","sources":["../../../src/tests/integration/accessRules.integration.test.ts"],"names":[],"mappings":""}
package/dist/tests/integration/accessRules.integration.test.js ADDED
@@ -0,0 +1,164 @@
1
+ import { datasetWithSolutionHashes } from "@prosopo/datasets";
2
+ import { generateMnemonic, getPair } from "@prosopo/keyring";
3
+ import { ApiParams, CaptchaType, ClientApiPaths, } from "@prosopo/types";
4
+ import { randomAsHex } from "@prosopo/util-crypto";
5
+ import fetch from "node-fetch";
6
+ import { beforeEach, describe, expect, it } from "vitest";
7
+ import { registerSiteKey } from "./registerSitekey.js";
8
+ import { removeAllUserAccessPolicies, userAccessPolicy, } from "./userAccessPolicy.js";
9
+ const baseUrl = "http://localhost:9229";
10
+ const solutions = datasetWithSolutionHashes;
11
+ describe("Access Rules Integration Tests", () => {
12
+ const adminPair = getPair("puppy cream effort carbon despair leg pyramid cotton endorse immense drill peasant");
13
+ let siteKeyPair;
14
+ let siteKeyMnemonic;
15
+ let siteKey;
16
+ let userPair;
17
+ let userMnemonic;
18
+ let userId;
19
+ beforeEach(async () => {
20
+ const responses = await removeAllUserAccessPolicies(adminPair);
21
+ expect(responses.every((response) => response.status === "SUCCESS")).toBe(true);
22
+ [siteKeyMnemonic, siteKey] = await generateMnemonic();
23
+ siteKeyPair = getPair(siteKeyMnemonic);
24
+ await registerSiteKey(siteKey, CaptchaType.image);
25
+ [userMnemonic, userId] = await generateMnemonic();
26
+ userPair = getPair(userMnemonic);
27
+ });
28
+ it("should pass", async () => {
29
+ expect(true).toBe(true);
30
+ });
31
+ it("should return a 401 for a blocked user", async () => {
32
+ await userAccessPolicy(adminPair, {
33
+ block: true,
34
+ userId,
35
+ description: "Blocked user test",
36
+ });
37
+ const origin = "http://localhost";
38
+ const getImageCaptchaURL = `${baseUrl}${ClientApiPaths.GetImageCaptchaChallenge}`;
39
+ const getImgCaptchaBody = {
40
+ [ApiParams.dapp]: siteKey,
41
+ [ApiParams.user]: userId,
42
+ [ApiParams.datasetId]: solutions.datasetId,
43
+ };
44
+ const response = await fetch(getImageCaptchaURL, {
45
+ method: "POST",
46
+ body: JSON.stringify(getImgCaptchaBody),
47
+ headers: {
48
+ "Content-Type": "application/json",
49
+ Origin: origin,
50
+ "Prosopo-Site-Key": siteKey,
51
+ "Prosopo-User": userId,
52
+ "User-Agent": randomAsHex(16),
53
+ },
54
+ });
55
+ expect(response.status).toBe(401);
56
+ });
57
+ it("should return a 200 for a non-blocked user", async () => {
58
+ const origin = "http://localhost";
59
+ const getImageCaptchaURL = `${baseUrl}${ClientApiPaths.GetImageCaptchaChallenge}`;
60
+ const getImgCaptchaBody = {
61
+ [ApiParams.dapp]: siteKey,
62
+ [ApiParams.user]: userId,
63
+ [ApiParams.datasetId]: solutions.datasetId,
64
+ };
65
+ console.log("userId", userId);
66
+ const response = await fetch(getImageCaptchaURL, {
67
+ method: "POST",
68
+ body: JSON.stringify(getImgCaptchaBody),
69
+ headers: {
70
+ "Content-Type": "application/json",
71
+ Origin: origin,
72
+ "Prosopo-Site-Key": siteKey,
73
+ "Prosopo-User": userId,
74
+ "User-Agent": randomAsHex(16),
75
+ },
76
+ });
77
+ expect(response.status).toBe(200);
78
+ });
79
+ it("should return a 200 when a rule expires immediately", async () => {
80
+ await userAccessPolicy(adminPair, {
81
+ block: true,
82
+ userId,
83
+ description: "Blocked user test",
84
+ expiration: 1,
85
+ });
86
+ const origin = "http://localhost";
87
+ const getImageCaptchaURL = `${baseUrl}${ClientApiPaths.GetImageCaptchaChallenge}`;
88
+ const getImgCaptchaBody = {
89
+ [ApiParams.dapp]: siteKey,
90
+ [ApiParams.user]: userId,
91
+ [ApiParams.datasetId]: solutions.datasetId,
92
+ };
93
+ const response = await fetch(getImageCaptchaURL, {
94
+ method: "POST",
95
+ body: JSON.stringify(getImgCaptchaBody),
96
+ headers: {
97
+ "Content-Type": "application/json",
98
+ Origin: origin,
99
+ "Prosopo-Site-Key": siteKey,
100
+ "Prosopo-User": userId,
101
+ "User-Agent": randomAsHex(16),
102
+ },
103
+ });
104
+ expect(response.status).toBe(200);
105
+ });
106
+ it("should return a 401 when a user agent is blocked", async () => {
107
+ const badUserAgent = "bad-user-agent";
108
+ await userAccessPolicy(adminPair, {
109
+ block: true,
110
+ userAgent: badUserAgent,
111
+ description: "Blocked user agent test",
112
+ });
113
+ const origin = "http://localhost";
114
+ const getImageCaptchaURL = `${baseUrl}${ClientApiPaths.GetImageCaptchaChallenge}`;
115
+ const getImgCaptchaBody = {
116
+ [ApiParams.dapp]: siteKey,
117
+ [ApiParams.user]: userId,
118
+ [ApiParams.datasetId]: solutions.datasetId,
119
+ };
120
+ const response = await fetch(getImageCaptchaURL, {
121
+ method: "POST",
122
+ body: JSON.stringify(getImgCaptchaBody),
123
+ headers: {
124
+ "Content-Type": "application/json",
125
+ Origin: origin,
126
+ "Prosopo-Site-Key": siteKey,
127
+ "Prosopo-User": userId,
128
+ "User-Agent": badUserAgent,
129
+ },
130
+ });
131
+ expect(response.status).toBe(401);
132
+ });
133
+ it("should return 200 when user is blocked for a different client but not the calling client", async () => {
134
+ const [_otherSiteKeyMnemonic, otherSiteKey] = await generateMnemonic();
135
+ await registerSiteKey(otherSiteKey, CaptchaType.image);
136
+ console.log(`Blocking user ${userId} for site key: ${otherSiteKey}`);
137
+ await userAccessPolicy(adminPair, {
138
+ block: true,
139
+ userId: userId,
140
+ client: otherSiteKey,
141
+ description: "Blocked user for other site key test",
142
+ });
143
+ const origin = "http://localhost";
144
+ const getImageCaptchaURL = `${baseUrl}${ClientApiPaths.GetImageCaptchaChallenge}`;
145
+ const getImgCaptchaBody = {
146
+ [ApiParams.dapp]: siteKey,
147
+ [ApiParams.user]: userId,
148
+ [ApiParams.datasetId]: solutions.datasetId,
149
+ };
150
+ const response = await fetch(getImageCaptchaURL, {
151
+ method: "POST",
152
+ body: JSON.stringify(getImgCaptchaBody),
153
+ headers: {
154
+ "Content-Type": "application/json",
155
+ Origin: origin,
156
+ "Prosopo-Site-Key": siteKey,
157
+ "Prosopo-User": userId,
158
+ "User-Agent": randomAsHex(16),
159
+ },
160
+ });
161
+ expect(response.status).toBe(200);
162
+ });
163
+ });
164
+ //# sourceMappingURL=accessRules.integration.test.js.map
package/dist/tests/integration/accessRules.integration.test.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"accessRules.integration.test.js","sourceRoot":"","sources":["../../../src/tests/integration/accessRules.integration.test.ts"],"names":[],"mappings":"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"}
package/dist/tests/integration/powCaptcha.integration.test.js CHANGED
@@ -3,13 +3,13 @@ import { generateMnemonic, getPair } from "@prosopo/keyring";
3
3
  import { ApiParams, CaptchaType, ClientApiPaths, } from "@prosopo/types";
4
4
  import { u8aToHex } from "@prosopo/util";
5
5
  import fetch from "node-fetch";
6
- import { beforeAll, describe, expect, it } from "vitest";
7
- import { dummyDappAccount, dummyUserAccount, } from "./mocks/solvedTestCaptchas.js";
6
+ import { beforeEach, describe, expect, it } from "vitest";
7
+ import { dummyUserAccount, } from "./mocks/solvedTestCaptchas.js";
8
8
  import { registerSiteKey } from "./registerSitekey.js";
9
9
  const baseUrl = "http://localhost:9229";
10
10
  const getPowCaptchaChallengePath = ClientApiPaths.GetPowCaptchaChallenge;
11
11
  const dappAccount = "5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY";
12
- const userAccount = "5FHneW46xGXgs5mUiveU4sbTyGBzmstUspZC92UhjJM694ty";
12
+ const userId = "5FHneW46xGXgs5mUiveU4sbTyGBzmstUspZC92UhjJM694ty";
13
13
  const bufferToHex = (buffer) => Array.from(buffer)
14
14
  .map((byte) => byte.toString(16).padStart(2, "0"))
15
15
  .join("");
@@ -39,14 +39,20 @@ const failPoW = (data, difficulty) => {
39
39
  };
40
40
  describe("PoW Integration Tests", () => {
41
41
  describe("GetPowCaptchaChallenge", () => {
42
- beforeAll(async () => {
43
- await registerSiteKey(dappAccount, CaptchaType.pow);
42
+ let siteKeyMnemonic;
43
+ let siteKey;
44
+ let userMnemonic;
45
+ let userId;
46
+ beforeEach(async () => {
47
+ [siteKeyMnemonic, siteKey] = await generateMnemonic();
48
+ await registerSiteKey(siteKey, CaptchaType.pow);
49
+ [userMnemonic, userId] = await generateMnemonic();
44
50
  });
45
51
  it("should supply a PoW challenge to a Dapp User", async () => {
46
52
  const origin = "http://localhost";
47
53
  const body = {
48
- user: userAccount,
49
- dapp: dappAccount,
54
+ user: userId,
55
+ dapp: siteKey,
50
56
  };
51
57
  const response = await fetch(`${baseUrl}${getPowCaptchaChallengePath}`, {
52
58
  method: "POST",
@@ -54,8 +60,8 @@ describe("PoW Integration Tests", () => {
54
60
  Connection: "close",
55
61
  "Content-Type": "application/json",
56
62
  Origin: origin,
57
- "Prosopo-Site-Key": dappAccount,
58
- "Prosopo-User": userAccount,
63
+ "Prosopo-Site-Key": siteKey,
64
+ "Prosopo-User": userId,
59
65
  },
60
66
  body: JSON.stringify(body),
61
67
  });
@@ -72,10 +78,10 @@ describe("PoW Integration Tests", () => {
72
78
  headers: {
73
79
  Connection: "close",
74
80
  "Content-Type": "application/json",
75
- "Prosopo-Site-Key": dappAccount,
76
- "Prosopo-User": userAccount,
81
+ "Prosopo-Site-Key": siteKey,
82
+ "Prosopo-User": userId,
77
83
  },
78
- body: JSON.stringify({ user: userAccount, dapp: dappAccount }),
84
+ body: JSON.stringify({ user: userId, dapp: siteKey }),
79
85
  });
80
86
  expect(response.status).toBe(400);
81
87
  });
@@ -87,25 +93,32 @@ describe("PoW Integration Tests", () => {
87
93
  Connection: "close",
88
94
  "Content-Type": "application/json",
89
95
  Origin: origin,
90
- "Prosopo-Site-Key": dappAccount,
91
- "Prosopo-User": userAccount,
96
+ "Prosopo-Site-Key": siteKey,
97
+ "Prosopo-User": userId,
92
98
  },
93
- body: JSON.stringify({ user: userAccount, dapp: dappAccount }),
99
+ body: JSON.stringify({ user: userId, dapp: siteKey }),
94
100
  });
95
101
  expect(response.status).toBe(400);
96
102
  expect(response.statusText).toBe("Bad Request");
97
103
  });
98
104
  });
99
105
  describe("SubmitPowCaptchaSolution", () => {
106
+ let siteKeyMnemonic;
107
+ let siteKey;
108
+ let userMnemonic;
109
+ let userPair;
110
+ let userId;
111
+ beforeEach(async () => {
112
+ [siteKeyMnemonic, siteKey] = await generateMnemonic();
113
+ await registerSiteKey(siteKey, CaptchaType.pow);
114
+ [userMnemonic, userId] = await generateMnemonic();
115
+ userPair = getPair(userMnemonic);
116
+ });
100
117
  it("should verify a correctly completed PoW captcha as true", async () => {
101
- const userPair = getPair(dummyUserAccount.seed, undefined, "sr25519", 42);
102
- const dappPair = getPair(dummyDappAccount.seed, undefined, "sr25519", 42);
103
- const dummyDappAccountAddr = dappPair.address;
104
- await registerSiteKey(dummyDappAccountAddr, CaptchaType.pow);
105
118
  const origin = "http://localhost";
106
119
  const requestBody = {
107
- user: userPair.address,
108
- dapp: dummyDappAccountAddr,
120
+ user: userId,
121
+ dapp: siteKey,
109
122
  };
110
123
  const captchaRes = await fetch(`${baseUrl}${getPowCaptchaChallengePath}`, {
111
124
  method: "POST",
@@ -113,8 +126,8 @@ describe("PoW Integration Tests", () => {
113
126
  Connection: "close",
114
127
  "Content-Type": "application/json",
115
128
  Origin: origin,
116
- "Prosopo-Site-Key": dummyDappAccountAddr,
117
- "Prosopo-User": userAccount,
129
+ "Prosopo-Site-Key": siteKey,
130
+ "Prosopo-User": userId,
118
131
  },
119
132
  body: JSON.stringify(requestBody),
120
133
  });
@@ -136,7 +149,7 @@ describe("PoW Integration Tests", () => {
136
149
  nonce,
137
150
  verifiedTimeout,
138
151
  user: userPair.address,
139
- dapp: dummyDappAccountAddr,
152
+ dapp: siteKey,
140
153
  };
141
154
  const response = await fetch(`${baseUrl}${ClientApiPaths.SubmitPowCaptchaSolution}`, {
142
155
  method: "POST",
@@ -144,8 +157,8 @@ describe("PoW Integration Tests", () => {
144
157
  Connection: "close",
145
158
  "Content-Type": "application/json",
146
159
  Origin: origin,
147
- "Prosopo-Site-Key": dummyDappAccountAddr,
148
- "Prosopo-User": userAccount,
160
+ "Prosopo-Site-Key": siteKey,
161
+ "Prosopo-User": userId,
149
162
  },
150
163
  body: JSON.stringify(submitBody),
151
164
  });
@@ -155,21 +168,17 @@ describe("PoW Integration Tests", () => {
155
168
  expect(data.verified).toBe(true);
156
169
  });
157
170
  it("should return false for incorrectly completed PoW captcha", async () => {
158
- const userPair = getPair(dummyUserAccount.seed, undefined, "sr25519", 42);
159
- const userAccount = userPair.address;
160
171
  const origin = "http://localhost";
161
- const dapp = "5C7bfXYwachNuvmasEFtWi9BMS41uBvo6KpYHVSQmad4nWzw";
162
- await registerSiteKey(dapp, CaptchaType.pow);
163
172
  const captchaRes = await fetch(`${baseUrl}${getPowCaptchaChallengePath}`, {
164
173
  method: "POST",
165
174
  headers: {
166
175
  Connection: "close",
167
176
  "Content-Type": "application/json",
168
177
  Origin: origin,
169
- "Prosopo-Site-Key": dapp,
170
- "Prosopo-User": userAccount,
178
+ "Prosopo-Site-Key": siteKey,
179
+ "Prosopo-User": userId,
171
180
  },
172
- body: JSON.stringify({ user: userAccount, dapp: dapp }),
181
+ body: JSON.stringify({ user: userId, dapp: siteKey }),
173
182
  });
174
183
  const challengeBody = (await captchaRes.json());
175
184
  const challenge = challengeBody.challenge;
@@ -189,7 +198,7 @@ describe("PoW Integration Tests", () => {
189
198
  nonce,
190
199
  verifiedTimeout,
191
200
  user: userPair.address,
192
- dapp,
201
+ dapp: siteKey,
193
202
  };
194
203
  const response = await fetch(`${baseUrl}${ClientApiPaths.SubmitPowCaptchaSolution}`, {
195
204
  method: "POST",
@@ -197,8 +206,8 @@ describe("PoW Integration Tests", () => {
197
206
  Connection: "close",
198
207
  "Content-Type": "application/json",
199
208
  Origin: origin,
200
- "Prosopo-Site-Key": dapp,
201
- "Prosopo-User": userAccount,
209
+ "Prosopo-Site-Key": siteKey,
210
+ "Prosopo-User": userId,
202
211
  },
203
212
  body: JSON.stringify(body),
204
213
  });
@@ -210,7 +219,7 @@ describe("PoW Integration Tests", () => {
210
219
  it("should return an error for an unregistered site key", async () => {
211
220
  const [_mnemonic, unregisteredAccount] = await generateMnemonic();
212
221
  const userPair = getPair(dummyUserAccount.seed, undefined, "sr25519", 42);
213
- const userAccount = userPair.address;
222
+ const userId = userPair.address;
214
223
  const origin = "http://localhost";
215
224
  const captchaRes = await fetch(`${baseUrl}${getPowCaptchaChallengePath}`, {
216
225
  method: "POST",
@@ -219,10 +228,10 @@ describe("PoW Integration Tests", () => {
219
228
  "Content-Type": "application/json",
220
229
  Origin: origin,
221
230
  "Prosopo-Site-Key": unregisteredAccount,
222
- "Prosopo-User": userAccount,
231
+ "Prosopo-User": userId,
223
232
  },
224
233
  body: JSON.stringify({
225
- user: userAccount,
234
+ user: userId,
226
235
  dapp: unregisteredAccount,
227
236
  }),
228
237
  });
@@ -232,8 +241,6 @@ describe("PoW Integration Tests", () => {
232
241
  });
233
242
  });
234
243
  it("should return an error for an invalid site key", async () => {
235
- const userPair = getPair(dummyUserAccount.seed, undefined, "sr25519", 42);
236
- const userAccount = userPair.address;
237
244
  const origin = "http://localhost";
238
245
  const invalidSiteKey = "junk";
239
246
  const captchaRes = await fetch(`${baseUrl}${getPowCaptchaChallengePath}`, {
@@ -243,9 +250,9 @@ describe("PoW Integration Tests", () => {
243
250
  "Content-Type": "application/json",
244
251
  Origin: origin,
245
252
  "Prosopo-Site-Key": invalidSiteKey,
246
- "Prosopo-User": userAccount,
253
+ "Prosopo-User": userId,
247
254
  },
248
- body: JSON.stringify({ user: userAccount, dapp: invalidSiteKey }),
255
+ body: JSON.stringify({ user: userId, dapp: invalidSiteKey }),
249
256
  });
250
257
  const challengeBody = (await captchaRes.json());
251
258
  expect(challengeBody).toHaveProperty("error");
@@ -253,7 +260,7 @@ describe("PoW Integration Tests", () => {
253
260
  });
254
261
  it("should return an error if the captcha type is set to image", async () => {
255
262
  const userPair = getPair(dummyUserAccount.seed, undefined, "sr25519");
256
- const userAccount = userPair.address;
263
+ const userId = userPair.address;
257
264
  const origin = "http://localhost";
258
265
  const dapp = "5C7bfXYwachNuvmasEFtWi9BMS41uBvo6KpYHVSQmad4nWzw";
259
266
  await registerSiteKey(dapp, CaptchaType.image);
@@ -264,9 +271,9 @@ describe("PoW Integration Tests", () => {
264
271
  "Content-Type": "application/json",
265
272
  Origin: origin,
266
273
  "Prosopo-Site-Key": dapp,
267
- "Prosopo-User": userAccount,
274
+ "Prosopo-User": userId,
268
275
  },
269
- body: JSON.stringify({ user: userAccount, dapp }),
276
+ body: JSON.stringify({ user: userId, dapp }),
270
277
  });
271
278
  const challengeBody = (await captchaRes.json());
272
279
  expect(challengeBody).toHaveProperty("error");
@@ -275,7 +282,7 @@ describe("PoW Integration Tests", () => {
275
282
  });
276
283
  it("should return an error if the captcha type is set to frictionless and no sessionID is sent", async () => {
277
284
  const userPair = getPair(dummyUserAccount.seed, undefined, "sr25519");
278
- const userAccount = userPair.address;
285
+ const userId = userPair.address;
279
286
  const origin = "http://localhost";
280
287
  const [mnemonic, dapp] = await generateMnemonic();
281
288
  await registerSiteKey(dapp, CaptchaType.frictionless);
@@ -286,9 +293,9 @@ describe("PoW Integration Tests", () => {
286
293
  "Content-Type": "application/json",
287
294
  Origin: origin,
288
295
  "Prosopo-Site-Key": dapp,
289
- "Prosopo-User": userAccount,
296
+ "Prosopo-User": userId,
290
297
  },
291
- body: JSON.stringify({ user: userAccount, dapp }),
298
+ body: JSON.stringify({ user: userId, dapp }),
292
299
  });
293
300
  const challengeBody = (await captchaRes.json());
294
301
  expect(challengeBody).toHaveProperty("error");
package/dist/tests/integration/powCaptcha.integration.test.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"powCaptcha.integration.test.js","sourceRoot":"","sources":["../../../src/tests/integration/powCaptcha.integration.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"powCaptcha.integration.test.js","sourceRoot":"","sources":["../../../src/tests/integration/powCaptcha.integration.test.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EACN,SAAS,EACT,WAAW,EACX,cAAc,GAMd,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,KAAK,MAAM,YAAY,CAAC;AAC/B,OAAO,EAAa,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AACrE,OAAO,EAEN,gBAAgB,GAChB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAIvD,MAAM,OAAO,GAAG,uBAAuB,CAAC;AACxC,MAAM,0BAA0B,GAAG,cAAc,CAAC,sBAAsB,CAAC;AACzE,MAAM,WAAW,GAAG,kDAAkD,CAAC;AACvE,MAAM,MAAM,GAAG,kDAAkD,CAAC;AAElE,MAAM,WAAW,GAAG,CAAC,MAAkB,EAAU,EAAE,CAClD,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC;KAChB,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;KACjD,IAAI,CAAC,EAAE,CAAC,CAAC;AAGZ,MAAM,QAAQ,GAAG,CAAC,IAAY,EAAE,UAAkB,EAAU,EAAE;IAC7D,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IAGtC,OAAO,IAAI,EAAE,CAAC;QACb,MAAM,OAAO,GAAG,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,KAAK,GAAG,IAAI,CAAC,CAAC;QACvD,MAAM,OAAO,GAAG,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;QAE7C,IAAI,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;YAChC,OAAO,KAAK,CAAC;QACd,CAAC;QAED,KAAK,IAAI,CAAC,CAAC;IACZ,CAAC;AACF,CAAC,CAAC;AAGF,MAAM,OAAO,GAAG,CAAC,IAAY,EAAE,UAAkB,EAAU,EAAE;IAC5D,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IAGtC,OAAO,IAAI,EAAE,CAAC;QACb,MAAM,OAAO,GAAG,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,KAAK,GAAG,IAAI,CAAC,CAAC;QACvD,MAAM,OAAO,GAAG,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;QAE7C,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;YACjC,OAAO,KAAK,CAAC;QACd,CAAC;QAED,KAAK,IAAI,CAAC,CAAC;IACZ,CAAC;AACF,CAAC,CAAC;AAEF,QAAQ,CAAC,uBAAuB,EAAE,GAAG,EAAE;IACtC,QAAQ,CAAC,wBAAwB,EAAE,GAAG,EAAE;QACvC,IAAI,eAAuB,CAAC;QAC5B,IAAI,OAAe,CAAC;QACpB,IAAI,YAAoB,CAAC;QACzB,IAAI,MAAc,CAAC;QAEnB,UAAU,CAAC,KAAK,IAAI,EAAE;YAErB,CAAC,eAAe,EAAE,OAAO,CAAC,GAAG,MAAM,gBAAgB,EAAE,CAAC;YACtD,MAAM,eAAe,CAAC,OAAO,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC;YAChD,CAAC,YAAY,EAAE,MAAM,CAAC,GAAG,MAAM,gBAAgB,EAAE,CAAC;QACnD,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,8CAA8C,EAAE,KAAK,IAAI,EAAE;YAC7D,MAAM,MAAM,GAAG,kBAAkB,CAAC;YAClC,MAAM,IAAI,GAA0C;gBACnD,IAAI,EAAE,MAAM;gBACZ,IAAI,EAAE,OAAO;aACb,CAAC;YACF,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,OAAO,GAAG,0BAA0B,EAAE,EAAE;gBACvE,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE;oBACR,UAAU,EAAE,OAAO;oBACnB,cAAc,EAAE,kBAAkB;oBAClC,MAAM,EAAE,MAAM;oBACd,kBAAkB,EAAE,OAAO;oBAC3B,cAAc,EAAE,MAAM;iBACtB;gBACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;aAC1B,CAAC,CAAC;YAEH,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAElC,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;YAEnC,OAAO,CAAC,GAAG,CAAC,4BAA4B,EAAE,IAAI,CAAC,CAAC;YAEhD,MAAM,CAAC,IAAI,CAAC,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;YACzC,MAAM,CAAC,IAAI,CAAC,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC;YAC1C,MAAM,CAAC,IAAI,CAAC,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;QAC1C,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,yDAAyD,EAAE,KAAK,IAAI,EAAE;YACxE,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,OAAO,GAAG,0BAA0B,EAAE,EAAE;gBACvE,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE;oBACR,UAAU,EAAE,OAAO;oBACnB,cAAc,EAAE,kBAAkB;oBAClC,kBAAkB,EAAE,OAAO;oBAC3B,cAAc,EAAE,MAAM;iBACtB;gBACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;aACrD,CAAC,CAAC;YAEH,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACnC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,sDAAsD,EAAE,KAAK,IAAI,EAAE;YACrE,MAAM,MAAM,GAAG,uBAAuB,CAAC;YACvC,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,OAAO,GAAG,0BAA0B,EAAE,EAAE;gBACvE,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE;oBACR,UAAU,EAAE,OAAO;oBACnB,cAAc,EAAE,kBAAkB;oBAClC,MAAM,EAAE,MAAM;oBACd,kBAAkB,EAAE,OAAO;oBAC3B,cAAc,EAAE,MAAM;iBACtB;gBACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;aACrD,CAAC,CAAC;YAEH,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAClC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACjD,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;IACH,QAAQ,CAAC,0BAA0B,EAAE,GAAG,EAAE;QACzC,IAAI,eAAuB,CAAC;QAC5B,IAAI,OAAe,CAAC;QACpB,IAAI,YAAoB,CAAC;QACzB,IAAI,QAAqB,CAAC;QAC1B,IAAI,MAAc,CAAC;QAEnB,UAAU,CAAC,KAAK,IAAI,EAAE;YAErB,CAAC,eAAe,EAAE,OAAO,CAAC,GAAG,MAAM,gBAAgB,EAAE,CAAC;YACtD,MAAM,eAAe,CAAC,OAAO,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC;YAChD,CAAC,YAAY,EAAE,MAAM,CAAC,GAAG,MAAM,gBAAgB,EAAE,CAAC;YAClD,QAAQ,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;QAClC,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,yDAAyD,EAAE,KAAK,IAAI,EAAE;YACxE,MAAM,MAAM,GAAG,kBAAkB,CAAC;YAClC,MAAM,WAAW,GAA0C;gBAC1D,IAAI,EAAE,MAAM;gBACZ,IAAI,EAAE,OAAO;aACb,CAAC;YACF,MAAM,UAAU,GAAG,MAAM,KAAK,CAC7B,GAAG,OAAO,GAAG,0BAA0B,EAAE,EACzC;gBACC,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE;oBACR,UAAU,EAAE,OAAO;oBACnB,cAAc,EAAE,kBAAkB;oBAClC,MAAM,EAAE,MAAM;oBACd,kBAAkB,EAAE,OAAO;oBAC3B,cAAc,EAAE,MAAM;iBACtB;gBACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC;aACjC,CACD,CAAC;YAEF,MAAM,aAAa,GAAG,CAAC,MAAM,UAAU,CAAC,IAAI,EAAE,CAA0B,CAAC;YAEzE,MAAM,SAAS,GAAG,aAAa,CAAC,SAAS,CAAC;YAC1C,MAAM,UAAU,GAAG,aAAa,CAAC,UAAU,CAAC;YAC5C,MAAM,SAAS,GAAG,aAAa,CAAC,SAAS,CAAC;YAC1C,MAAM,KAAK,GAAG,QAAQ,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;YAE9C,MAAM,eAAe,GAAG,MAAM,CAAC;YAC/B,MAAM,UAAU,GAAqC;gBACpD,SAAS;gBACT,UAAU;gBACV,SAAS,EAAE;oBACV,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,QAAQ,CAAC;oBACnD,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE;wBACjB,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,QAAQ,CAC9B,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,QAAQ,EAAE,CAAC,CAC5D;qBACD;iBACD;gBACD,KAAK;gBACL,eAAe;gBACf,IAAI,EAAE,QAAQ,CAAC,OAAO;gBACtB,IAAI,EAAE,OAAO;aACb,CAAC;YACF,MAAM,QAAQ,GAAG,MAAM,KAAK,CAC3B,GAAG,OAAO,GAAG,cAAc,CAAC,wBAAwB,EAAE,EACtD;gBACC,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE;oBACR,UAAU,EAAE,OAAO;oBACnB,cAAc,EAAE,kBAAkB;oBAClC,MAAM,EAAE,MAAM;oBACd,kBAAkB,EAAE,OAAO;oBAC3B,cAAc,EAAE,MAAM;iBACtB;gBACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC;aAChC,CACD,CAAC;YAEF,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAElC,MAAM,IAAI,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAA+B,CAAC;YAEnE,MAAM,CAAC,IAAI,CAAC,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;YACxC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAClC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,2DAA2D,EAAE,KAAK,IAAI,EAAE;YAC1E,MAAM,MAAM,GAAG,kBAAkB,CAAC;YAElC,MAAM,UAAU,GAAG,MAAM,KAAK,CAC7B,GAAG,OAAO,GAAG,0BAA0B,EAAE,EACzC;gBACC,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE;oBACR,UAAU,EAAE,OAAO;oBACnB,cAAc,EAAE,kBAAkB;oBAClC,MAAM,EAAE,MAAM;oBACd,kBAAkB,EAAE,OAAO;oBAC3B,cAAc,EAAE,MAAM;iBACtB;gBACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;aACrD,CACD,CAAC;YAEF,MAAM,aAAa,GAAG,CAAC,MAAM,UAAU,CAAC,IAAI,EAAE,CAA0B,CAAC;YAEzE,MAAM,SAAS,GAAG,aAAa,CAAC,SAAS,CAAC;YAC1C,MAAM,UAAU,GAAG,aAAa,CAAC,UAAU,CAAC;YAC5C,MAAM,SAAS,GAAG,aAAa,CAAC,SAAS,CAAC;YAC1C,MAAM,KAAK,GAAG,OAAO,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;YAC7C,MAAM,eAAe,GAAG,MAAM,CAAC;YAE/B,MAAM,IAAI,GAAqC;gBAC9C,SAAS;gBACT,UAAU;gBACV,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE;oBACtB,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,QAAQ,CAAC;oBACnD,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE;wBACjB,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,QAAQ,CAC9B,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,QAAQ,EAAE,CAAC,CAC5D;qBACD;iBACD;gBACD,KAAK;gBACL,eAAe;gBACf,IAAI,EAAE,QAAQ,CAAC,OAAO;gBACtB,IAAI,EAAE,OAAO;aACb,CAAC;YACF,MAAM,QAAQ,GAAG,MAAM,KAAK,CAC3B,GAAG,OAAO,GAAG,cAAc,CAAC,wBAAwB,EAAE,EACtD;gBACC,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE;oBACR,UAAU,EAAE,OAAO;oBACnB,cAAc,EAAE,kBAAkB;oBAClC,MAAM,EAAE,MAAM;oBACd,kBAAkB,EAAE,OAAO;oBAC3B,cAAc,EAAE,MAAM;iBACtB;gBACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;aAC1B,CACD,CAAC;YAEF,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAElC,MAAM,IAAI,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAA+B,CAAC;YACnE,MAAM,CAAC,IAAI,CAAC,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;YACxC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACnC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,qDAAqD,EAAE,KAAK,IAAI,EAAE;YACpE,MAAM,CAAC,SAAS,EAAE,mBAAmB,CAAC,GAAG,MAAM,gBAAgB,EAAE,CAAC;YAClE,MAAM,QAAQ,GAAG,OAAO,CAAC,gBAAgB,CAAC,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC;YAC1E,MAAM,MAAM,GAAG,QAAQ,CAAC,OAAO,CAAC;YAChC,MAAM,MAAM,GAAG,kBAAkB,CAAC;YAElC,MAAM,UAAU,GAAG,MAAM,KAAK,CAC7B,GAAG,OAAO,GAAG,0BAA0B,EAAE,EACzC;gBACC,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE;oBACR,UAAU,EAAE,OAAO;oBACnB,cAAc,EAAE,kBAAkB;oBAClC,MAAM,EAAE,MAAM;oBACd,kBAAkB,EAAE,mBAAmB;oBACvC,cAAc,EAAE,MAAM;iBACtB;gBACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;oBACpB,IAAI,EAAE,MAAM;oBACZ,IAAI,EAAE,mBAAmB;iBACzB,CAAC;aACF,CACD,CAAC;YAEF,MAAM,IAAI,GAAG,CAAC,MAAM,UAAU,CAAC,IAAI,EAAE,CAA0B,CAAC;YAEhE,MAAM,CAAC,IAAI,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;YACrC,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;QAC7D,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gDAAgD,EAAE,KAAK,IAAI,EAAE;QAC/D,MAAM,MAAM,GAAG,kBAAkB,CAAC;QAClC,MAAM,cAAc,GAAG,MAAM,CAAC;QAE9B,MAAM,UAAU,GAAG,MAAM,KAAK,CAAC,GAAG,OAAO,GAAG,0BAA0B,EAAE,EAAE;YACzE,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACR,UAAU,EAAE,OAAO;gBACnB,cAAc,EAAE,kBAAkB;gBAClC,MAAM,EAAE,MAAM;gBACd,kBAAkB,EAAE,cAAc;gBAClC,cAAc,EAAE,MAAM;aACtB;YACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC;SAC5D,CAAC,CAAC;QAEH,MAAM,aAAa,GAAG,CAAC,MAAM,UAAU,CAAC,IAAI,EAAE,CAA0B,CAAC;QAEzE,MAAM,CAAC,aAAa,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QAC9C,MAAM,CAAC,aAAa,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;IAC/D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4DAA4D,EAAE,KAAK,IAAI,EAAE;QAC3E,MAAM,QAAQ,GAAG,OAAO,CAAC,gBAAgB,CAAC,IAAI,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;QACtE,MAAM,MAAM,GAAG,QAAQ,CAAC,OAAO,CAAC;QAChC,MAAM,MAAM,GAAG,kBAAkB,CAAC;QAClC,MAAM,IAAI,GAAG,kDAAkD,CAAC;QAChE,MAAM,eAAe,CAAC,IAAI,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC;QAE/C,MAAM,UAAU,GAAG,MAAM,KAAK,CAAC,GAAG,OAAO,GAAG,0BAA0B,EAAE,EAAE;YACzE,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACR,UAAU,EAAE,OAAO;gBACnB,cAAc,EAAE,kBAAkB;gBAClC,MAAM,EAAE,MAAM;gBACd,kBAAkB,EAAE,IAAI;gBACxB,cAAc,EAAE,MAAM;aACtB;YACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;SAC5C,CAAC,CAAC;QAEH,MAAM,aAAa,GAAG,CAAC,MAAM,UAAU,CAAC,IAAI,EAAE,CAA0B,CAAC;QAEzE,MAAM,CAAC,aAAa,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QAC9C,MAAM,CAAC,aAAa,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;QACpE,MAAM,CAAC,aAAa,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC7C,CAAC,CAAC,CAAC;IACH,EAAE,CAAC,4FAA4F,EAAE,KAAK,IAAI,EAAE;QAC3G,MAAM,QAAQ,GAAG,OAAO,CAAC,gBAAgB,CAAC,IAAI,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;QACtE,MAAM,MAAM,GAAG,QAAQ,CAAC,OAAO,CAAC;QAChC,MAAM,MAAM,GAAG,kBAAkB,CAAC;QAElC,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC,GAAG,MAAM,gBAAgB,EAAE,CAAC;QAClD,MAAM,eAAe,CAAC,IAAI,EAAE,WAAW,CAAC,YAAY,CAAC,CAAC;QAEtD,MAAM,UAAU,GAAG,MAAM,KAAK,CAAC,GAAG,OAAO,GAAG,0BAA0B,EAAE,EAAE;YACzE,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACR,UAAU,EAAE,OAAO;gBACnB,cAAc,EAAE,kBAAkB;gBAClC,MAAM,EAAE,MAAM;gBACd,kBAAkB,EAAE,IAAI;gBACxB,cAAc,EAAE,MAAM;aACtB;YACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;SAC5C,CAAC,CAAC;QAEH,MAAM,aAAa,GAAG,CAAC,MAAM,UAAU,CAAC,IAAI,EAAE,CAA0B,CAAC;QAEzE,MAAM,CAAC,aAAa,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QAC9C,MAAM,CAAC,aAAa,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;QACpE,MAAM,CAAC,aAAa,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC7C,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC"}
package/dist/tests/integration/userAccessPolicy.d.ts ADDED
@@ -0,0 +1,16 @@
1
+ import { type KeyringPair } from "@prosopo/types";
2
+ export declare const removeAllUserAccessPolicies: (adminPair: KeyringPair) => Promise<import("@prosopo/types").ApiResponse[]>;
3
+ export declare const userAccessPolicy: (adminPair: KeyringPair, options: {
4
+ client?: string;
5
+ block?: boolean;
6
+ ip?: string;
7
+ ja4?: string;
8
+ userId?: string;
9
+ userAgent?: string;
10
+ description?: string;
11
+ score?: number;
12
+ solved?: number;
13
+ unsolved?: number;
14
+ expiration?: number;
15
+ }) => Promise<void>;
16
+ //# sourceMappingURL=userAccessPolicy.d.ts.map
package/dist/tests/integration/userAccessPolicy.d.ts.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"userAccessPolicy.d.ts","sourceRoot":"","sources":["../../../src/tests/integration/userAccessPolicy.ts"],"names":[],"mappings":"AAeA,OAAO,EAGN,KAAK,WAAW,EAChB,MAAM,gBAAgB,CAAC;AAQxB,eAAO,MAAM,2BAA2B,cAAqB,WAAW,oDAavE,CAAC;AAEF,eAAO,MAAM,gBAAgB,cACjB,WAAW,WACb;IACR,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;CACpB,kBA4DD,CAAC"}
package/dist/tests/integration/userAccessPolicy.js ADDED
@@ -0,0 +1,55 @@
1
+ import { ProviderApi } from "@prosopo/api";
2
+ import { loadBalancer } from "@prosopo/load-balancer";
3
+ import { CaptchaType, EnvironmentTypesSchema, } from "@prosopo/types";
4
+ import { AccessPolicyType, } from "@prosopo/user-access-policy";
5
+ import { u8aToHex } from "@prosopo/util";
6
+ export const removeAllUserAccessPolicies = async (adminPair) => {
7
+ const providers = await loadBalancer(EnvironmentTypesSchema.enum.development);
8
+ const responses = [];
9
+ for (const provider of providers) {
10
+ const timestamp = Date.now();
11
+ const signature = u8aToHex(adminPair.sign(timestamp.toString()));
12
+ const providerApi = new ProviderApi(provider.url, adminPair.address);
13
+ responses.push(providerApi.deleteAllUserAccessPolicies(timestamp.toString(), signature));
14
+ }
15
+ return Promise.all(responses);
16
+ };
17
+ export const userAccessPolicy = async (adminPair, options) => {
18
+ const providers = await loadBalancer(EnvironmentTypesSchema.enum.development);
19
+ for (const provider of providers) {
20
+ const timestamp = Date.now();
21
+ const signature = u8aToHex(adminPair.sign(timestamp.toString()));
22
+ const { client, block, ip, ja4, userId, userAgent, description, score, solved, expiration, } = options;
23
+ const accessPolicyBody = {
24
+ accessPolicy: {
25
+ ...(block
26
+ ? { type: AccessPolicyType.Block }
27
+ : {
28
+ type: AccessPolicyType.Restrict,
29
+ captchaType: CaptchaType.image,
30
+ solvedImagesCount: solved || 2,
31
+ }),
32
+ ...(description && { description: description }),
33
+ ...(score && { frictionlessScore: score }),
34
+ },
35
+ policyScope: {
36
+ ...(client && { clientId: client }),
37
+ },
38
+ userScopes: [
39
+ {
40
+ ...(ip && { ip: ip }),
41
+ ...(ja4 && { ja4Hash: ja4 }),
42
+ ...(userId && { userId: userId }),
43
+ ...(userAgent && { userAgent }),
44
+ },
45
+ ],
46
+ expirationTimestamp: expiration !== undefined
47
+ ? expiration
48
+ : new Date().getTime() + 24 * 60 * 60 * 1000,
49
+ };
50
+ const providerApi = new ProviderApi(provider.url, adminPair.address);
51
+ const response = await providerApi.insertUserAccessPolicies(accessPolicyBody, timestamp.toString(), signature);
52
+ console.log(response);
53
+ }
54
+ };
55
+ //# sourceMappingURL=userAccessPolicy.js.map
package/dist/tests/integration/userAccessPolicy.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"userAccessPolicy.js","sourceRoot":"","sources":["../../../src/tests/integration/userAccessPolicy.ts"],"names":[],"mappings":"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"}
package/dist/tests/unit/api/ja4Middleware.unit.test.js CHANGED
@@ -26,7 +26,7 @@ describe("ja4Middleware", () => {
26
26
  const mockNext = vi.fn();
27
27
  const ja4MiddlewareInstance = ja4Middleware({});
28
28
  await ja4MiddlewareInstance(mockReq, mockRes, mockNext);
29
- expect(mockReq.ja4).toBe(DEFAULT_JA4);
29
+ expect(mockReq.ja4.startsWith(DEFAULT_JA4)).toBe(true);
30
30
  });
31
31
  });
32
32
  describe("getJA4", () => {
@@ -37,7 +37,7 @@ describe("getJA4", () => {
37
37
  "x-tls-server-name": "test",
38
38
  };
39
39
  const ja4 = await getJA4(mockHeaders);
40
- expect(ja4.ja4PlusFingerprint).toBe(DEFAULT_JA4);
40
+ expect(ja4.ja4PlusFingerprint.startsWith(DEFAULT_JA4)).toBe(true);
41
41
  });
42
42
  it("should return the correct JA4 for a known ClientHello", async () => {
43
43
  const mockHeaders = {
package/dist/tests/unit/api/ja4Middleware.unit.test.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ja4Middleware.unit.test.js","sourceRoot":"","sources":["../../../../src/tests/unit/api/ja4Middleware.unit.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ja4Middleware.unit.test.js","sourceRoot":"","sources":["../../../../src/tests/unit/api/ja4Middleware.unit.test.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@prosopo/provider",
3
- "version": "3.1.2",
3
+ "version": "3.2.0",
4
4
  "author": "PROSOPO LIMITED <info@prosopo.io>",
5
5
  "license": "Apache-2.0",
6
6
  "main": "./dist/index.js",
@@ -29,14 +29,14 @@
29
29
  "@prosopo/api-route": "2.6.7",
30
30
  "@prosopo/common": "3.0.2",
31
31
  "@prosopo/config": "3.1.0",
32
- "@prosopo/database": "3.0.7",
33
- "@prosopo/datasets": "3.0.7",
34
- "@prosopo/env": "3.0.7",
32
+ "@prosopo/database": "3.0.9",
33
+ "@prosopo/datasets": "3.0.9",
34
+ "@prosopo/env": "3.1.0",
35
35
  "@prosopo/keyring": "2.8.6",
36
36
  "@prosopo/types": "3.0.3",
37
- "@prosopo/types-database": "3.0.7",
38
- "@prosopo/types-env": "2.7.11",
39
- "@prosopo/user-access-policy": "3.2.0",
37
+ "@prosopo/types-database": "3.0.9",
38
+ "@prosopo/types-env": "2.7.13",
39
+ "@prosopo/user-access-policy": "3.3.0",
40
40
  "@prosopo/util": "3.0.2",
41
41
  "@prosopo/util-crypto": "13.5.1",
42
42
  "@typegoose/auto-increment": "4.13.0",