@prosopo/provider 2.3.1 → 2.4.1

package/dist/api/admin/apiAdminRoutesProvider.d.ts

@@ -0,0 +1,9 @@
+import type { ApiRoute, ApiRoutesProvider } from "@prosopo/api-route";
+import type { Tasks } from "../../tasks/index.js";
+declare class ApiAdminRoutesProvider implements ApiRoutesProvider {
+    private readonly tasks;
+    constructor(tasks: Tasks);
+    getRoutes(): ApiRoute[];
+}
+export { ApiAdminRoutesProvider };
+//# sourceMappingURL=apiAdminRoutesProvider.d.ts.map

package/dist/api/admin/apiAdminRoutesProvider.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"apiAdminRoutesProvider.d.ts","sourceRoot":"","sources":["../../../src/api/admin/apiAdminRoutesProvider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAetE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAGlD,cAAM,sBAAuB,YAAW,iBAAiB;IACrC,OAAO,CAAC,QAAQ,CAAC,KAAK;gBAAL,KAAK,EAAE,KAAK;IAEzC,SAAS,IAAI,QAAQ,EAAE;CAQ9B;AAED,OAAO,EAAE,sBAAsB,EAAE,CAAC"}

package/dist/api/admin/apiAdminRoutesProvider.js

@@ -0,0 +1,17 @@
+import { AdminApiPaths } from "@prosopo/types";
+import { ApiRegisterSiteKeyEndpoint } from "./apiRegisterSiteKeyEndpoint.js";
+class ApiAdminRoutesProvider {
+    constructor(tasks) {
+        this.tasks = tasks;
+    }
+    getRoutes() {
+        return [
+            {
+                path: AdminApiPaths.SiteKeyRegister,
+                endpoint: new ApiRegisterSiteKeyEndpoint(this.tasks.clientTaskManager),
+            },
+        ];
+    }
+}
+export { ApiAdminRoutesProvider };
+//# sourceMappingURL=apiAdminRoutesProvider.js.map

package/dist/api/admin/apiAdminRoutesProvider.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"apiAdminRoutesProvider.js","sourceRoot":"","sources":["../../../src/api/admin/apiAdminRoutesProvider.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAE/C,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAE7E,MAAM,sBAAsB;IAC3B,YAAoC,KAAY;QAAZ,UAAK,GAAL,KAAK,CAAO;IAAG,CAAC;IAE7C,SAAS;QACf,OAAO;YACN;gBACC,IAAI,EAAE,aAAa,CAAC,eAAe;gBACnC,QAAQ,EAAE,IAAI,0BAA0B,CAAC,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC;aACtE;SACD,CAAC;IACH,CAAC;CACD;AAED,OAAO,EAAE,sBAAsB,EAAE,CAAC"}

package/dist/api/admin/apiRegisterSiteKeyEndpoint.d.ts

@@ -0,0 +1,13 @@
+import { type ApiEndpoint, type ApiEndpointResponse } from "@prosopo/api-route";
+import { RegisterSitekeyBody } from "@prosopo/types";
+import type { z } from "zod";
+import type { ClientTaskManager } from "../../tasks/client/clientTasks.js";
+type RegisterSitekeyBodyType = typeof RegisterSitekeyBody;
+declare class ApiRegisterSiteKeyEndpoint implements ApiEndpoint<RegisterSitekeyBodyType> {
+    private readonly clientTaskManager;
+    constructor(clientTaskManager: ClientTaskManager);
+    processRequest(args: z.infer<RegisterSitekeyBodyType>): Promise<ApiEndpointResponse>;
+    getRequestArgsSchema(): RegisterSitekeyBodyType;
+}
+export { ApiRegisterSiteKeyEndpoint };
+//# sourceMappingURL=apiRegisterSiteKeyEndpoint.d.ts.map

package/dist/api/admin/apiRegisterSiteKeyEndpoint.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"apiRegisterSiteKeyEndpoint.d.ts","sourceRoot":"","sources":["../../../src/api/admin/apiRegisterSiteKeyEndpoint.ts"],"names":[],"mappings":"AAcA,OAAO,EACN,KAAK,WAAW,EAChB,KAAK,mBAAmB,EAExB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAwB,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAC3E,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAC7B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAE3E,KAAK,uBAAuB,GAAG,OAAO,mBAAmB,CAAC;AAE1D,cAAM,0BACL,YAAW,WAAW,CAAC,uBAAuB,CAAC;IAE5B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;gBAAjB,iBAAiB,EAAE,iBAAiB;IAElE,cAAc,CACnB,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,uBAAuB,CAAC,GACpC,OAAO,CAAC,mBAAmB,CAAC;IAYxB,oBAAoB,IAAI,uBAAuB;CAGtD;AAED,OAAO,EAAE,0BAA0B,EAAE,CAAC"}

package/dist/api/admin/apiRegisterSiteKeyEndpoint.js

@@ -0,0 +1,20 @@
+import { ApiEndpointResponseStatus, } from "@prosopo/api-route";
+import { ClientSettingsSchema, RegisterSitekeyBody } from "@prosopo/types";
+class ApiRegisterSiteKeyEndpoint {
+    constructor(clientTaskManager) {
+        this.clientTaskManager = clientTaskManager;
+    }
+    async processRequest(args) {
+        const { siteKey, tier, settings } = args;
+        const temp = settings || ClientSettingsSchema.parse({});
+        await this.clientTaskManager.registerSiteKey(siteKey, tier, temp);
+        return {
+            status: ApiEndpointResponseStatus.SUCCESS,
+        };
+    }
+    getRequestArgsSchema() {
+        return RegisterSitekeyBody;
+    }
+}
+export { ApiRegisterSiteKeyEndpoint };
+//# sourceMappingURL=apiRegisterSiteKeyEndpoint.js.map

package/dist/api/admin/apiRegisterSiteKeyEndpoint.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"apiRegisterSiteKeyEndpoint.js","sourceRoot":"","sources":["../../../src/api/admin/apiRegisterSiteKeyEndpoint.ts"],"names":[],"mappings":"AAcA,OAAO,EAGN,yBAAyB,GACzB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAM3E,MAAM,0BAA0B;IAG/B,YAAoC,iBAAoC;QAApC,sBAAiB,GAAjB,iBAAiB,CAAmB;IAAG,CAAC;IAE5E,KAAK,CAAC,cAAc,CACnB,IAAsC;QAEtC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC;QAEzC,MAAM,IAAI,GAAG,QAAQ,IAAI,oBAAoB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAExD,MAAM,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QAElE,OAAO;YACN,MAAM,EAAE,yBAAyB,CAAC,OAAO;SACzC,CAAC;IACH,CAAC;IAEM,oBAAoB;QAC1B,OAAO,mBAAmB,CAAC;IAC5B,CAAC;CACD;AAED,OAAO,EAAE,0BAA0B,EAAE,CAAC"}

package/dist/api/admin/createApiAdminRoutesProvider.d.ts

@@ -0,0 +1,4 @@
+import type { ApiRoutesProvider } from "@prosopo/api-route";
+import type { ProviderEnvironment } from "@prosopo/types-env";
+export declare const createApiAdminRoutesProvider: (providerEnvironment: ProviderEnvironment) => ApiRoutesProvider;
+//# sourceMappingURL=createApiAdminRoutesProvider.d.ts.map

package/dist/api/admin/createApiAdminRoutesProvider.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"createApiAdminRoutesProvider.d.ts","sourceRoot":"","sources":["../../../src/api/admin/createApiAdminRoutesProvider.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAC5D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAI9D,eAAO,MAAM,4BAA4B,wBACnB,mBAAmB,KACtC,iBAIF,CAAC"}

package/dist/api/admin/createApiAdminRoutesProvider.js

@@ -0,0 +1,7 @@
+import { Tasks } from "../../tasks/index.js";
+import { ApiAdminRoutesProvider } from "./apiAdminRoutesProvider.js";
+export const createApiAdminRoutesProvider = (providerEnvironment) => {
+    const tasks = new Tasks(providerEnvironment);
+    return new ApiAdminRoutesProvider(tasks);
+};
+//# sourceMappingURL=createApiAdminRoutesProvider.js.map

package/dist/api/admin/createApiAdminRoutesProvider.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"createApiAdminRoutesProvider.js","sourceRoot":"","sources":["../../../src/api/admin/createApiAdminRoutesProvider.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAC7C,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAErE,MAAM,CAAC,MAAM,4BAA4B,GAAG,CAC3C,mBAAwC,EACpB,EAAE;IACtB,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;IAE7C,OAAO,IAAI,sBAAsB,CAAC,KAAK,CAAC,CAAC;AAC1C,CAAC,CAAC"}

package/dist/api/authMiddleware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"authMiddleware.d.ts","sourceRoot":"","sources":["../../src/api/authMiddleware.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAI3D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAE/D,eAAO,MAAM,cAAc,QAAS,mBAAmB,WACnC,OAAO,OAAO,QAAQ,QAAQ,YAAY,kBAiC7D,CAAC;AAyCF,eAAO,MAAM,eAAe,cAChB,MAAM,aACN,MAAM,QACX,WAAW,SAajB,CAAC"}
+{"version":3,"file":"authMiddleware.d.ts","sourceRoot":"","sources":["../../src/api/authMiddleware.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAI3D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAE/D,eAAO,MAAM,cAAc,QAAS,mBAAmB,WACnC,OAAO,OAAO,QAAQ,QAAQ,YAAY,kBAoC7D,CAAC;AAyCF,eAAO,MAAM,eAAe,cAChB,MAAM,aACN,MAAM,QACX,WAAW,SAajB,CAAC"}

package/dist/api/authMiddleware.js

@@ -4,7 +4,10 @@ import { ApiPrefix } from "@prosopo/types";
 export const authMiddleware = (env) => {
     return async (req, res, next) => {
         try {
-            if (req.url.indexOf(ApiPrefix) === -1) {
+            if (req.originalUrl.indexOf(ApiPrefix) === -1) {
+                env.logger.info({
+                    message: "Non-api route, skipping auth middleware",
+                });
                 next();
                 return;
             }

package/dist/api/authMiddleware.js.map

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

package/dist/api/blacklistRequestInspector.d.ts

@@ -0,0 +1,19 @@
+import type { Logger } from "@prosopo/common";
+import type { BlacklistInspector } from "@prosopo/user-access-policy";
+import type { NextFunction, Request, Response } from "express";
+declare class BlacklistRequestInspector {
+    private readonly blacklistInspector;
+    private readonly environmentReadinessWaiter;
+    private readonly logger;
+    constructor(blacklistInspector: BlacklistInspector, environmentReadinessWaiter: () => Promise<void>, logger: Logger);
+    abortRequestForBlockedUsers(request: Request, res: Response, next: NextFunction): Promise<void>;
+    shouldAbortRequest(requestedRoute: string, rawIp: string, requestHeaders: Record<string, unknown>, requestBody: Record<string, unknown>): Promise<boolean>;
+    protected isApiUnrelatedRoute(url: string): boolean;
+    protected extractIdsFromRequest(requestHeaders: Record<string, unknown>, requestBody: Record<string, unknown>): {
+        userId: string;
+        clientId: string;
+    };
+    protected getObjectValue(object: Record<string, unknown>, key: string): unknown;
+}
+export { BlacklistRequestInspector };
+//# sourceMappingURL=blacklistRequestInspector.d.ts.map

package/dist/api/blacklistRequestInspector.d.ts.map

@@ -0,0 +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,KAAK,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACtE,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAG/D,cAAM,yBAAyB;IAE7B,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,0BAA0B;IAC3C,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAFN,kBAAkB,EAAE,kBAAkB,EACtC,0BAA0B,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,EAC/C,MAAM,EAAE,MAAM;IAGnB,2BAA2B,CACvC,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,QAAQ,EACb,IAAI,EAAE,YAAY,GAChB,OAAO,CAAC,IAAI,CAAC;IAkBH,kBAAkB,CAC9B,cAAc,EAAE,MAAM,EACtB,KAAK,EAAE,MAAM,EACb,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACvC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAClC,OAAO,CAAC,OAAO,CAAC;IAuCnB,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,CAAC;QACf,QAAQ,EAAE,MAAM,CAAC;KACjB;IAgBD,SAAS,CAAC,cAAc,CACvB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,GAAG,EAAE,MAAM,GACT,OAAO;CAGV;AAED,OAAO,EAAE,yBAAyB,EAAE,CAAC"}

package/dist/api/blacklistRequestInspector.js

@@ -0,0 +1,61 @@
+import { ApiPrefix } from "@prosopo/types";
+import { getIPAddress } from "../util.js";
+class BlacklistRequestInspector {
+    constructor(blacklistInspector, environmentReadinessWaiter, logger) {
+        this.blacklistInspector = blacklistInspector;
+        this.environmentReadinessWaiter = environmentReadinessWaiter;
+        this.logger = logger;
+    }
+    async abortRequestForBlockedUsers(request, res, next) {
+        const rawIp = request.ip || "";
+        const shouldAbortRequest = await this.shouldAbortRequest(request.url, rawIp, request.headers, request.body);
+        if (shouldAbortRequest) {
+            res.status(401).json({ error: "Unauthorized" });
+            return;
+        }
+        next();
+    }
+    async shouldAbortRequest(requestedRoute, rawIp, requestHeaders, requestBody) {
+        if (this.isApiUnrelatedRoute(requestedRoute)) {
+            return false;
+        }
+        if (!rawIp) {
+            this.logger.info("Request without IP", {
+                requestedRoute: requestedRoute,
+                requestHeaders: requestHeaders,
+                requestBody: requestBody,
+            });
+            return true;
+        }
+        await this.environmentReadinessWaiter();
+        try {
+            const userIpAddress = getIPAddress(rawIp);
+            const { userId, clientId } = this.extractIdsFromRequest(requestHeaders, requestBody);
+            return await this.blacklistInspector.isUserBlacklisted(clientId, userIpAddress, userId);
+        }
+        catch (err) {
+            this.logger.error("Block Middleware Error:", err);
+            return true;
+        }
+    }
+    isApiUnrelatedRoute(url) {
+        return !url.includes(ApiPrefix);
+    }
+    extractIdsFromRequest(requestHeaders, requestBody) {
+        const userId = this.getObjectValue(requestHeaders, "Prosopo-User") ||
+            this.getObjectValue(requestBody, "user") ||
+            "";
+        const clientId = this.getObjectValue(requestHeaders, "Prosopo-Site-Key") ||
+            this.getObjectValue(requestBody, "dapp") ||
+            "";
+        return {
+            userId: "string" === typeof userId ? userId : "",
+            clientId: "string" === typeof clientId ? clientId : "",
+        };
+    }
+    getObjectValue(object, key) {
+        return object[key];
+    }
+}
+export { BlacklistRequestInspector };
+//# sourceMappingURL=blacklistRequestInspector.js.map

package/dist/api/blacklistRequestInspector.js.map

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

package/dist/api/block.d.ts

@@ -1,4 +1,3 @@
 import type { ProviderEnvironment } from "@prosopo/types-env";
-import type { NextFunction, Request, Response } from "express";
-export declare const blockMiddleware: (env: ProviderEnvironment) => (req: Request, res: Response, next: NextFunction) => Promise<Response<any, Record<string, any>> | undefined>;
+export declare const blockMiddleware: (providerEnvironment: ProviderEnvironment) => (request: import("express").Request, res: import("express").Response, next: import("express").NextFunction) => Promise<void>;
 //# sourceMappingURL=block.d.ts.map

package/dist/api/block.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"block.d.ts","sourceRoot":"","sources":["../../src/api/block.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAO/D,eAAO,MAAM,eAAe,QAAS,mBAAmB,WACpC,OAAO,OAAO,QAAQ,QAAQ,YAAY,4DAgD7D,CAAC"}
+{"version":3,"file":"block.d.ts","sourceRoot":"","sources":["../../src/api/block.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAI9D,eAAO,MAAM,eAAe,wBAAyB,mBAAmB,iIAyBvE,CAAC"}

package/dist/api/block.js

@@ -1,40 +1,15 @@
-import { getLoggerDefault } from "@prosopo/common";
-import { ApiPrefix } from "@prosopo/types";
-import { checkIpRules } from "../rules/ip.js";
-import { checkUserRules } from "../rules/user.js";
-import { getIPAddress } from "../util.js";
-const logger = getLoggerDefault();
-export const blockMiddleware = (env) => {
-    return async (req, res, next) => {
-        try {
-            if (req.url.indexOf(ApiPrefix) === -1) {
-                next();
-                return;
-            }
-            if (!req.ip) {
-                logger.info("No IP", req.ip);
-                return res.status(401).json({ error: "Unauthorized" });
-            }
-            await env.isReady();
-            const ipAddress = getIPAddress(req.ip || "");
-            const userAccount = req.headers["Prosopo-User"] || req.body.user;
-            const dappAccount = req.headers["Prosopo-Site-Key"] || req.body.dapp;
-            const rule = await checkIpRules(env.getDb(), ipAddress, dappAccount);
-            if (rule?.hardBlock) {
-                return res.status(401).json({ error: "Unauthorized" });
-            }
-            const userRule = await checkUserRules(env.getDb(), userAccount, dappAccount);
-            if (userRule?.hardBlock) {
-                return res.status(401).json({ error: "Unauthorized" });
-            }
-            next();
-            return;
-        }
-        catch (err) {
-            logger.error("Block Middleware Error:", err);
-            res.status(401).json({ error: "Unauthorized" });
-            return;
-        }
-    };
+import { getLogger } from "@prosopo/common";
+import { createBlacklistInspector } from "@prosopo/user-access-policy";
+import { BlacklistRequestInspector } from "./blacklistRequestInspector.js";
+export const blockMiddleware = (providerEnvironment) => {
+    const logLevel = providerEnvironment.config.logLevel;
+    const logger = getLogger(logLevel, "blockMiddleware");
+    const userAccessRulesStorage = providerEnvironment
+        .getDb()
+        .getUserAccessRulesStorage();
+    const environmentReadinessWaiter = providerEnvironment.isReady.bind(providerEnvironment);
+    const blacklistInspector = createBlacklistInspector(userAccessRulesStorage, logger);
+    const blacklistRequestInspector = new BlacklistRequestInspector(blacklistInspector, environmentReadinessWaiter, logger);
+    return blacklistRequestInspector.abortRequestForBlockedUsers.bind(blacklistRequestInspector);
 };
 //# sourceMappingURL=block.js.map

package/dist/api/block.js.map

@@ -1 +1 @@
-{"version":3,"file":"block.js","sourceRoot":"","sources":["../../src/api/block.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAG3C,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE1C,MAAM,MAAM,GAAG,gBAAgB,EAAE,CAAC;AAElC,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,GAAwB,EAAE,EAAE;IAC3D,OAAO,KAAK,EAAE,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;QAChE,IAAI,CAAC;YAEJ,IAAI,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;gBACvC,IAAI,EAAE,CAAC;gBACP,OAAO;YACR,CAAC;YAGD,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;gBACb,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;gBAC7B,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,cAAc,EAAE,CAAC,CAAC;YACxD,CAAC;YAED,MAAM,GAAG,CAAC,OAAO,EAAE,CAAC;YAEpB,MAAM,SAAS,GAAG,YAAY,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;YAC7C,MAAM,WAAW,GAAG,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC;YACjE,MAAM,WAAW,GAAG,GAAG,CAAC,OAAO,CAAC,kBAAkB,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC;YAGrE,MAAM,IAAI,GAAG,MAAM,YAAY,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;YAGrE,IAAI,IAAI,EAAE,SAAS,EAAE,CAAC;gBACrB,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,cAAc,EAAE,CAAC,CAAC;YACxD,CAAC;YAGD,MAAM,QAAQ,GAAG,MAAM,cAAc,CACpC,GAAG,CAAC,KAAK,EAAE,EACX,WAAW,EACX,WAAW,CACX,CAAC;YAGF,IAAI,QAAQ,EAAE,SAAS,EAAE,CAAC;gBACzB,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,cAAc,EAAE,CAAC,CAAC;YACxD,CAAC;YAED,IAAI,EAAE,CAAC;YACP,OAAO;QACR,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACd,MAAM,CAAC,KAAK,CAAC,yBAAyB,EAAE,GAAG,CAAC,CAAC;YAC7C,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,cAAc,EAAE,CAAC,CAAC;YAChD,OAAO;QACR,CAAC;IACF,CAAC,CAAC;AACH,CAAC,CAAC"}
+{"version":3,"file":"block.js","sourceRoot":"","sources":["../../src/api/block.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,SAAS,EAAoB,MAAM,iBAAiB,CAAC;AAE9D,OAAO,EAAE,wBAAwB,EAAE,MAAM,6BAA6B,CAAC;AACvE,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAE3E,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,mBAAwC,EAAE,EAAE;IAC3E,MAAM,QAAQ,GAAG,mBAAmB,CAAC,MAAM,CAAC,QAAQ,CAAC;IACrD,MAAM,MAAM,GAAG,SAAS,CAAC,QAAQ,EAAE,iBAAiB,CAAC,CAAC;IAEtD,MAAM,sBAAsB,GAAG,mBAAmB;SAChD,KAAK,EAAE;SACP,yBAAyB,EAAE,CAAC;IAE9B,MAAM,0BAA0B,GAC/B,mBAAmB,CAAC,OAAO,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;IAEvD,MAAM,kBAAkB,GAAG,wBAAwB,CAClD,sBAAsB,EACtB,MAAM,CACN,CAAC;IAEF,MAAM,yBAAyB,GAAG,IAAI,yBAAyB,CAC9D,kBAAkB,EAClB,0BAA0B,EAC1B,MAAM,CACN,CAAC;IAEF,OAAO,yBAAyB,CAAC,2BAA2B,CAAC,IAAI,CAChE,yBAAyB,CACzB,CAAC;AACH,CAAC,CAAC"}

package/dist/api/captcha.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"captcha.d.ts","sourceRoot":"","sources":["../../src/api/captcha.ts"],"names":[],"mappings":"AAmCA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAE9D,OAAgB,EAAE,KAAK,MAAM,EAAE,MAAM,SAAS,CAAC;AAgB/C,wBAAgB,aAAa,CAAC,GAAG,EAAE,mBAAmB,GAAG,MAAM,CAge9D"}
+{"version":3,"file":"captcha.d.ts","sourceRoot":"","sources":["../../src/api/captcha.ts"],"names":[],"mappings":"AAqCA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAG9D,OAAgB,EAAE,KAAK,MAAM,EAAE,MAAM,SAAS,CAAC;AAgB/C,wBAAgB,aAAa,CAAC,GAAG,EAAE,mBAAmB,GAAG,MAAM,CAwgB9D"}

package/dist/api/captcha.js

@@ -1,19 +1,21 @@
-import { validateAddress } from "@polkadot/util-crypto/address";
+import { handleErrors } from "@prosopo/api-express-router";
 import { ProsopoApiError } from "@prosopo/common";
 import { parseCaptchaAssets } from "@prosopo/datasets";
-import { ApiParams, ApiPaths, CaptchaRequestBody, CaptchaSolutionBody, GetFrictionlessCaptchaChallengeRequestBody, GetPowCaptchaChallengeRequestBody, SubmitPowCaptchaSolutionBody, } from "@prosopo/types";
+import { ApiParams, ApiPaths, CaptchaRequestBody, CaptchaSolutionBody, CaptchaType, GetFrictionlessCaptchaChallengeRequestBody, GetPowCaptchaChallengeRequestBody, SubmitPowCaptchaSolutionBody, } from "@prosopo/types";
+import { createImageCaptchaConfigResolver } from "@prosopo/user-access-policy";
 import { flatten } from "@prosopo/util";
 import express from "express";
 import { getBotScore } from "../tasks/detection/getBotScore.js";
-import { getCaptchaConfig } from "../tasks/imgCaptcha/imgCaptchaTasksUtils.js";
+import { FrictionlessManager } from "../tasks/frictionless/frictionlessTasks.js";
 import { Tasks } from "../tasks/tasks.js";
 import { getIPAddress } from "../util.js";
-import { handleErrors } from "./errorHandler.js";
+import { validateAddr, validiateSiteKey } from "./validateAddress.js";
 const DEFAULT_FRICTIONLESS_THRESHOLD = 0.5;
-const TEN_MINUTES = 60 * 10 * 1000;
 export function prosopoRouter(env) {
     const router = express.Router();
     const tasks = new Tasks(env);
+    const userAccessRulesStorage = env.getDb().getUserAccessRulesStorage();
+    const imageCaptchaConfigResolver = createImageCaptchaConfigResolver(userAccessRulesStorage, env.logger);
     router.post(ApiPaths.GetImageCaptchaChallenge, async (req, res, next) => {
         let parsed;
         if (!req.ip) {
@@ -30,25 +32,28 @@ export function prosopoRouter(env) {
                 context: { code: 400, error: err },
             }));
         }
-        const { datasetId, user, dapp } = parsed;
+        const { datasetId, user, dapp, sessionId } = parsed;
+        validiateSiteKey(dapp);
+        validateAddr(user);
         try {
-            validateAddress(dapp, false, 42);
-        }
-        catch (err) {
-            return next(new ProsopoApiError("API.INVALID_SITE_KEY", {
-                context: { code: 400, error: err, siteKey: dapp },
-            }));
-        }
-        try {
-            validateAddress(user, false, 42);
             const clientRecord = await tasks.db.getClientRecord(dapp);
             if (!clientRecord) {
                 return next(new ProsopoApiError("API.SITE_KEY_NOT_REGISTERED", {
                     context: { code: 400, siteKey: dapp },
                 }));
             }
-            const captchaConfig = await getCaptchaConfig(tasks.db, env.config, ipAddress, user, dapp);
-            const taskData = await tasks.imgCaptchaManager.getRandomCaptchasAndRequestHash(datasetId, user, ipAddress, flatten(req.headers), captchaConfig);
+            const captchaConfig = await imageCaptchaConfigResolver.resolveConfig(env.config.captchas, ipAddress, user, dapp);
+            const { valid, reason, frictionlessTokenId } = await tasks.imgCaptchaManager.isValidRequest(clientRecord, CaptchaType.image, sessionId);
+            if (!valid) {
+                return next(new ProsopoApiError(reason || "API.BAD_REQUEST", {
+                    context: {
+                        code: 400,
+                        siteKey: dapp,
+                        user,
+                    },
+                }));
+            }
+            const taskData = await tasks.imgCaptchaManager.getRandomCaptchasAndRequestHash(datasetId, user, ipAddress, flatten(req.headers), captchaConfig, frictionlessTokenId);
             const captchaResponse = {
                 [ApiParams.status]: "ok",
                 [ApiParams.captchas]: taskData.captchas.map((captcha) => ({
@@ -72,6 +77,7 @@ export function prosopoRouter(env) {
                     error: err,
                     code: 500,
                     params: req.params,
+                    context: err,
                 },
             }));
         }
@@ -87,16 +93,9 @@ export function prosopoRouter(env) {
             }));
         }
         const { user, dapp } = parsed;
+        validiateSiteKey(dapp);
+        validateAddr(user);
         try {
-            validateAddress(dapp, false, 42);
-        }
-        catch (err) {
-            return next(new ProsopoApiError("API.INVALID_SITE_KEY", {
-                context: { code: 400, error: err, siteKey: dapp },
-            }));
-        }
-        try {
-            validateAddress(user, false, 42);
             const clientRecord = await tasks.db.getClientRecord(parsed.dapp);
             if (!clientRecord) {
                 return next(new ProsopoApiError("API.SITE_KEY_NOT_REGISTERED", {
@@ -113,7 +112,7 @@ export function prosopoRouter(env) {
         catch (err) {
             tasks.logger.error({ err, body: req.body });
             return next(new ProsopoApiError("API.BAD_REQUEST", {
-                context: { code: 500, siteKey: req.body.dapp },
+                context: { code: 500, siteKey: req.body.dapp, error: err },
             }));
         }
     });
@@ -128,39 +127,23 @@ export function prosopoRouter(env) {
             }));
         }
         const { user, dapp, sessionId } = parsed;
+        validiateSiteKey(dapp);
+        validateAddr(user);
         try {
-            validateAddress(dapp, false, 42);
-        }
-        catch (err) {
-            return next(new ProsopoApiError("API.INVALID_SITE_KEY", {
-                context: { code: 400, error: err, siteKey: dapp },
-            }));
-        }
-        try {
-            validateAddress(user, false, 42);
             const clientSettings = await tasks.db.getClientRecord(dapp);
-            const clientRecord = await tasks.db.getClientRecord(dapp);
-            if (!clientRecord) {
+            if (!clientSettings) {
                 return next(new ProsopoApiError("API.SITE_KEY_NOT_REGISTERED", {
                     context: { code: 400, siteKey: dapp },
                 }));
             }
-            if (sessionId) {
-                const sessionRecord = await tasks.db.checkAndRemoveSession(sessionId);
-                if (!sessionRecord) {
-                    return next(new ProsopoApiError("API.BAD_REQUEST", {
-                        context: {
-                            error: "Session ID not found",
-                            code: 400,
-                            siteKey: dapp,
-                            user,
-                        },
-                    }));
-                }
-            }
-            else if (!(clientSettings?.settings?.captchaType === "pow")) {
-                return next(new ProsopoApiError("API.INCORRECT_CAPTCHA_TYPE", {
-                    context: { code: 400, siteKey: dapp, user },
+            const { valid, reason, frictionlessTokenId } = await tasks.powCaptchaManager.isValidRequest(clientSettings, CaptchaType.pow, sessionId);
+            if (!valid) {
+                return next(new ProsopoApiError(reason || "API.BAD_REQUEST", {
+                    context: {
+                        code: 400,
+                        siteKey: dapp,
+                        user,
+                    },
                 }));
             }
             const origin = req.headers.origin;
@@ -179,7 +162,7 @@ export function prosopoRouter(env) {
                 requestedAtTimestamp: challenge.requestedAtTimestamp,
                 userAccount: user,
                 dappAccount: dapp,
-            }, challenge.difficulty, challenge.providerSignature, getIPAddress(req.ip || "").bigInt(), flatten(req.headers));
+            }, challenge.difficulty, challenge.providerSignature, getIPAddress(req.ip || "").bigInt(), flatten(req.headers), frictionlessTokenId);
             const getPowCaptchaResponse = {
                 [ApiParams.status]: "ok",
                 [ApiParams.challenge]: challenge.challenge,
@@ -200,6 +183,7 @@ export function prosopoRouter(env) {
                     code: 500,
                     siteKey: req.body.dapp,
                     user: req.body.user,
+                    error: err,
                 },
             }));
         }
@@ -215,17 +199,9 @@ export function prosopoRouter(env) {
             }));
         }
         const { challenge, difficulty, signature, nonce, verifiedTimeout, dapp, user, } = parsed;
+        validiateSiteKey(dapp);
+        validateAddr(user);
         try {
-            validateAddress(dapp, false, 42);
-        }
-        catch (err) {
-            return next(new ProsopoApiError("API.INVALID_SITE_KEY", {
-                context: { code: 400, error: err, siteKey: dapp },
-            }));
-        }
-        try {
-            validateAddress(user, false, 42);
-            validateAddress(dapp, false, 42);
             const clientRecord = await tasks.db.getClientRecord(dapp);
             if (!clientRecord) {
                 return next(new ProsopoApiError("API.SITE_KEY_NOT_REGISTERED", {
@@ -242,6 +218,7 @@ export function prosopoRouter(env) {
                 context: {
                     code: 500,
                     siteKey: req.body.dapp,
+                    error: err,
                 },
             }));
         }
@@ -249,41 +226,61 @@ export function prosopoRouter(env) {
     router.post(ApiPaths.GetFrictionlessCaptchaChallenge, async (req, res, next) => {
         try {
             const { token, dapp, user } = GetFrictionlessCaptchaChallengeRequestBody.parse(req.body);
-            const isTokenUsed = await tasks.db.checkFrictionlessTokenRecord(token);
-            if (isTokenUsed) {
-                tasks.logger.info("Token has already been used");
-                return res.json(tasks.frictionlessManager.sendImageCaptcha());
+            const existingToken = await tasks.db.getFrictionlessTokenRecordByToken(token);
+            if (existingToken) {
+                tasks.logger.info(`Token ${existingToken} has already been used`);
+                return res.json(await tasks.frictionlessManager.sendImageCaptcha(existingToken._id));
             }
             const lScore = tasks.frictionlessManager.checkLangRules(req.headers["accept-language"] || "");
             const { baseBotScore, timestamp } = await getBotScore(token);
-            if (timestamp < Date.now() - TEN_MINUTES) {
-                tasks.logger.info("Timestamp is older than 10 minutes", new Date(timestamp));
-                return res.json(tasks.frictionlessManager.sendImageCaptcha());
-            }
             const botScore = baseBotScore + lScore;
-            const clientConfig = await tasks.db.getClientRecord(dapp);
-            const botThreshold = clientConfig?.settings?.frictionlessThreshold ||
+            const clientRecord = await tasks.db.getClientRecord(dapp);
+            if (!clientRecord) {
+                return next(new ProsopoApiError("API.SITE_KEY_NOT_REGISTERED", {
+                    context: { code: 400, siteKey: dapp },
+                }));
+            }
+            const { valid, reason } = await tasks.frictionlessManager.isValidRequest(clientRecord, CaptchaType.frictionless);
+            if (!valid) {
+                return next(new ProsopoApiError(reason || "API.BAD_REQUEST", {
+                    context: {
+                        code: 400,
+                        siteKey: dapp,
+                        user,
+                    },
+                }));
+            }
+            const botThreshold = clientRecord.settings?.frictionlessThreshold ||
                 DEFAULT_FRICTIONLESS_THRESHOLD;
-            const ipAddress = getIPAddress(req.ip || "");
-            const isIpBlocked = await tasks.frictionlessManager.checkIpRules(ipAddress, dapp);
-            if (isIpBlocked)
-                return res.json(tasks.frictionlessManager.sendImageCaptcha());
-            const isUserBlocked = await tasks.frictionlessManager.checkUserRules(user, dapp);
-            if (isUserBlocked)
-                return res.json(tasks.frictionlessManager.sendImageCaptcha());
-            if (Number(botScore) > botThreshold)
-                return res.json(tasks.frictionlessManager.sendImageCaptcha());
             const tokenId = await tasks.db.storeFrictionlessTokenRecord({
                 token,
                 score: botScore,
                 threshold: botThreshold,
+                scoreComponents: {
+                    baseScore: baseBotScore,
+                    ...(lScore && { lScore }),
+                },
             });
-            const response = await tasks.frictionlessManager.sendPowCaptcha(tokenId);
-            return res.json(response);
+            if (FrictionlessManager.timestampTooOld(timestamp)) {
+                await tasks.frictionlessManager.scoreIncreaseTimestamp(timestamp, baseBotScore, botScore, tokenId);
+                return res.json(await tasks.frictionlessManager.sendImageCaptcha(tokenId));
+            }
+            const ipAddress = getIPAddress(req.ip || "");
+            const imageCaptchaConfigDefined = await imageCaptchaConfigResolver.isConfigDefined(dapp, ipAddress, user);
+            if (imageCaptchaConfigDefined) {
+                await tasks.frictionlessManager.scoreIncreaseAccessPolicy(imageCaptchaConfigResolver.accessRule, baseBotScore, botScore, tokenId);
+                return res.json(await tasks.frictionlessManager.sendImageCaptcha(tokenId));
+            }
+            if (Number(botScore) > botThreshold) {
+                tasks.logger.info({
+                    message: `Bot score ${botScore} is greater than threshold ${botThreshold}`,
+                });
+                return res.json(await tasks.frictionlessManager.sendImageCaptcha(tokenId));
+            }
+            return res.json(await tasks.frictionlessManager.sendPowCaptcha(tokenId));
         }
         catch (err) {
-            console.error("Error in frictionless captcha challenge:", err);
-            tasks.logger.error(err);
+            tasks.logger.error("Error in frictionless captcha challenge:", err);
             return next(new ProsopoApiError("API.BAD_REQUEST", {
                 context: { code: 400, error: err },
             }));