@prosopo/provider 4.15.14 → 4.15.15

package/dist/api/captcha/getPuzzleCaptchaChallenge.js

@@ -1,205 +1,136 @@
-import { ProsopoApiError } from "@prosopo/common";
-import { GetPuzzleCaptchaChallengeRequestBody, CaptchaType, SimdReadingsStage, ApiParams } from "@prosopo/types";
-import { flatten } from "@prosopo/util";
+import { validateAddr, validateSiteKey } from "../validateAddress.js";
 import { getCompositeIpAddress } from "../../compositeIpAddress.js";
-import "../../tasks/index.js";
-import { normalizeRequestIp } from "../../utils/normalizeRequestIp.js";
-import { getMaintenanceMode } from "../admin/apiToggleMaintenanceModeEndpoint.js";
+import { recordCaptchaIssueError, recordCaptchaIssued } from "../metrics.js";
 import { getRequestUserScope } from "../blacklistRequestInspector.js";
-import { recordCaptchaIssued, recordCaptchaIssueError } from "../metrics.js";
-import { validateSiteKey, validateAddr } from "../validateAddress.js";
-import { buildPuzzleMaintenanceResponse } from "./maintenanceModeResponses.js";
 import { Tasks } from "../../tasks/tasks.js";
-const getPuzzleCaptchaChallenge = (env, userAccessRulesStorage) => async (req, res, next) => {
-  let parsed;
-  try {
-    parsed = GetPuzzleCaptchaChallengeRequestBody.parse(req.body);
-  } catch (err) {
-    return next(
-      new ProsopoApiError("CAPTCHA.PARSE_ERROR", {
-        context: { code: 400, error: err },
-        i18n: req.i18n,
-        logger: req.logger
-      })
-    );
-  }
-  const { user, dapp, sessionId, simdReadings } = parsed;
-  validateSiteKey(dapp);
-  validateAddr(user);
-  if (getMaintenanceMode()) {
-    req.logger.info(() => ({
-      msg: "Maintenance mode active - returning dummy puzzle challenge",
-      data: { dapp, user, sessionId }
-    }));
-    return res.json(buildPuzzleMaintenanceResponse(user, dapp));
-  }
-  const tasks = new Tasks(env, req.logger);
-  try {
-    const clientSettings = await tasks.db.getClientRecord(dapp);
-    if (!clientSettings) {
-      return next(
-        new ProsopoApiError("API.SITE_KEY_NOT_REGISTERED", {
-          context: { code: 400, siteKey: dapp },
-          i18n: req.i18n,
-          logger: req.logger
-        })
-      );
-    }
-    const normalizedIp = normalizeRequestIp(req.ip, req.logger);
-    if (!normalizedIp) {
-      req.logger.warn(() => ({
-        msg: "Request missing IP; geoblocking will be skipped"
-      }));
-    }
-    const countryCode = req.ipInfo && "isValid" in req.ipInfo && req.ipInfo.isValid ? req.ipInfo.countryCode : void 0;
-    const asn = req.ipInfo && "isValid" in req.ipInfo && req.ipInfo.isValid ? req.ipInfo.asnNumber : void 0;
-    const userScope = getRequestUserScope(
-      flatten(req.headers),
-      req.ja4,
-      normalizedIp,
-      user,
-      void 0,
-      // headHash
-      void 0,
-      // coords
-      countryCode,
-      asn
-    );
-    const userAccessPolicy = (await tasks.puzzleCaptchaManager.getPrioritisedAccessPolicies(
-      userAccessRulesStorage,
-      dapp,
-      userScope
-    )).find((p) => !p.deferToVerify);
-    const {
-      valid,
-      reason,
-      sessionId: validSessionId
-    } = await tasks.puzzleCaptchaManager.isValidRequest(
-      clientSettings,
-      CaptchaType.puzzle,
-      env,
-      sessionId,
-      userAccessPolicy,
-      normalizedIp
-    );
-    if (!valid) {
-      return next(
-        new ProsopoApiError(reason || "API.BAD_REQUEST", {
-          context: {
-            code: 400,
-            siteKey: dapp,
-            user
-          },
-          i18n: req.i18n,
-          logger: req.logger
-        })
-      );
-    }
-    const origin = req.headers.origin;
-    if (!origin) {
-      return next(
-        new ProsopoApiError("API.BAD_REQUEST", {
-          context: {
-            error: "Origin header not found",
-            code: 400,
-            siteKey: dapp,
-            user
-          },
-          i18n: req.i18n,
-          logger: req.logger
-        })
-      );
-    }
-    const tolerance = clientSettings?.settings?.puzzleTolerance;
-    const challenge = await tasks.puzzleCaptchaManager.getPuzzleCaptchaChallenge(
-      user,
-      dapp,
-      origin,
-      tolerance
-    );
-    if (validSessionId && simdReadings) {
-      await tasks.frictionlessManager.decryptAndAttachSimdReadingsIfAbsent(
-        validSessionId,
-        simdReadings,
-        SimdReadingsStage.challenge
-      ).catch((updateErr) => {
-        req.logger.warn(() => ({
-          err: updateErr,
-          msg: "Failed to patch session with SIMD readings on puzzle challenge"
-        }));
-      });
-    }
-    await tasks.db.storePuzzleCaptchaRecord(
-      challenge.challenge,
-      {
-        requestedAtTimestamp: challenge.requestedAtTimestamp,
-        userAccount: user,
-        dappAccount: dapp
-      },
-      challenge.targetX,
-      challenge.targetY,
-      challenge.originX,
-      challenge.originY,
-      challenge.tolerance,
-      challenge.providerSignature,
-      getCompositeIpAddress(normalizedIp),
-      flatten(req.headers),
-      req.ja4,
-      validSessionId,
-      // Persist the full ipinfo payload — consumers read
-      // individual flags off this object instead of separate
-      // flat fields.
-      req.ipInfo
-    );
-    const getPuzzleCaptchaResponse = {
-      [ApiParams.status]: "ok",
-      [ApiParams.challenge]: challenge.challenge,
-      [ApiParams.targetX]: challenge.targetX,
-      [ApiParams.targetY]: challenge.targetY,
-      [ApiParams.originX]: challenge.originX,
-      [ApiParams.originY]: challenge.originY,
-      [ApiParams.tolerance]: challenge.tolerance,
-      [ApiParams.timestamp]: challenge.requestedAtTimestamp.toString(),
-      [ApiParams.signature]: {
-        [ApiParams.provider]: {
-          [ApiParams.challenge]: challenge.providerSignature
-        }
-      }
-    };
-    req.logger.info(() => ({
-      msg: "Puzzle captcha challenge issued",
-      data: {
-        captchaType: CaptchaType.puzzle,
-        challenge: challenge.challenge,
-        tolerance: challenge.tolerance,
-        user,
-        dapp,
-        session: sessionId
-      }
-    }));
-    recordCaptchaIssued(CaptchaType.puzzle);
-    return res.json(getPuzzleCaptchaResponse);
-  } catch (err) {
-    recordCaptchaIssueError(CaptchaType.puzzle);
-    req.logger.error(() => ({
-      err,
-      body: req.body,
-      msg: "Error in puzzle captcha challenge request"
-    }));
-    return next(
-      new ProsopoApiError("API.BAD_REQUEST", {
-        context: {
-          code: 500,
-          siteKey: req.body.dapp,
-          user: req.body.user,
-          error: err
-        },
-        i18n: req.i18n,
-        logger: req.logger
-      })
-    );
-  }
-};
-export {
-  getPuzzleCaptchaChallenge as default
+import { getMaintenanceMode } from "../admin/apiToggleMaintenanceModeEndpoint.js";
+import { normalizeRequestIp } from "../../utils/normalizeRequestIp.js";
+import { buildPuzzleMaintenanceResponse } from "./maintenanceModeResponses.js";
+import { ProsopoApiError } from "@prosopo/common";
+import { ApiParams, CaptchaType, GetPuzzleCaptchaChallengeRequestBody, SimdReadingsStage } from "@prosopo/types";
+import { flatten } from "@prosopo/util";
+//#region src/api/captcha/getPuzzleCaptchaChallenge.ts
+var getPuzzleCaptchaChallenge_default = (env, userAccessRulesStorage) => async (req, res, next) => {
+	let parsed;
+	try {
+		parsed = GetPuzzleCaptchaChallengeRequestBody.parse(req.body);
+	} catch (err) {
+		return next(new ProsopoApiError("CAPTCHA.PARSE_ERROR", {
+			context: {
+				code: 400,
+				error: err
+			},
+			i18n: req.i18n,
+			logger: req.logger
+		}));
+	}
+	const { user, dapp, sessionId, simdReadings } = parsed;
+	validateSiteKey(dapp);
+	validateAddr(user);
+	if (getMaintenanceMode()) {
+		req.logger.info(() => ({
+			msg: "Maintenance mode active - returning dummy puzzle challenge",
+			data: {
+				dapp,
+				user,
+				sessionId
+			}
+		}));
+		return res.json(buildPuzzleMaintenanceResponse(user, dapp));
+	}
+	const tasks = new Tasks(env, req.logger);
+	try {
+		const clientSettings = await tasks.db.getClientRecord(dapp);
+		if (!clientSettings) return next(new ProsopoApiError("API.SITE_KEY_NOT_REGISTERED", {
+			context: {
+				code: 400,
+				siteKey: dapp
+			},
+			i18n: req.i18n,
+			logger: req.logger
+		}));
+		const normalizedIp = normalizeRequestIp(req.ip, req.logger);
+		if (!normalizedIp) req.logger.warn(() => ({ msg: "Request missing IP; geoblocking will be skipped" }));
+		const countryCode = req.ipInfo && "isValid" in req.ipInfo && req.ipInfo.isValid ? req.ipInfo.countryCode : void 0;
+		const asn = req.ipInfo && "isValid" in req.ipInfo && req.ipInfo.isValid ? req.ipInfo.asnNumber : void 0;
+		const userScope = getRequestUserScope(flatten(req.headers), req.ja4, normalizedIp, user, void 0, void 0, countryCode, asn);
+		const userAccessPolicy = (await tasks.puzzleCaptchaManager.getPrioritisedAccessPolicies(userAccessRulesStorage, dapp, userScope)).find((p) => !p.deferToVerify);
+		const { valid, reason, sessionId: validSessionId } = await tasks.puzzleCaptchaManager.isValidRequest(clientSettings, CaptchaType.puzzle, env, sessionId, userAccessPolicy, normalizedIp);
+		if (!valid) return next(new ProsopoApiError(reason || "API.BAD_REQUEST", {
+			context: {
+				code: 400,
+				siteKey: dapp,
+				user
+			},
+			i18n: req.i18n,
+			logger: req.logger
+		}));
+		const origin = req.headers.origin;
+		if (!origin) return next(new ProsopoApiError("API.BAD_REQUEST", {
+			context: {
+				error: "Origin header not found",
+				code: 400,
+				siteKey: dapp,
+				user
+			},
+			i18n: req.i18n,
+			logger: req.logger
+		}));
+		const tolerance = clientSettings?.settings?.puzzleTolerance;
+		const challenge = await tasks.puzzleCaptchaManager.getPuzzleCaptchaChallenge(user, dapp, origin, tolerance);
+		if (validSessionId && simdReadings) await tasks.frictionlessManager.decryptAndAttachSimdReadingsIfAbsent(validSessionId, simdReadings, SimdReadingsStage.challenge).catch((updateErr) => {
+			req.logger.warn(() => ({
+				err: updateErr,
+				msg: "Failed to patch session with SIMD readings on puzzle challenge"
+			}));
+		});
+		await tasks.db.storePuzzleCaptchaRecord(challenge.challenge, {
+			requestedAtTimestamp: challenge.requestedAtTimestamp,
+			userAccount: user,
+			dappAccount: dapp
+		}, challenge.targetX, challenge.targetY, challenge.originX, challenge.originY, challenge.tolerance, challenge.providerSignature, getCompositeIpAddress(normalizedIp), flatten(req.headers), req.ja4, validSessionId, req.ipInfo);
+		const getPuzzleCaptchaResponse = {
+			[ApiParams.status]: "ok",
+			[ApiParams.challenge]: challenge.challenge,
+			[ApiParams.targetX]: challenge.targetX,
+			[ApiParams.targetY]: challenge.targetY,
+			[ApiParams.originX]: challenge.originX,
+			[ApiParams.originY]: challenge.originY,
+			[ApiParams.tolerance]: challenge.tolerance,
+			[ApiParams.timestamp]: challenge.requestedAtTimestamp.toString(),
+			[ApiParams.signature]: { [ApiParams.provider]: { [ApiParams.challenge]: challenge.providerSignature } }
+		};
+		req.logger.info(() => ({
+			msg: "Puzzle captcha challenge issued",
+			data: {
+				captchaType: CaptchaType.puzzle,
+				challenge: challenge.challenge,
+				tolerance: challenge.tolerance,
+				user,
+				dapp,
+				session: sessionId
+			}
+		}));
+		recordCaptchaIssued(CaptchaType.puzzle);
+		return res.json(getPuzzleCaptchaResponse);
+	} catch (err) {
+		recordCaptchaIssueError(CaptchaType.puzzle);
+		req.logger.error(() => ({
+			err,
+			body: req.body,
+			msg: "Error in puzzle captcha challenge request"
+		}));
+		return next(new ProsopoApiError("API.BAD_REQUEST", {
+			context: {
+				code: 500,
+				siteKey: req.body.dapp,
+				user: req.body.user,
+				error: err
+			},
+			i18n: req.i18n,
+			logger: req.logger
+		}));
+	}
 };
+//#endregion
+export { getPuzzleCaptchaChallenge_default as default };

package/dist/api/captcha/maintenanceModeResponses.js

@@ -1,52 +1,43 @@
+import { ApiParams, POW_SEPARATOR } from "@prosopo/types";
 import { randomUUID } from "node:crypto";
-import { POW_SEPARATOR, ApiParams } from "@prosopo/types";
-const sessionPrefix = (host) => host ? host.replace(".prosopo.io", "") : "local";
-const buildChallenge = (user, dapp) => `${Date.now()}${POW_SEPARATOR}${user}${POW_SEPARATOR}${dapp}${POW_SEPARATOR}0`;
-const buildFrictionlessMaintenanceResponse = (captchaType, host) => ({
-  [ApiParams.captchaType]: captchaType,
-  [ApiParams.sessionId]: `${sessionPrefix(host)}-${randomUUID()}`,
-  [ApiParams.status]: "ok"
+//#region src/api/captcha/maintenanceModeResponses.ts
+var sessionPrefix = (host) => host ? host.replace(".prosopo.io", "") : "local";
+var buildChallenge = (user, dapp) => `${Date.now()}${POW_SEPARATOR}${user}${POW_SEPARATOR}${dapp}${POW_SEPARATOR}0`;
+var buildFrictionlessMaintenanceResponse = (captchaType, host) => ({
+	[ApiParams.captchaType]: captchaType,
+	[ApiParams.sessionId]: `${sessionPrefix(host)}-${randomUUID()}`,
+	[ApiParams.status]: "ok"
 });
-const buildPowMaintenanceResponse = (user, dapp) => {
-  const timestamp = Date.now();
-  return {
-    [ApiParams.status]: "ok",
-    [ApiParams.challenge]: buildChallenge(user, dapp),
-    [ApiParams.difficulty]: 1,
-    [ApiParams.timestamp]: timestamp.toString(),
-    [ApiParams.signature]: {
-      [ApiParams.provider]: { [ApiParams.challenge]: "" }
-    }
-  };
+var buildPowMaintenanceResponse = (user, dapp) => {
+	const timestamp = Date.now();
+	return {
+		[ApiParams.status]: "ok",
+		[ApiParams.challenge]: buildChallenge(user, dapp),
+		[ApiParams.difficulty]: 1,
+		[ApiParams.timestamp]: timestamp.toString(),
+		[ApiParams.signature]: { [ApiParams.provider]: { [ApiParams.challenge]: "" } }
+	};
 };
-const buildImageMaintenanceResponse = () => ({
-  [ApiParams.status]: "ok",
-  [ApiParams.captchas]: [],
-  [ApiParams.requestHash]: "",
-  [ApiParams.timestamp]: Date.now().toString(),
-  [ApiParams.signature]: {
-    [ApiParams.provider]: { [ApiParams.requestHash]: "" }
-  }
+var buildImageMaintenanceResponse = () => ({
+	[ApiParams.status]: "ok",
+	[ApiParams.captchas]: [],
+	[ApiParams.requestHash]: "",
+	[ApiParams.timestamp]: Date.now().toString(),
+	[ApiParams.signature]: { [ApiParams.provider]: { [ApiParams.requestHash]: "" } }
 });
-const buildPuzzleMaintenanceResponse = (user, dapp) => {
-  const timestamp = Date.now();
-  return {
-    [ApiParams.status]: "ok",
-    [ApiParams.challenge]: buildChallenge(user, dapp),
-    [ApiParams.targetX]: 100,
-    [ApiParams.targetY]: 100,
-    [ApiParams.originX]: 0,
-    [ApiParams.originY]: 0,
-    [ApiParams.tolerance]: 1e3,
-    [ApiParams.timestamp]: timestamp.toString(),
-    [ApiParams.signature]: {
-      [ApiParams.provider]: { [ApiParams.challenge]: "" }
-    }
-  };
-};
-export {
-  buildFrictionlessMaintenanceResponse,
-  buildImageMaintenanceResponse,
-  buildPowMaintenanceResponse,
-  buildPuzzleMaintenanceResponse
+var buildPuzzleMaintenanceResponse = (user, dapp) => {
+	const timestamp = Date.now();
+	return {
+		[ApiParams.status]: "ok",
+		[ApiParams.challenge]: buildChallenge(user, dapp),
+		[ApiParams.targetX]: 100,
+		[ApiParams.targetY]: 100,
+		[ApiParams.originX]: 0,
+		[ApiParams.originY]: 0,
+		[ApiParams.tolerance]: 1e3,
+		[ApiParams.timestamp]: timestamp.toString(),
+		[ApiParams.signature]: { [ApiParams.provider]: { [ApiParams.challenge]: "" } }
+	};
 };
+//#endregion
+export { buildFrictionlessMaintenanceResponse, buildImageMaintenanceResponse, buildPowMaintenanceResponse, buildPuzzleMaintenanceResponse };

package/dist/api/captcha/submitImageCaptchaSolution.js

@@ -1,104 +1,78 @@
-import { ProsopoApiError } from "@prosopo/common";
-import { CaptchaSolutionBody, ApiParams } from "@prosopo/types";
-import { getIPAddress, flatten } from "@prosopo/util";
-import "../../tasks/index.js";
+import { validateAddr, validateSiteKey } from "../validateAddress.js";
+import { Tasks } from "../../tasks/tasks.js";
 import { getMaintenanceMode } from "../admin/apiToggleMaintenanceModeEndpoint.js";
 import { resolveTestSiteKeyVerdict } from "../testSiteKey.js";
-import { validateSiteKey, validateAddr } from "../validateAddress.js";
-import { Tasks } from "../../tasks/tasks.js";
-const submitImageCaptchaSolution = (env) => async (req, res, next) => {
-  if (getMaintenanceMode()) {
-    req.logger.info(() => ({
-      msg: "Maintenance mode active - returning verified for image captcha"
-    }));
-    const result = {
-      status: "ok",
-      captchas: [],
-      verified: true
-    };
-    return res.json(result);
-  }
-  const tasks = new Tasks(env, req.logger);
-  let parsed;
-  try {
-    parsed = CaptchaSolutionBody.parse(req.body);
-  } catch (err) {
-    return next(
-      new ProsopoApiError("CAPTCHA.PARSE_ERROR", {
-        context: { code: 400, error: err, body: req.body },
-        i18n: req.i18n,
-        logger: req.logger
-      })
-    );
-  }
-  const { user, dapp } = parsed;
-  validateSiteKey(dapp);
-  validateAddr(user);
-  const testVerdict = resolveTestSiteKeyVerdict(dapp, req.logger);
-  if (testVerdict !== null) {
-    const result = {
-      status: "ok",
-      captchas: [],
-      verified: testVerdict
-    };
-    return res.json(result);
-  }
-  try {
-    const clientRecord = await tasks.db.getClientRecord(parsed.dapp);
-    if (!clientRecord) {
-      return next(
-        new ProsopoApiError("API.SITE_KEY_NOT_REGISTERED", {
-          context: { code: 400, siteKey: dapp },
-          i18n: req.i18n,
-          logger: req.logger
-        })
-      );
-    }
-    const result = await tasks.imgCaptchaManager.dappUserSolution(
-      user,
-      dapp,
-      parsed[ApiParams.requestHash],
-      parsed[ApiParams.captchas],
-      parsed[ApiParams.signature].user.timestamp,
-      Number.parseInt(parsed[ApiParams.timestamp]),
-      parsed[ApiParams.signature].provider.requestHash,
-      getIPAddress(req.ip || ""),
-      flatten(req.headers),
-      req.ja4,
-      parsed[ApiParams.behavioralData],
-      // Persist the full ipinfo payload — consumers read
-      // individual flags off this object instead of separate
-      // flat fields.
-      req.ipInfo,
-      parsed[ApiParams.simdReadings],
-      parsed[ApiParams.clientMetaData]
-    );
-    const returnValue = {
-      status: req.i18n.t(
-        result.verified ? "API.CAPTCHA_PASSED" : "API.CAPTCHA_FAILED"
-      ),
-      ...result
-    };
-    return res.json(returnValue);
-  } catch (err) {
-    req.logger.error(() => ({
-      err,
-      body: req.body,
-      msg: "Error in image captcha solution submission"
-    }));
-    return next(
-      new ProsopoApiError("API.BAD_REQUEST", {
-        context: {
-          code: 500,
-          siteKey: req.body.dapp,
-          error: err
-        },
-        i18n: req.i18n,
-        logger: req.logger
-      })
-    );
-  }
-};
-export {
-  submitImageCaptchaSolution as default
+import { ProsopoApiError } from "@prosopo/common";
+import { ApiParams, CaptchaSolutionBody } from "@prosopo/types";
+import { flatten, getIPAddress } from "@prosopo/util";
+//#region src/api/captcha/submitImageCaptchaSolution.ts
+var submitImageCaptchaSolution_default = (env) => async (req, res, next) => {
+	if (getMaintenanceMode()) {
+		req.logger.info(() => ({ msg: "Maintenance mode active - returning verified for image captcha" }));
+		return res.json({
+			status: "ok",
+			captchas: [],
+			verified: true
+		});
+	}
+	const tasks = new Tasks(env, req.logger);
+	let parsed;
+	try {
+		parsed = CaptchaSolutionBody.parse(req.body);
+	} catch (err) {
+		return next(new ProsopoApiError("CAPTCHA.PARSE_ERROR", {
+			context: {
+				code: 400,
+				error: err,
+				body: req.body
+			},
+			i18n: req.i18n,
+			logger: req.logger
+		}));
+	}
+	const { user, dapp } = parsed;
+	validateSiteKey(dapp);
+	validateAddr(user);
+	const testVerdict = resolveTestSiteKeyVerdict(dapp, req.logger);
+	if (testVerdict !== null) {
+		const result = {
+			status: "ok",
+			captchas: [],
+			verified: testVerdict
+		};
+		return res.json(result);
+	}
+	try {
+		if (!await tasks.db.getClientRecord(parsed.dapp)) return next(new ProsopoApiError("API.SITE_KEY_NOT_REGISTERED", {
+			context: {
+				code: 400,
+				siteKey: dapp
+			},
+			i18n: req.i18n,
+			logger: req.logger
+		}));
+		const result = await tasks.imgCaptchaManager.dappUserSolution(user, dapp, parsed[ApiParams.requestHash], parsed[ApiParams.captchas], parsed[ApiParams.signature].user.timestamp, Number.parseInt(parsed[ApiParams.timestamp]), parsed[ApiParams.signature].provider.requestHash, getIPAddress(req.ip || ""), flatten(req.headers), req.ja4, parsed[ApiParams.behavioralData], req.ipInfo, parsed[ApiParams.simdReadings], parsed[ApiParams.clientMetaData]);
+		const returnValue = {
+			status: req.i18n.t(result.verified ? "API.CAPTCHA_PASSED" : "API.CAPTCHA_FAILED"),
+			...result
+		};
+		return res.json(returnValue);
+	} catch (err) {
+		req.logger.error(() => ({
+			err,
+			body: req.body,
+			msg: "Error in image captcha solution submission"
+		}));
+		return next(new ProsopoApiError("API.BAD_REQUEST", {
+			context: {
+				code: 500,
+				siteKey: req.body.dapp,
+				error: err
+			},
+			i18n: req.i18n,
+			logger: req.logger
+		}));
+	}
 };
+//#endregion
+export { submitImageCaptchaSolution_default as default };