@prosopo/provider 4.8.0 → 4.9.0

package/dist/tests/unit/tasks/spam/checkTrafficFilter.unit.test.js

@@ -68,6 +68,21 @@ describe("checkTrafficFilter", () => {
             reason: "API.DATACENTER_BLOCKED",
         });
     });
+    it("does not block VPN-on-datacenter IPs when blockDatacenter is on but blockVpn is off", () => {
+        const result = checkTrafficFilter(baseInfo({ isDatacenter: true, isVPN: true }), { ...allBlocked, blockVpn: false });
+        expect(result).toEqual({ isBlocked: false });
+    });
+    it("still blocks raw datacenter (non-VPN) IPs when blockDatacenter is on and blockVpn is off", () => {
+        const result = checkTrafficFilter(baseInfo({ isDatacenter: true, isVPN: false }), { ...allBlocked, blockVpn: false });
+        expect(result).toEqual({
+            isBlocked: true,
+            reason: "API.DATACENTER_BLOCKED",
+        });
+    });
+    it("blocks VPN-on-datacenter IPs as VPN when both filters are enabled", () => {
+        const result = checkTrafficFilter(baseInfo({ isDatacenter: true, isVPN: true }), allBlocked);
+        expect(result).toEqual({ isBlocked: true, reason: "API.VPN_BLOCKED" });
+    });
     it("blocks mobile when blockMobile is true", () => {
         const result = checkTrafficFilter(baseInfo({ isMobile: true }), allBlocked);
         expect(result).toEqual({ isBlocked: true, reason: "API.MOBILE_BLOCKED" });
@@ -108,5 +123,73 @@ describe("checkTrafficFilter", () => {
         const result = checkTrafficFilter({ isValid: false, error: "lookup failed", ip: "1.2.3.4" }, allBlocked);
         expect(result).toEqual({ isBlocked: false });
     });
+    describe("extraIpInfos", () => {
+        const cleanPrimary = baseInfo({ ip: "192.0.2.1" });
+        it("blocks when an extra IP is a datacenter", () => {
+            const result = checkTrafficFilter(cleanPrimary, allBlocked, [
+                baseInfo({ ip: "198.51.100.10", isDatacenter: true }),
+            ]);
+            expect(result).toEqual({
+                isBlocked: true,
+                reason: "API.DATACENTER_BLOCKED",
+            });
+        });
+        it("blocks when an extra IP exceeds the abuser score threshold", () => {
+            const result = checkTrafficFilter(cleanPrimary, { ...allBlocked, abuserScoreThreshold: 80 }, [
+                baseInfo({
+                    ip: "203.0.113.10",
+                    isAbuser: true,
+                    abuserScore: 95,
+                }),
+            ]);
+            expect(result).toEqual({
+                isBlocked: true,
+                reason: "API.ABUSER_BLOCKED",
+            });
+        });
+        it("does NOT apply VPN-datacenter suppression to extra IPs", () => {
+            const noVpnBlock = { ...allBlocked, blockVpn: false };
+            const result = checkTrafficFilter(cleanPrimary, noVpnBlock, [
+                baseInfo({
+                    ip: "198.51.100.10",
+                    isVPN: true,
+                    isDatacenter: true,
+                }),
+            ]);
+            expect(result).toEqual({
+                isBlocked: true,
+                reason: "API.DATACENTER_BLOCKED",
+            });
+        });
+        it("does apply VPN-datacenter suppression to the primary IP", () => {
+            const noVpnBlock = { ...allBlocked, blockVpn: false };
+            const result = checkTrafficFilter(baseInfo({ isVPN: true, isDatacenter: true }), noVpnBlock);
+            expect(result).toEqual({ isBlocked: false });
+        });
+        it("allows through when extra IPs are clean", () => {
+            const result = checkTrafficFilter(cleanPrimary, allBlocked, [
+                baseInfo({ ip: "8.8.8.8" }),
+                baseInfo({ ip: "1.1.1.1" }),
+            ]);
+            expect(result).toEqual({ isBlocked: false });
+        });
+        it("ignores undefined / invalid entries in the extras list", () => {
+            const result = checkTrafficFilter(cleanPrimary, allBlocked, [
+                undefined,
+                { isValid: false, error: "lookup failed", ip: "1.2.3.4" },
+                baseInfo({ ip: "198.51.100.10", isDatacenter: true }),
+            ]);
+            expect(result).toEqual({
+                isBlocked: true,
+                reason: "API.DATACENTER_BLOCKED",
+            });
+        });
+        it("primary block takes precedence over extra block", () => {
+            const result = checkTrafficFilter(baseInfo({ isTor: true }), allBlocked, [
+                baseInfo({ ip: "198.51.100.10", isDatacenter: true }),
+            ]);
+            expect(result).toEqual({ isBlocked: true, reason: "API.TOR_BLOCKED" });
+        });
+    });
 });
 //# sourceMappingURL=checkTrafficFilter.unit.test.js.map

package/dist/tests/unit/tasks/spam/checkTrafficFilter.unit.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"checkTrafficFilter.unit.test.js","sourceRoot":"","sources":["../../../../../src/tests/unit/tasks/spam/checkTrafficFilter.unit.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"checkTrafficFilter.unit.test.js","sourceRoot":"","sources":["../../../../../src/tests/unit/tasks/spam/checkTrafficFilter.unit.test.ts"],"names":[],"mappings":"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"}

package/dist/util/usageCounters.d.ts

@@ -18,5 +18,5 @@ export declare class UsageCounters {
     clearAll(dappAccount?: string): Promise<number | null>;
     batchGet(dappAccount: string, reads: CounterIncrement[]): Promise<Record<string, number> | null>;
 }
-export declare const buildAllWindowIncrements: (kind: "served" | "solved", captchaType: CounterSpec["captchaType"], ip: string, userAccount: string) => CounterIncrement[];
+export declare const buildAllWindowIncrements: (kind: "served" | "solved", captchaType: CounterSpec["captchaType"], ip: string, userAccount: string, peerIp?: string) => CounterIncrement[];
 //# sourceMappingURL=usageCounters.d.ts.map

package/dist/util/usageCounters.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"usageCounters.d.ts","sourceRoot":"","sources":["../../src/util/usageCounters.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,EAEN,KAAK,WAAW,EAEhB,MAAM,gBAAgB,CAAC;AAWxB,MAAM,WAAW,gBAAgB;IAChC,IAAI,EAAE,WAAW,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;CACd;AAUD,qBAAa,aAAa;IACzB,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAkB;IAC7C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,gBAAgB,CAAgC;gBAE5C,UAAU,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM;YAKzC,SAAS;YAWT,YAAY;IAiBpB,IAAI,CACT,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE,WAAW,EACjB,KAAK,EAAE,MAAM,GACX,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IA2BzB,SAAS,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;IAatE,aAAa,CAAC,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,gBAAgB,EAAE,GAAG,IAAI;IAYlE,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IA2CtD,QAAQ,CACb,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,gBAAgB,EAAE,GACvB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,CAAC;CA8BzC;AAMD,eAAO,MAAM,wBAAwB,SAC9B,QAAQ,GAAG,QAAQ,eACZ,WAAW,CAAC,aAAa,CAAC,MACnC,MAAM,eACG,MAAM,KACjB,gBAAgB,EAoClB,CAAC"}
+{"version":3,"file":"usageCounters.d.ts","sourceRoot":"","sources":["../../src/util/usageCounters.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,EAEN,KAAK,WAAW,EAEhB,MAAM,gBAAgB,CAAC;AAWxB,MAAM,WAAW,gBAAgB;IAChC,IAAI,EAAE,WAAW,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;CACd;AAUD,qBAAa,aAAa;IACzB,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAkB;IAC7C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,gBAAgB,CAAgC;gBAE5C,UAAU,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM;YAKzC,SAAS;YAWT,YAAY;IAiBpB,IAAI,CACT,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE,WAAW,EACjB,KAAK,EAAE,MAAM,GACX,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IA2BzB,SAAS,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;IAatE,aAAa,CAAC,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,gBAAgB,EAAE,GAAG,IAAI;IAYlE,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IA2CtD,QAAQ,CACb,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,gBAAgB,EAAE,GACvB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,CAAC;CA8BzC;AAMD,eAAO,MAAM,wBAAwB,SAC9B,QAAQ,GAAG,QAAQ,eACZ,WAAW,CAAC,aAAa,CAAC,MACnC,MAAM,eACG,MAAM,WACV,MAAM,KACb,gBAAgB,EAqDlB,CAAC"}

package/dist/util/usageCounters.js

@@ -158,7 +158,7 @@ class UsageCounters {
     }
   }
 }
-const buildAllWindowIncrements = (kind, captchaType, ip, userAccount) => {
+const buildAllWindowIncrements = (kind, captchaType, ip, userAccount, peerIp) => {
   const out = [];
   for (const window of [
     "1m",
@@ -175,6 +175,12 @@ const buildAllWindowIncrements = (kind, captchaType, ip, userAccount) => {
         value: userAccount
       }
     );
+    if (peerIp && peerIp !== ip) {
+      out.push({
+        spec: { kind, captchaType, dimension: "peerIp", window },
+        value: peerIp
+      });
+    }
     if (captchaType !== "any") {
       out.push(
         {
@@ -191,6 +197,17 @@ const buildAllWindowIncrements = (kind, captchaType, ip, userAccount) => {
           value: userAccount
         }
       );
+      if (peerIp && peerIp !== ip) {
+        out.push({
+          spec: {
+            kind,
+            captchaType: "any",
+            dimension: "peerIp",
+            window
+          },
+          value: peerIp
+        });
+      }
     }
   }
   return out;

package/dist/util/usageCounters.js.map

@@ -1 +1 @@
-{"version":3,"file":"usageCounters.js","sourceRoot":"","sources":["../../src/util/usageCounters.ts"],"names":[],"mappings":"AAgBA,OAAO,EACN,sBAAsB,EAEtB,gBAAgB,GAChB,MAAM,gBAAgB,CAAC;AAKxB,MAAM,iBAAiB,GAAG;;;;aAIb,CAAC;AAed,MAAM,OAAO,aAAa;IAKzB,YAAY,UAA2B,EAAE,MAAc;QAF/C,qBAAgB,GAA2B,IAAI,CAAC;QAGvD,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACtB,CAAC;IAEO,KAAK,CAAC,SAAS;QACtB,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC;YAChC,OAAO,IAAI,CAAC;QACb,CAAC;QACD,IAAI,CAAC;YACJ,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE,CAAC;QAC1C,CAAC;QAAC,MAAM,CAAC;YACR,OAAO,IAAI,CAAC;QACb,CAAC;IACF,CAAC;IAEO,KAAK,CAAC,YAAY,CAAC,MAAmB;QAC7C,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC5B,IAAI,CAAC,gBAAgB,GAAG,MAAM,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC,IAAI,CAChE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAa,EACtB,CAAC,KAAK,EAAE,EAAE;gBACT,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC;gBAC7B,MAAM,KAAK,CAAC;YACb,CAAC,CACD,CAAC;QACH,CAAC;QACD,OAAO,IAAI,CAAC,gBAAgB,CAAC;IAC9B,CAAC;IAMD,KAAK,CAAC,IAAI,CACT,WAAmB,EACnB,IAAiB,EACjB,KAAa;QAEb,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;QACtC,IAAI,CAAC,MAAM,EAAE,CAAC;YACb,OAAO,IAAI,CAAC;QACb,CAAC;QACD,MAAM,GAAG,GAAG,gBAAgB,CAAC,WAAW,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;QACvD,MAAM,UAAU,GAAG,sBAAsB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACvD,IAAI,CAAC;YACJ,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;YAC5C,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE;gBACxC,IAAI,EAAE,CAAC,GAAG,CAAC;gBACX,SAAS,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;aAC/B,CAAC,CAAC;YACH,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC;QACvB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;gBACvB,GAAG,EAAE,qBAAqB;gBAC1B,GAAG,EAAE,KAAK;gBACV,IAAI,EAAE,EAAE,GAAG,EAAE;aACb,CAAC,CAAC,CAAC;YACJ,OAAO,IAAI,CAAC;QACb,CAAC;IACF,CAAC;IAKD,SAAS,CAAC,WAAmB,EAAE,IAAiB,EAAE,KAAa;QAC9D,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;YACnD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC;gBACxB,GAAG,EAAE,4BAA4B;gBACjC,GAAG,EAAE,KAAK;gBACV,IAAI,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,KAAK,EAAE;aAClC,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACJ,CAAC;IAKD,aAAa,CAAC,WAAmB,EAAE,UAA8B;QAChE,KAAK,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,UAAU,EAAE,CAAC;YAC1C,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;QAC1C,CAAC;IACF,CAAC;IAQD,KAAK,CAAC,QAAQ,CAAC,WAAoB;QAClC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;QACtC,IAAI,CAAC,MAAM,EAAE,CAAC;YACb,OAAO,IAAI,CAAC;QACb,CAAC;QACD,MAAM,OAAO,GAAG,WAAW,CAAC,CAAC,CAAC,OAAO,WAAW,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC;QAC/D,IAAI,OAAO,GAAG,CAAC,CAAC;QAChB,IAAI,CAAC;YACJ,MAAM,SAAS,GAAG,GAAG,CAAC;YACtB,IAAI,KAAK,GAAa,EAAE,CAAC;YACzB,IAAI,KAAK,EAAE,MAAM,GAAG,IAAI,MAAM,CAAC,YAAY,CAAC;gBAC3C,KAAK,EAAE,OAAO;gBACd,KAAK,EAAE,GAAG;aACV,CAAC,EAAE,CAAC;gBACJ,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;oBACxB,KAAK,MAAM,CAAC,IAAI,GAAG;wBAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBACpC,CAAC;qBAAM,CAAC;oBACP,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBACjB,CAAC;gBACD,IAAI,KAAK,CAAC,MAAM,IAAI,SAAS,EAAE,CAAC;oBAC/B,OAAO,IAAI,MAAM,CAAC,MAAM,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC;oBAC3C,KAAK,GAAG,EAAE,CAAC;gBACZ,CAAC;YACF,CAAC;YACD,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACtB,OAAO,IAAI,MAAM,CAAC,MAAM,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC;YAC5C,CAAC;YACD,OAAO,OAAO,CAAC;QAChB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;gBACvB,GAAG,EAAE,yBAAyB;gBAC9B,GAAG,EAAE,KAAK;gBACV,IAAI,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE;aAC1B,CAAC,CAAC,CAAC;YACJ,OAAO,IAAI,CAAC;QACb,CAAC;IACF,CAAC;IAOD,KAAK,CAAC,QAAQ,CACb,WAAmB,EACnB,KAAyB;QAEzB,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACxB,OAAO,EAAE,CAAC;QACX,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;QACtC,IAAI,CAAC,MAAM,EAAE,CAAC;YACb,OAAO,IAAI,CAAC;QACb,CAAC;QACD,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAC5B,gBAAgB,CAAC,WAAW,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,CAC9C,CAAC;QACF,IAAI,CAAC;YACJ,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACvC,MAAM,GAAG,GAA2B,EAAE,CAAC;YACvC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBACtC,MAAM,GAAG,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;gBACtB,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;gBACpB,IAAI,GAAG,KAAK,SAAS;oBAAE,SAAS;gBAChC,GAAG,CAAC,GAAG,CAAC,GAAG,GAAG,KAAK,IAAI,IAAI,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YAChE,CAAC;YACD,OAAO,GAAG,CAAC;QACZ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;gBACvB,GAAG,EAAE,yBAAyB;gBAC9B,GAAG,EAAE,KAAK;gBACV,IAAI,EAAE,EAAE,QAAQ,EAAE,IAAI,CAAC,MAAM,EAAE;aAC/B,CAAC,CAAC,CAAC;YACJ,OAAO,IAAI,CAAC;QACb,CAAC;IACF,CAAC;CACD;AAMD,MAAM,CAAC,MAAM,wBAAwB,GAAG,CACvC,IAAyB,EACzB,WAAuC,EACvC,EAAU,EACV,WAAmB,EACE,EAAE;IACvB,MAAM,GAAG,GAAuB,EAAE,CAAC;IACnC,KAAK,MAAM,MAAM,IAAI;QACpB,IAAI;QACJ,KAAK;QACL,IAAI;QACJ,IAAI;QACJ,IAAI;QACJ,KAAK;KACsB,EAAE,CAAC;QAC9B,GAAG,CAAC,IAAI,CACP,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,EACnE;YACC,IAAI,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,EAAE;YAC7D,KAAK,EAAE,WAAW;SAClB,CACD,CAAC;QACF,IAAI,WAAW,KAAK,KAAK,EAAE,CAAC;YAC3B,GAAG,CAAC,IAAI,CACP;gBACC,IAAI,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE;gBAC3D,KAAK,EAAE,EAAE;aACT,EACD;gBACC,IAAI,EAAE;oBACL,IAAI;oBACJ,WAAW,EAAE,KAAK;oBAClB,SAAS,EAAE,aAAa;oBACxB,MAAM;iBACN;gBACD,KAAK,EAAE,WAAW;aAClB,CACD,CAAC;QACH,CAAC;IACF,CAAC;IACD,OAAO,GAAG,CAAC;AACZ,CAAC,CAAC"}
+{"version":3,"file":"usageCounters.js","sourceRoot":"","sources":["../../src/util/usageCounters.ts"],"names":[],"mappings":"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"}

package/dist/util.d.ts

@@ -16,7 +16,7 @@ export declare const evaluateIpValidationRules: (comparison: IPComparisonResult,
     errorMessage?: string;
     shouldFlag?: boolean;
 };
-export declare const deepValidateIpAddress: (ip: string, challengeIpAddress: IPAddress, logger: Logger, ipInfoService: IIpInfoService, ipValidationRules?: IIPValidationRules) => Promise<{
+export declare const deepValidateIpAddress: (ip: string, challengeIpAddress: IPAddress, logger: Logger, ipInfoService: IIpInfoService, ipValidationRules?: IIPValidationRules, dnsPeerIp?: string) => Promise<{
     isValid: boolean;
     errorMessage?: string;
     distanceKm?: number;

package/dist/util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAEN,KAAK,kBAAkB,EACvB,KAAK,SAAS,EACd,KAAK,kBAAkB,EAEvB,kBAAkB,EAClB,KAAK,kBAAkB,EAEvB,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAOzD,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,UAUlD;AAED,wBAAgB,YAAY,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,CAAC,EAAE,CAQ/C;AAQD,wBAAsB,oBAAoB,CACzC,QAAQ,EAAE,kBAAkB,EAC5B,EAAE,EAAE,iBAAiB,GACnB,OAAO,CAAC,OAAO,CAAC,CAgBlB;AAED,eAAO,MAAM,YAAY,oBAAqB,MAAM,KAAG,SAUtD,CAAC;AAEF,eAAO,MAAM,sBAAsB,oBAAqB,MAAM,KAAG,SAShE,CAAC;AASF,eAAO,MAAM,iBAAiB,OACzB,MAAM,GAAG,SAAS,sBACF,SAAS,UACrB,MAAM,KACZ;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,CAAA;CA4C3C,CAAC;AASF,eAAO,MAAM,yBAAyB,eACzB,kBAAkB,SACvB,kBAAkB,UACjB,MAAM,KACZ;IACF,MAAM,EAAE,kBAAkB,CAAC;IAC3B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,OAAO,CAAC;CA8KrB,CAAC;AAUF,eAAO,MAAM,qBAAqB,OAC7B,MAAM,sBACU,SAAS,UACrB,MAAM,iBACC,cAAc,sBACT,kBAAkB,KACpC,OAAO,CAAC;IACV,OAAO,EAAE,OAAO,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;CACrB,CA6IA,CAAC"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAEN,KAAK,kBAAkB,EACvB,KAAK,SAAS,EACd,KAAK,kBAAkB,EAEvB,kBAAkB,EAClB,KAAK,kBAAkB,EAEvB,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAOzD,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,UAUlD;AAED,wBAAgB,YAAY,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,CAAC,EAAE,CAQ/C;AAQD,wBAAsB,oBAAoB,CACzC,QAAQ,EAAE,kBAAkB,EAC5B,EAAE,EAAE,iBAAiB,GACnB,OAAO,CAAC,OAAO,CAAC,CAgBlB;AAED,eAAO,MAAM,YAAY,oBAAqB,MAAM,KAAG,SAUtD,CAAC;AAEF,eAAO,MAAM,sBAAsB,oBAAqB,MAAM,KAAG,SAShE,CAAC;AASF,eAAO,MAAM,iBAAiB,OACzB,MAAM,GAAG,SAAS,sBACF,SAAS,UACrB,MAAM,KACZ;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,CAAA;CA4C3C,CAAC;AASF,eAAO,MAAM,yBAAyB,eACzB,kBAAkB,SACvB,kBAAkB,UACjB,MAAM,KACZ;IACF,MAAM,EAAE,kBAAkB,CAAC;IAC3B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,OAAO,CAAC;CA8KrB,CAAC;AAUF,eAAO,MAAM,qBAAqB,OAC7B,MAAM,sBACU,SAAS,UACrB,MAAM,iBACC,cAAc,sBACT,kBAAkB,cAC1B,MAAM,KAChB,OAAO,CAAC;IACV,OAAO,EAAE,OAAO,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;CACrB,CA4JA,CAAC"}

package/dist/util.js

@@ -222,7 +222,17 @@ const evaluateIpValidationRules = (comparison, rules, logger) => {
     shouldFlag
   };
 };
-const deepValidateIpAddress = async (ip, challengeIpAddress, logger, ipInfoService, ipValidationRules) => {
+const deepValidateIpAddress = async (ip, challengeIpAddress, logger, ipInfoService, ipValidationRules, dnsPeerIp) => {
+  if (ipValidationRules?.forceConsistentIp === true && dnsPeerIp && dnsPeerIp !== ip) {
+    logger.info(() => ({
+      msg: "IP validation failed - dnsEvent.peerIp does not match client IP",
+      data: { clientIp: ip, dnsPeerIp }
+    }));
+    return {
+      isValid: false,
+      errorMessage: `Client IP ${ip} does not match dnsEvent.peerIp ${dnsPeerIp}`
+    };
+  }
   const standardValidation = validateIpAddress(ip, challengeIpAddress, logger);
   if (!standardValidation.isValid) {
     if (standardValidation.errorMessage?.includes("Invalid IP address")) {

package/dist/util.js.map

@@ -1 +1 @@
-{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@prosopo/provider",
-	"version": "4.8.0",
+	"version": "4.9.0",
 	"author": "PROSOPO LIMITED <info@prosopo.io>",
 	"license": "Apache-2.0",
 	"type": "module",
@@ -23,22 +23,23 @@
 	"dependencies": {
 		"@noble/hashes": "1.8.0",
 		"@polkadot/util": "13.5.7",
-		"@prosopo/api": "3.4.9",
-		"@prosopo/api-express-router": "3.1.19",
+		"@prosopo/api": "3.4.10",
+		"@prosopo/api-express-router": "3.1.20",
 		"@prosopo/api-route": "2.6.46",
 		"@prosopo/common": "3.1.38",
 		"@prosopo/logger": "1.0.2",
-		"@prosopo/database": "3.13.9",
-		"@prosopo/datasets": "3.1.29",
-		"@prosopo/env": "3.5.9",
-		"@prosopo/keyring": "2.9.35",
-		"@prosopo/load-balancer": "2.9.11",
+		"@prosopo/database": "3.13.10",
+		"@prosopo/datasets": "3.1.30",
+		"@prosopo/env": "3.5.10",
+		"@prosopo/ipinfo": "0.2.16",
+		"@prosopo/keyring": "2.9.36",
+		"@prosopo/load-balancer": "2.9.12",
 		"@prosopo/redis-client": "1.0.23",
 		"@prosopo/locale": "3.2.4",
-		"@prosopo/types": "4.3.1",
-		"@prosopo/types-database": "4.8.2",
-		"@prosopo/types-env": "2.9.18",
-		"@prosopo/user-access-policy": "3.8.0",
+		"@prosopo/types": "4.4.0",
+		"@prosopo/types-database": "4.9.0",
+		"@prosopo/types-env": "2.9.19",
+		"@prosopo/user-access-policy": "3.8.1",
 		"@prosopo/util": "3.2.15",
 		"@prosopo/util-crypto": "13.5.29",
 		"cron": "3.1.7",