@contember/engine-tenant-api 2.1.0-beta.2 → 2.2.0-alpha.1

package/dist/production/src/model/service/SignUpManager.js

@@ -1,45 +1,55 @@
 import "../type/ApiKey.js";
 import "@contember/database";
 import "node:crypto";
-import { ResponseOk } from "../utils/Response.js";
+import { ResponseError, ResponseOk } from "../utils/Response.js";
 import { CreatePersonCommand } from "../commands/person/CreatePersonCommand.js";
 import { CreateIdentityCommand } from "../commands/identity/CreateIdentityCommand.js";
-import "../queries/apiKey/ApiKeyQuery.js";
-import { ConfigurationQuery } from "../queries/configuration/ConfigurationQuery.js";
 import "../authorization/PermissionActions.js";
 import "@contember/authorization";
 import { TenantRole } from "../authorization/Roles.js";
 import "../authorization/PermissionContext.js";
 import "../authorization/PermissionsFactory.js";
 import "@contember/schema";
+import { validateEmail } from "../utils/email.js";
 class SignUpManager {
   constructor(emailValidator, passwordStrengthValidator) {
     this.emailValidator = emailValidator;
     this.passwordStrengthValidator = passwordStrengthValidator;
   }
-  async signUp(dbContext, { email, password, roles = [] }) {
-    const validationError = await this.emailValidator.validateEmail(dbContext, email);
-    if (validationError !== null) {
-      return validationError;
+  async signUp(dbContext, args) {
+    const { email, password, roles = [], config } = args;
+    if (!validateEmail(email.trim())) {
+      return new ResponseError("INVALID_EMAIL_FORMAT", "E-mail address is not in a valid format");
+    }
+    const existingPerson = await this.emailValidator.findExistingPerson(dbContext, email);
+    if (existingPerson !== null) {
+      const exposeMethod = config.login.revealUserExists && config.login.revealLoginMethod;
+      const recommendedAction = exposeMethod ? existingPerson.password_hash ? "SIGN_IN" : "RESET_PASSWORD" : void 0;
+      return new ResponseError(
+        "EMAIL_ALREADY_EXISTS",
+        `User with email ${email} already exists`,
+        recommendedAction ? { recommendedAction } : void 0
+      );
     }
     const plainPassword = password.getPlain();
     if (plainPassword) {
-      const config = await dbContext.queryHandler.fetch(new ConfigurationQuery());
       const passwordVerifyResult = await this.passwordStrengthValidator.verify(plainPassword, config.password, "TOO_WEAK");
       if (!passwordVerifyResult.ok) {
         return passwordVerifyResult;
       }
     }
+    const emailVerificationRequired = config.signup.requireEmailVerification;
     const person = await dbContext.transaction(async (db) => {
       const identityId = await db.commandBus.execute(new CreateIdentityCommand([...roles, TenantRole.PERSON]));
-      return await db.commandBus.execute(new CreatePersonCommand({ identityId, email, password }));
+      return await db.commandBus.execute(new CreatePersonCommand({ identityId, email, password, emailVerificationRequired }));
     });
-    return new ResponseOk(new SignUpResult(person));
+    return new ResponseOk(new SignUpResult(person, emailVerificationRequired));
   }
 }
 class SignUpResult {
-  constructor(person) {
+  constructor(person, emailVerificationRequired = false) {
     this.person = person;
+    this.emailVerificationRequired = emailVerificationRequired;
   }
 }
 export {

package/dist/production/src/model/service/SignUpManager.js.map

@@ -1 +1 @@
-{"version":3,"file":"SignUpManager.js","sources":["../../../../../../packages/engine-tenant-api/src/model/service/SignUpManager.ts"],"sourcesContent":["import { CreateIdentityCommand, CreatePersonCommand } from '../commands'\nimport { ConfigurationQuery, PersonRow } from '../queries'\nimport { SignUpErrorCode, WeakPasswordReason } from '../../schema'\nimport { TenantRole } from '../authorization'\nimport { Response, ResponseOk } from '../utils/Response'\nimport { DatabaseContext } from '../utils'\nimport { MaybePassword } from '../dtos'\nimport { EmailValidator } from './EmailValidator'\nimport { PasswordStrengthValidator } from './PasswordStrengthValidator'\n\ntype SignUpUser = {\n\temail: string\n\tname?: string\n\tpassword: MaybePassword\n\troles?: readonly string[]\n}\n\nexport class SignUpManager {\n\tconstructor(\n\t\tprivate readonly emailValidator: EmailValidator,\n\t\tprivate readonly passwordStrengthValidator: PasswordStrengthValidator,\n\t) {\n\t}\n\n\tasync signUp(dbContext: DatabaseContext, { email, password, roles = [] }: SignUpUser): Promise<SignUpResponse> {\n\t\tconst validationError = await this.emailValidator.validateEmail(dbContext, email)\n\t\tif (validationError !== null) {\n\t\t\treturn validationError\n\t\t}\n\t\tconst plainPassword = password.getPlain()\n\n\t\tif (plainPassword) {\n\t\t\tconst config = await dbContext.queryHandler.fetch(new ConfigurationQuery())\n\t\t\tconst passwordVerifyResult = await this.passwordStrengthValidator.verify(plainPassword, config.password, 'TOO_WEAK')\n\t\t\tif (!passwordVerifyResult.ok) {\n\t\t\t\treturn passwordVerifyResult\n\t\t\t}\n\t\t}\n\n\t\tconst person = await dbContext.transaction(async db => {\n\t\t\tconst identityId = await db.commandBus.execute(new CreateIdentityCommand([...roles, TenantRole.PERSON]))\n\t\t\treturn await db.commandBus.execute(new CreatePersonCommand({ identityId, email, password }))\n\t\t})\n\t\treturn new ResponseOk(new SignUpResult(person))\n\t}\n}\n\nexport class SignUpResult {\n\tconstructor(public readonly person: Omit<PersonRow, 'roles'>) {}\n}\nexport type SignUpResponse = Response<SignUpResult, SignUpErrorCode, {\n\tweakPasswordReasons?: WeakPasswordReason[]\n}>\n"],"names":[],"mappings":";;;;;;;;;;;;;;AAiBO,MAAM,cAAc;AAAA,EAC1B,YACkB,gBACA,2BAChB;AAFgB,SAAA,iBAAA;AACA,SAAA,4BAAA;AAAA,EAElB;AAAA,EAEA,MAAM,OAAO,WAA4B,EAAE,OAAO,UAAU,QAAQ,CAAA,KAA2C;AAC9G,UAAM,kBAAkB,MAAM,KAAK,eAAe,cAAc,WAAW,KAAK;AAChF,QAAI,oBAAoB,MAAM;AAC7B,aAAO;AAAA,IACR;AACA,UAAM,gBAAgB,SAAS,SAAA;AAE/B,QAAI,eAAe;AAClB,YAAM,SAAS,MAAM,UAAU,aAAa,MAAM,IAAI,oBAAoB;AAC1E,YAAM,uBAAuB,MAAM,KAAK,0BAA0B,OAAO,eAAe,OAAO,UAAU,UAAU;AACnH,UAAI,CAAC,qBAAqB,IAAI;AAC7B,eAAO;AAAA,MACR;AAAA,IACD;AAEA,UAAM,SAAS,MAAM,UAAU,YAAY,OAAM,OAAM;AACtD,YAAM,aAAa,MAAM,GAAG,WAAW,QAAQ,IAAI,sBAAsB,CAAC,GAAG,OAAO,WAAW,MAAM,CAAC,CAAC;AACvG,aAAO,MAAM,GAAG,WAAW,QAAQ,IAAI,oBAAoB,EAAE,YAAY,OAAO,SAAA,CAAU,CAAC;AAAA,IAC5F,CAAC;AACD,WAAO,IAAI,WAAW,IAAI,aAAa,MAAM,CAAC;AAAA,EAC/C;AACD;AAEO,MAAM,aAAa;AAAA,EACzB,YAA4B,QAAkC;AAAlC,SAAA,SAAA;AAAA,EAAmC;AAChE;"}
+{"version":3,"file":"SignUpManager.js","sources":["../../../../../../packages/engine-tenant-api/src/model/service/SignUpManager.ts"],"sourcesContent":["import { CreateIdentityCommand, CreatePersonCommand } from '../commands/index.js'\nimport { PersonRow } from '../queries/index.js'\nimport { SignUpErrorCode, SignUpRecommendedAction, WeakPasswordReason } from '../../schema/index.js'\nimport { TenantRole } from '../authorization/index.js'\nimport { Response, ResponseError, ResponseOk } from '../utils/Response.js'\nimport { DatabaseContext } from '../utils/index.js'\nimport { MaybePassword } from '../dtos/index.js'\nimport { EmailValidator } from './EmailValidator.js'\nimport { PasswordStrengthValidator } from './PasswordStrengthValidator.js'\nimport { validateEmail as isEmailFormatValid } from '../utils/email.js'\nimport { Config } from '../type/Config.js'\n\ntype SignUpUser = {\n\temail: string\n\tname?: string\n\tpassword: MaybePassword\n\troles?: readonly string[]\n\tconfig: Config\n}\n\nexport class SignUpManager {\n\tconstructor(\n\t\tprivate readonly emailValidator: EmailValidator,\n\t\tprivate readonly passwordStrengthValidator: PasswordStrengthValidator,\n\t) {\n\t}\n\n\tasync signUp(dbContext: DatabaseContext, args: SignUpUser): Promise<SignUpResponse> {\n\t\tconst { email, password, roles = [], config } = args\n\n\t\tif (!isEmailFormatValid(email.trim())) {\n\t\t\treturn new ResponseError('INVALID_EMAIL_FORMAT', 'E-mail address is not in a valid format')\n\t\t}\n\n\t\tconst existingPerson = await this.emailValidator.findExistingPerson(dbContext, email)\n\t\tif (existingPerson !== null) {\n\t\t\tconst exposeMethod = config.login.revealUserExists && config.login.revealLoginMethod\n\t\t\tconst recommendedAction: SignUpRecommendedAction | undefined = exposeMethod\n\t\t\t\t? (existingPerson.password_hash ? 'SIGN_IN' : 'RESET_PASSWORD')\n\t\t\t\t: undefined\n\t\t\treturn new ResponseError(\n\t\t\t\t'EMAIL_ALREADY_EXISTS',\n\t\t\t\t`User with email ${email} already exists`,\n\t\t\t\trecommendedAction ? { recommendedAction } : undefined,\n\t\t\t)\n\t\t}\n\n\t\tconst plainPassword = password.getPlain()\n\n\t\tif (plainPassword) {\n\t\t\tconst passwordVerifyResult = await this.passwordStrengthValidator.verify(plainPassword, config.password, 'TOO_WEAK')\n\t\t\tif (!passwordVerifyResult.ok) {\n\t\t\t\treturn passwordVerifyResult\n\t\t\t}\n\t\t}\n\n\t\t// Freeze the requirement onto the person at sign-up time. Flipping the\n\t\t// tenant-wide flag later must not retroactively lock out accounts that\n\t\t// were created while verification was optional.\n\t\tconst emailVerificationRequired = config.signup.requireEmailVerification\n\n\t\tconst person = await dbContext.transaction(async db => {\n\t\t\tconst identityId = await db.commandBus.execute(new CreateIdentityCommand([...roles, TenantRole.PERSON]))\n\t\t\treturn await db.commandBus.execute(new CreatePersonCommand({ identityId, email, password, emailVerificationRequired }))\n\t\t})\n\t\treturn new ResponseOk(new SignUpResult(person, emailVerificationRequired))\n\t}\n}\n\nexport class SignUpResult {\n\tconstructor(\n\t\tpublic readonly person: Omit<PersonRow, 'roles'>,\n\t\tpublic readonly emailVerificationRequired: boolean = false,\n\t) {}\n}\n\nexport type SignUpResponse = Response<SignUpResult, SignUpErrorCode, {\n\tweakPasswordReasons?: WeakPasswordReason[]\n\trecommendedAction?: SignUpRecommendedAction\n}>\n"],"names":["isEmailFormatValid"],"mappings":";;;;;;;;;;;;;AAoBO,MAAM,cAAc;AAAA,EAC1B,YACkB,gBACA,2BAChB;AAFgB,SAAA,iBAAA;AACA,SAAA,4BAAA;AAAA,EAElB;AAAA,EAEA,MAAM,OAAO,WAA4B,MAA2C;AACnF,UAAM,EAAE,OAAO,UAAU,QAAQ,CAAA,GAAI,WAAW;AAEhD,QAAI,CAACA,cAAmB,MAAM,KAAA,CAAM,GAAG;AACtC,aAAO,IAAI,cAAc,wBAAwB,yCAAyC;AAAA,IAC3F;AAEA,UAAM,iBAAiB,MAAM,KAAK,eAAe,mBAAmB,WAAW,KAAK;AACpF,QAAI,mBAAmB,MAAM;AAC5B,YAAM,eAAe,OAAO,MAAM,oBAAoB,OAAO,MAAM;AACnE,YAAM,oBAAyD,eAC3D,eAAe,gBAAgB,YAAY,mBAC5C;AACH,aAAO,IAAI;AAAA,QACV;AAAA,QACA,mBAAmB,KAAK;AAAA,QACxB,oBAAoB,EAAE,sBAAsB;AAAA,MAAA;AAAA,IAE9C;AAEA,UAAM,gBAAgB,SAAS,SAAA;AAE/B,QAAI,eAAe;AAClB,YAAM,uBAAuB,MAAM,KAAK,0BAA0B,OAAO,eAAe,OAAO,UAAU,UAAU;AACnH,UAAI,CAAC,qBAAqB,IAAI;AAC7B,eAAO;AAAA,MACR;AAAA,IACD;AAKA,UAAM,4BAA4B,OAAO,OAAO;AAEhD,UAAM,SAAS,MAAM,UAAU,YAAY,OAAM,OAAM;AACtD,YAAM,aAAa,MAAM,GAAG,WAAW,QAAQ,IAAI,sBAAsB,CAAC,GAAG,OAAO,WAAW,MAAM,CAAC,CAAC;AACvG,aAAO,MAAM,GAAG,WAAW,QAAQ,IAAI,oBAAoB,EAAE,YAAY,OAAO,UAAU,0BAAA,CAA2B,CAAC;AAAA,IACvH,CAAC;AACD,WAAO,IAAI,WAAW,IAAI,aAAa,QAAQ,yBAAyB,CAAC;AAAA,EAC1E;AACD;AAEO,MAAM,aAAa;AAAA,EACzB,YACiB,QACA,4BAAqC,OACpD;AAFe,SAAA,SAAA;AACA,SAAA,4BAAA;AAAA,EACd;AACJ;"}

package/dist/production/src/model/service/apiKey/ApiKeyManager.cjs

@@ -12,20 +12,30 @@ const ApiKey = require("../../type/ApiKey.cjs");
 const assert = require("node:assert");
 const ApiKeyQuery = require("../../queries/apiKey/ApiKeyQuery.cjs");
 const ConfigurationQuery = require("../../queries/configuration/ConfigurationQuery.cjs");
+const IdentityQuery = require("../../queries/identity/IdentityQuery.cjs");
 require("../../authorization/PermissionActions.cjs");
 require("@contember/authorization");
 require("../../authorization/PermissionContext.cjs");
 require("../../authorization/PermissionsFactory.cjs");
 require("@contember/schema");
 const interval = require("../../utils/interval.cjs");
+const UnpersistedApiKeyManager = require("./UnpersistedApiKeyManager.cjs");
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField = (obj, key, value) => __defNormalProp(obj, key + "", value);
 class ApiKeyManager {
-  constructor(apiKeyService) {
+  constructor(apiKeyService, authPolicyResolver, authLogService, unpersistedApiKeyManager = new UnpersistedApiKeyManager.UnpersistedApiKeyManager(), idpSessionRevalidator) {
     this.apiKeyService = apiKeyService;
+    this.authPolicyResolver = authPolicyResolver;
+    this.authLogService = authLogService;
+    this.unpersistedApiKeyManager = unpersistedApiKeyManager;
+    this.idpSessionRevalidator = idpSessionRevalidator;
   }
-  async verifyAndProlong(dbContext, readDbContext, token) {
+  async verifyAndProlong(dbContext, readDbContext, token, requestInfo, forwardedInfo) {
+    const unpersistedResult = this.unpersistedApiKeyManager.verify(token);
+    if (unpersistedResult !== null) {
+      return new Response.ResponseOk(unpersistedResult);
+    }
     const apiKeyRow = await readDbContext.queryHandler.fetch(new ApiKeyQuery.ApiKeyByTokenQuery(token));
     if (apiKeyRow === null) {
       return new Response.ResponseError("not_found", "API key was not found");
@@ -36,31 +46,133 @@ class ApiKeyManager {
         `API key was disabled at ${apiKeyRow.disabled_at.toISOString()}`
       );
     }
-    const now = /* @__PURE__ */ new Date();
+    const now = dbContext.providers.now();
     if (apiKeyRow.expires_at !== null && apiKeyRow.expires_at <= now) {
       return new Response.ResponseError("disabled", `API key expired at ${apiKeyRow.expires_at.toISOString()}`);
     }
+    if (apiKeyRow.max_expires_at !== null && apiKeyRow.max_expires_at <= now) {
+      await dbContext.commandBus.execute(new DisableApiKeyCommand.DisableApiKeyCommand(apiKeyRow.id));
+      return new Response.ResponseError(
+        "disabled",
+        `API key reached its maximum lifetime at ${apiKeyRow.max_expires_at.toISOString()}`
+      );
+    }
+    if (apiKeyRow.idle_timeout !== null && apiKeyRow.last_used_at !== null) {
+      const idleMs = interval.intervalToSeconds(apiKeyRow.idle_timeout) * 1e3;
+      if (now.getTime() - apiKeyRow.last_used_at.getTime() > idleMs + ProlongApiKeyCommand.PROLONG_THROTTLE_MS) {
+        await dbContext.commandBus.execute(new DisableApiKeyCommand.DisableApiKeyCommand(apiKeyRow.id));
+        try {
+          await this.authLogService.logSessionEvent(dbContext, {
+            type: "session_expired_idle",
+            identityId: apiKeyRow.identity_id,
+            personId: apiKeyRow.person_id,
+            ipAddress: requestInfo?.ip,
+            userAgent: requestInfo?.userAgent,
+            success: false,
+            eventData: {
+              lastUsedAt: apiKeyRow.last_used_at?.toISOString() ?? null,
+              idleTimeout: String(apiKeyRow.idle_timeout)
+            }
+          });
+        } catch {
+        }
+        return new Response.ResponseError(
+          "disabled",
+          `API key was idle since ${apiKeyRow.last_used_at.toISOString()} and exceeded the idle timeout`
+        );
+      }
+    }
+    const effectiveInfo = apiKeyRow.trust_forwarded_info && forwardedInfo ? {
+      ip: forwardedInfo.ip ?? requestInfo?.ip,
+      userAgent: forwardedInfo.userAgent ?? requestInfo?.userAgent
+    } : requestInfo;
+    if (this.idpSessionRevalidator) {
+      const outcome = await this.idpSessionRevalidator.revalidate(dbContext, readDbContext, apiKeyRow, effectiveInfo);
+      if (outcome === "revoked") {
+        return new Response.ResponseError("disabled", "IdP session was revoked");
+      }
+    }
     setImmediate(async () => {
       await dbContext.commandBus.execute(
         new ProlongApiKeyCommand.ProlongApiKeyCommand(
           apiKeyRow.id,
           apiKeyRow.type,
           apiKeyRow.expiration,
-          apiKeyRow.expires_at
+          apiKeyRow.expires_at,
+          effectiveInfo,
+          {
+            lastIp: apiKeyRow.last_ip,
+            lastUserAgent: apiKeyRow.last_user_agent,
+            lastUsedAt: apiKeyRow.last_used_at
+          },
+          apiKeyRow.max_expires_at
         )
       );
     });
-    return new Response.ResponseOk(new VerifyResult(apiKeyRow.identity_id, apiKeyRow.id, apiKeyRow.roles, apiKeyRow.person_id));
+    return new Response.ResponseOk(
+      new VerifyResult(
+        apiKeyRow.identity_id,
+        apiKeyRow.id,
+        apiKeyRow.roles,
+        apiKeyRow.person_id,
+        apiKeyRow.trust_forwarded_info
+      )
+    );
   }
-  async createSessionApiKey(dbContext, identityId, expiration) {
-    const config = await dbContext.queryHandler.fetch(new ConfigurationQuery.ConfigurationQuery());
-    const expirationResolved = expiration ?? interval.intervalToSeconds(config.login.defaultTokenExpiration) / 60;
-    const expirationCapped = config.login.maxTokenExpiration ? Math.min(expirationResolved, interval.intervalToSeconds(config.login.maxTokenExpiration) / 60) : expirationResolved;
-    const command = new CreateApiKeyCommand.CreateApiKeyCommand({ type: ApiKey.ApiKey.Type.SESSION, identityId, expiration: expirationCapped });
-    const token = (await dbContext.commandBus.execute(command)).token;
-    assert(token !== void 0);
+  async createSessionApiKey(dbContext, identityId, expiration, requestInfo, trustForwardedInfo) {
+    const { token } = await this.createSessionApiKeyWithId(dbContext, identityId, expiration, requestInfo, trustForwardedInfo);
     return token;
   }
+  /**
+   * Like {@link createSessionApiKey} but also returns the api_key id — needed when the
+   * caller has to bind another row to the session (e.g. an `idp_session` for IdP
+   * re-validation).
+   */
+  async createSessionApiKeyWithId(dbContext, identityId, expiration, requestInfo, trustForwardedInfo) {
+    const config = await dbContext.queryHandler.fetch(new ConfigurationQuery.ConfigurationQuery(dbContext.providers));
+    const [identityRow] = await dbContext.queryHandler.fetch(new IdentityQuery.IdentityQuery([identityId]));
+    const globalRoles = identityRow?.roles ?? [];
+    const policy = await this.authPolicyResolver.resolveForIdentity(dbContext, identityId, globalRoles);
+    const defaultExpirationMinutes = interval.intervalToSeconds(config.login.defaultTokenExpiration) / 60;
+    const requestedMinutes = policy.rememberMeAllowed === false ? defaultExpirationMinutes : expiration ?? defaultExpirationMinutes;
+    let expirationCapped = config.login.maxTokenExpiration ? Math.min(requestedMinutes, interval.intervalToSeconds(config.login.maxTokenExpiration) / 60) : requestedMinutes;
+    if (policy.tokenExpiration) {
+      expirationCapped = Math.min(expirationCapped, interval.intervalToSeconds(policy.tokenExpiration) / 60);
+    }
+    const issuedAt = dbContext.providers.now();
+    const maxExpiresAt = policy.tokenExpiration ? new Date(issuedAt.getTime() + interval.intervalToSeconds(policy.tokenExpiration) * 1e3) : null;
+    const command = new CreateApiKeyCommand.CreateApiKeyCommand({
+      type: ApiKey.ApiKey.Type.SESSION,
+      identityId,
+      expiration: expirationCapped,
+      requestInfo,
+      trustForwardedInfo,
+      idleTimeout: policy.idleTimeout ? interval.intervalToPostgres(policy.idleTimeout) : null,
+      maxExpiresAt
+    });
+    const { id, token } = await dbContext.commandBus.execute(command);
+    assert(token !== void 0);
+    const policyApplied = policy.mfaRequired === true || policy.tokenExpiration !== null || policy.idleTimeout !== null || policy.rememberMeAllowed !== null;
+    if (policyApplied) {
+      try {
+        await this.authLogService.logSessionEvent(dbContext, {
+          type: "session_policy_applied",
+          identityId,
+          ipAddress: requestInfo?.ip,
+          userAgent: requestInfo?.userAgent,
+          success: true,
+          eventData: {
+            tokenExpiration: policy.tokenExpiration ? interval.intervalToPostgres(policy.tokenExpiration) : null,
+            idleTimeout: policy.idleTimeout ? interval.intervalToPostgres(policy.idleTimeout) : null,
+            rememberMeAllowed: policy.rememberMeAllowed,
+            mfaRequired: policy.mfaRequired
+          }
+        });
+      } catch {
+      }
+    }
+    return { id, token };
+  }
   async findApiKey(dbContext, apiKeyId) {
     return await dbContext.queryHandler.fetch(
       new ApiKeyQuery.ApiKeyByIdQuery(apiKeyId)
@@ -75,23 +187,24 @@ class ApiKeyManager {
   async disableIdentityApiKeys(dbContext, identityId) {
     await dbContext.commandBus.execute(new DisableIdentityApiKeysCommand.DisableIdentityApiKeysCommand(identityId));
   }
-  async createGlobalPermanentApiKey(dbContext, description, roles, tokenHash) {
+  async createGlobalPermanentApiKey(dbContext, description, roles, tokenHash, trustForwardedInfo) {
     return await dbContext.transaction(async (db) => {
-      return await this.apiKeyService.createPermanentApiKey(db, description, roles, tokenHash);
+      return await this.apiKeyService.createPermanentApiKey(db, description, roles, tokenHash, trustForwardedInfo);
     });
   }
-  async createProjectPermanentApiKey(dbContext, projectId, memberships, description, tokenHash) {
+  async createProjectPermanentApiKey(dbContext, projectId, memberships, description, tokenHash, trustForwardedInfo) {
     return await dbContext.transaction(async (db) => {
-      return await this.apiKeyService.createProjectPermanentApiKey(db, projectId, memberships, description, tokenHash);
+      return await this.apiKeyService.createProjectPermanentApiKey(db, projectId, memberships, description, tokenHash, trustForwardedInfo);
     });
   }
 }
 class VerifyResult {
-  constructor(identityId, apiKeyId, roles, personId) {
+  constructor(identityId, apiKeyId, roles, personId, trustForwardedInfo = false) {
     this.identityId = identityId;
     this.apiKeyId = apiKeyId;
     this.roles = roles;
     this.personId = personId;
+    this.trustForwardedInfo = trustForwardedInfo;
     __publicField(this, "valid", true);
   }
 }

package/dist/production/src/model/service/apiKey/ApiKeyManager.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"ApiKeyManager.cjs","sources":["../../../../../../../packages/engine-tenant-api/src/model/service/apiKey/ApiKeyManager.ts"],"sourcesContent":["import {\n\tCreateApiKeyCommand,\n\tDisableApiKeyCommand,\n\tDisableIdentityApiKeysCommand,\n\tDisableOneOffApiKeyCommand,\n\tProlongApiKeyCommand,\n} from '../../commands'\nimport { ApiKey } from '../../type'\n\nimport { Response, ResponseError, ResponseOk } from '../../utils/Response'\nimport { DatabaseContext, TokenHash } from '../../utils'\nimport { ApiKeyService, CreateApiKeyResponse } from './ApiKeyService'\nimport assert from 'node:assert'\nimport { Acl } from '@contember/schema'\nimport { ApiKeyByIdQuery, ApiKeyByTokenQuery, ApiKeyRow, ConfigurationQuery } from '../../queries'\nimport PostgresInterval from 'postgres-interval'\nimport { Config } from '../../type/Config'\nimport { intervalToSeconds } from '../../utils/interval'\n\nexport class ApiKeyManager {\n\tconstructor(\n\t\tprivate readonly apiKeyService: ApiKeyService,\n\t) {}\n\n\tasync verifyAndProlong(\n\t\tdbContext: DatabaseContext,\n\t\treadDbContext: DatabaseContext,\n\t\ttoken: string,\n\t): Promise<VerifyResponse> {\n\t\tconst apiKeyRow = await readDbContext.queryHandler.fetch(new ApiKeyByTokenQuery(token))\n\t\tif (apiKeyRow === null) {\n\t\t\treturn new ResponseError(VerifyErrorCode.NOT_FOUND, 'API key was not found')\n\t\t}\n\n\t\tif (apiKeyRow.disabled_at !== null) {\n\t\t\treturn new ResponseError(\n\t\t\t\tVerifyErrorCode.DISABLED,\n\t\t\t\t`API key was disabled at ${apiKeyRow.disabled_at.toISOString()}`,\n\t\t\t)\n\t\t}\n\n\t\tconst now = new Date()\n\t\tif (apiKeyRow.expires_at !== null && apiKeyRow.expires_at <= now) {\n\t\t\treturn new ResponseError(VerifyErrorCode.DISABLED, `API key expired at ${apiKeyRow.expires_at.toISOString()}`)\n\t\t}\n\n\t\tsetImmediate(async () => {\n\t\t\tawait dbContext.commandBus.execute(\n\t\t\t\tnew ProlongApiKeyCommand(\n\t\t\t\t\tapiKeyRow.id,\n\t\t\t\t\tapiKeyRow.type,\n\t\t\t\t\tapiKeyRow.expiration,\n\t\t\t\t\tapiKeyRow.expires_at,\n\t\t\t\t),\n\t\t\t)\n\t\t})\n\n\t\treturn new ResponseOk(new VerifyResult(apiKeyRow.identity_id, apiKeyRow.id, apiKeyRow.roles, apiKeyRow.person_id))\n\t}\n\n\tasync createSessionApiKey(dbContext: DatabaseContext, identityId: string, expiration?: number): Promise<string> {\n\t\tconst config = await dbContext.queryHandler.fetch(new ConfigurationQuery())\n\t\tconst expirationResolved = expiration ?? (intervalToSeconds(config.login.defaultTokenExpiration) / 60)\n\t\tconst expirationCapped = config.login.maxTokenExpiration\n\t\t\t? Math.min(expirationResolved, intervalToSeconds(config.login.maxTokenExpiration) / 60)\n\t\t\t: expirationResolved\n\t\tconst command = new CreateApiKeyCommand({ type: ApiKey.Type.SESSION, identityId, expiration: expirationCapped })\n\t\tconst token = (await dbContext.commandBus.execute(command)).token\n\t\tassert(token !== undefined)\n\t\treturn token\n\t}\n\n\tasync findApiKey(dbContext: DatabaseContext, apiKeyId: string): Promise<ApiKeyRow | null> {\n\t\treturn await dbContext.queryHandler.fetch(\n\t\t\tnew ApiKeyByIdQuery(apiKeyId),\n\t\t)\n\t}\n\n\tasync disableOneOffApiKey(dbContext: DatabaseContext, apiKeyId: string): Promise<void> {\n\t\tawait dbContext.commandBus.execute(new DisableOneOffApiKeyCommand(apiKeyId))\n\t}\n\n\tasync disableApiKey(dbContext: DatabaseContext, apiKeyId: string): Promise<boolean> {\n\t\treturn await dbContext.commandBus.execute(new DisableApiKeyCommand(apiKeyId))\n\t}\n\n\tasync disableIdentityApiKeys(dbContext: DatabaseContext, identityId: string): Promise<void> {\n\t\tawait dbContext.commandBus.execute(new DisableIdentityApiKeysCommand(identityId))\n\t}\n\n\tasync createGlobalPermanentApiKey(\n\t\tdbContext: DatabaseContext,\n\t\tdescription: string,\n\t\troles: readonly string[],\n\t\ttokenHash?: TokenHash,\n\t): Promise<CreateApiKeyResponse> {\n\t\treturn await dbContext.transaction(async db => {\n\t\t\treturn await this.apiKeyService.createPermanentApiKey(db, description, roles, tokenHash)\n\t\t})\n\t}\n\n\tasync createProjectPermanentApiKey(\n\t\tdbContext: DatabaseContext,\n\t\tprojectId: string,\n\t\tmemberships: readonly Acl.Membership[],\n\t\tdescription: string,\n\t\ttokenHash?: TokenHash,\n\t): Promise<CreateApiKeyResponse> {\n\t\treturn await dbContext.transaction(async db => {\n\t\t\treturn await this.apiKeyService.createProjectPermanentApiKey(db, projectId, memberships, description, tokenHash)\n\t\t})\n\t}\n}\n\nexport type VerifyResponse = Response<VerifyResult, VerifyErrorCode>\n\nexport class VerifyResult {\n\treadonly valid = true\n\n\tconstructor(\n\t\tpublic readonly identityId: string,\n\t\tpublic readonly apiKeyId: string,\n\t\tpublic readonly roles: string[],\n\t\tpublic readonly personId: string | null,\n\t) {}\n}\n\nexport enum VerifyErrorCode {\n\tNOT_FOUND = 'not_found',\n\tDISABLED = 'disabled',\n\tEXPIRED = 'expired',\n\tNO_AUTH_HEADER = 'no_auth_header',\n\tINVALID_AUTH_HEADER = 'invalid_auth_header',\n}\n"],"names":["ApiKeyByTokenQuery","ResponseError","ProlongApiKeyCommand","ResponseOk","ConfigurationQuery","intervalToSeconds","CreateApiKeyCommand","ApiKey","ApiKeyByIdQuery","DisableOneOffApiKeyCommand","DisableApiKeyCommand","DisableIdentityApiKeysCommand","VerifyErrorCode"],"mappings":"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"}
+{"version":3,"file":"ApiKeyManager.cjs","sources":["../../../../../../../packages/engine-tenant-api/src/model/service/apiKey/ApiKeyManager.ts"],"sourcesContent":["import {\n\tApiKeyRequestInfo,\n\tCreateApiKeyCommand,\n\tDisableApiKeyCommand,\n\tDisableIdentityApiKeysCommand,\n\tDisableOneOffApiKeyCommand,\n\tPROLONG_THROTTLE_MS,\n\tProlongApiKeyCommand,\n} from '../../commands/index.js'\nimport { ApiKey } from '../../type/index.js'\n\nimport { Response, ResponseError, ResponseOk } from '../../utils/Response.js'\nimport { DatabaseContext, TokenHash } from '../../utils/index.js'\nimport { ApiKeyService, CreateApiKeyResponse } from './ApiKeyService.js'\nimport assert from 'node:assert'\nimport { Acl } from '@contember/schema'\nimport { ApiKeyByIdQuery, ApiKeyByTokenQuery, ApiKeyRow, ConfigurationQuery, IdentityQuery } from '../../queries/index.js'\nimport PostgresInterval from 'postgres-interval'\nimport { Config } from '../../type/Config.js'\nimport { intervalToPostgres, intervalToSeconds } from '../../utils/interval.js'\nimport { AuthPolicyResolver } from '../AuthPolicyResolver.js'\nimport { AuthLogService } from '../AuthLogService.js'\nimport { IdpSessionRevalidator } from '../idp/IdpSessionRevalidator.js'\nimport { UnpersistedApiKeyManager } from './UnpersistedApiKeyManager.js'\n\nexport class ApiKeyManager {\n\tconstructor(\n\t\tprivate readonly apiKeyService: ApiKeyService,\n\t\tprivate readonly authPolicyResolver: AuthPolicyResolver,\n\t\tprivate readonly authLogService: AuthLogService,\n\t\tprivate readonly unpersistedApiKeyManager: UnpersistedApiKeyManager = new UnpersistedApiKeyManager(),\n\t\tprivate readonly idpSessionRevalidator?: IdpSessionRevalidator,\n\t) {}\n\n\tasync verifyAndProlong(\n\t\tdbContext: DatabaseContext,\n\t\treadDbContext: DatabaseContext,\n\t\ttoken: string,\n\t\trequestInfo?: ApiKeyRequestInfo,\n\t\tforwardedInfo?: ApiKeyRequestInfo,\n\t): Promise<VerifyResponse> {\n\t\tconst unpersistedResult = this.unpersistedApiKeyManager.verify(token)\n\t\tif (unpersistedResult !== null) {\n\t\t\t// Configured (unpersisted) root token: no DB row to prolong/track.\n\t\t\treturn new ResponseOk(unpersistedResult)\n\t\t}\n\n\t\tconst apiKeyRow = await readDbContext.queryHandler.fetch(new ApiKeyByTokenQuery(token))\n\t\tif (apiKeyRow === null) {\n\t\t\treturn new ResponseError(VerifyErrorCode.NOT_FOUND, 'API key was not found')\n\t\t}\n\n\t\tif (apiKeyRow.disabled_at !== null) {\n\t\t\treturn new ResponseError(\n\t\t\t\tVerifyErrorCode.DISABLED,\n\t\t\t\t`API key was disabled at ${apiKeyRow.disabled_at.toISOString()}`,\n\t\t\t)\n\t\t}\n\n\t\t// Single injectable clock for all session-policy time math (matches issuance,\n\t\t// which uses providers.now()), so the A19 idle/max logic is deterministically testable.\n\t\tconst now = dbContext.providers.now()\n\t\tif (apiKeyRow.expires_at !== null && apiKeyRow.expires_at <= now) {\n\t\t\treturn new ResponseError(VerifyErrorCode.DISABLED, `API key expired at ${apiKeyRow.expires_at.toISOString()}`)\n\t\t}\n\n\t\t// A19: absolute hard cap (defensive — the prolong clamp should already keep\n\t\t// expires_at <= max_expires_at, but enforce it here regardless).\n\t\tif (apiKeyRow.max_expires_at !== null && apiKeyRow.max_expires_at <= now) {\n\t\t\tawait dbContext.commandBus.execute(new DisableApiKeyCommand(apiKeyRow.id))\n\t\t\treturn new ResponseError(\n\t\t\t\tVerifyErrorCode.DISABLED,\n\t\t\t\t`API key reached its maximum lifetime at ${apiKeyRow.max_expires_at.toISOString()}`,\n\t\t\t)\n\t\t}\n\n\t\t// A19: idle timeout. Reject + disable when the session has been idle longer\n\t\t// than the policy's idle_timeout. A null idle_timeout (today's default) or a\n\t\t// never-used key (last_used_at null) are never idle-expired.\n\t\tif (apiKeyRow.idle_timeout !== null && apiKeyRow.last_used_at !== null) {\n\t\t\tconst idleMs = intervalToSeconds(apiKeyRow.idle_timeout) * 1000\n\t\t\t// last_used_at is written at most once per PROLONG_THROTTLE_MS (tracking is\n\t\t\t// throttled), so it can legitimately lag a continuously-active session by up\n\t\t\t// to that window. Add the throttle as slack so a small idle_timeout can't\n\t\t\t// idle-expire a session that is actually in use.\n\t\t\tif (now.getTime() - apiKeyRow.last_used_at.getTime() > idleMs + PROLONG_THROTTLE_MS) {\n\t\t\t\tawait dbContext.commandBus.execute(new DisableApiKeyCommand(apiKeyRow.id))\n\t\t\t\ttry {\n\t\t\t\t\tawait this.authLogService.logSessionEvent(dbContext, {\n\t\t\t\t\t\ttype: 'session_expired_idle',\n\t\t\t\t\t\tidentityId: apiKeyRow.identity_id,\n\t\t\t\t\t\tpersonId: apiKeyRow.person_id,\n\t\t\t\t\t\tipAddress: requestInfo?.ip,\n\t\t\t\t\t\tuserAgent: requestInfo?.userAgent,\n\t\t\t\t\t\tsuccess: false,\n\t\t\t\t\t\teventData: {\n\t\t\t\t\t\t\tlastUsedAt: apiKeyRow.last_used_at?.toISOString() ?? null,\n\t\t\t\t\t\t\tidleTimeout: String(apiKeyRow.idle_timeout),\n\t\t\t\t\t\t},\n\t\t\t\t\t})\n\t\t\t\t} catch {\n\t\t\t\t\t/* best-effort: auth path must stay resilient */\n\t\t\t\t}\n\t\t\t\treturn new ResponseError(\n\t\t\t\t\tVerifyErrorCode.DISABLED,\n\t\t\t\t\t`API key was idle since ${apiKeyRow.last_used_at.toISOString()} and exceeded the idle timeout`,\n\t\t\t\t)\n\t\t\t}\n\t\t}\n\n\t\tconst effectiveInfo: ApiKeyRequestInfo | undefined = apiKeyRow.trust_forwarded_info && forwardedInfo\n\t\t\t? {\n\t\t\t\tip: forwardedInfo.ip ?? requestInfo?.ip,\n\t\t\t\tuserAgent: forwardedInfo.userAgent ?? requestInfo?.userAgent,\n\t\t\t}\n\t\t\t: requestInfo\n\n\t\t// Re-validate IdP-backed sessions against their identity provider (A24). In the\n\t\t// default `background` mode this returns immediately and revalidates after the\n\t\t// response (revocation lands on the next request); in `blocking` mode it can revoke\n\t\t// the current request. No-op for password sessions and IdPs without revalidation.\n\t\t// `effectiveInfo` is passed so the audit entries record the originating request's IP/UA.\n\t\tif (this.idpSessionRevalidator) {\n\t\t\tconst outcome = await this.idpSessionRevalidator.revalidate(dbContext, readDbContext, apiKeyRow, effectiveInfo)\n\t\t\tif (outcome === 'revoked') {\n\t\t\t\treturn new ResponseError(VerifyErrorCode.DISABLED, 'IdP session was revoked')\n\t\t\t}\n\t\t}\n\n\t\tsetImmediate(async () => {\n\t\t\tawait dbContext.commandBus.execute(\n\t\t\t\tnew ProlongApiKeyCommand(\n\t\t\t\t\tapiKeyRow.id,\n\t\t\t\t\tapiKeyRow.type,\n\t\t\t\t\tapiKeyRow.expiration,\n\t\t\t\t\tapiKeyRow.expires_at,\n\t\t\t\t\teffectiveInfo,\n\t\t\t\t\t{\n\t\t\t\t\t\tlastIp: apiKeyRow.last_ip,\n\t\t\t\t\t\tlastUserAgent: apiKeyRow.last_user_agent,\n\t\t\t\t\t\tlastUsedAt: apiKeyRow.last_used_at,\n\t\t\t\t\t},\n\t\t\t\t\tapiKeyRow.max_expires_at,\n\t\t\t\t),\n\t\t\t)\n\t\t})\n\n\t\treturn new ResponseOk(\n\t\t\tnew VerifyResult(\n\t\t\t\tapiKeyRow.identity_id,\n\t\t\t\tapiKeyRow.id,\n\t\t\t\tapiKeyRow.roles,\n\t\t\t\tapiKeyRow.person_id,\n\t\t\t\tapiKeyRow.trust_forwarded_info,\n\t\t\t),\n\t\t)\n\t}\n\n\tasync createSessionApiKey(\n\t\tdbContext: DatabaseContext,\n\t\tidentityId: string,\n\t\texpiration?: number,\n\t\trequestInfo?: ApiKeyRequestInfo,\n\t\ttrustForwardedInfo?: boolean,\n\t): Promise<string> {\n\t\tconst { token } = await this.createSessionApiKeyWithId(dbContext, identityId, expiration, requestInfo, trustForwardedInfo)\n\t\treturn token\n\t}\n\n\t/**\n\t * Like {@link createSessionApiKey} but also returns the api_key id — needed when the\n\t * caller has to bind another row to the session (e.g. an `idp_session` for IdP\n\t * re-validation).\n\t */\n\tasync createSessionApiKeyWithId(\n\t\tdbContext: DatabaseContext,\n\t\tidentityId: string,\n\t\texpiration?: number,\n\t\trequestInfo?: ApiKeyRequestInfo,\n\t\ttrustForwardedInfo?: boolean,\n\t): Promise<{ id: string; token: string }> {\n\t\tconst config = await dbContext.queryHandler.fetch(new ConfigurationQuery(dbContext.providers))\n\n\t\t// A19: snapshot the effective session policy onto the api_key at sign-in.\n\t\t// With no matching policy, every field is null/baseline and the result is\n\t\t// byte-for-byte today's behavior.\n\t\tconst [identityRow] = await dbContext.queryHandler.fetch(new IdentityQuery([identityId]))\n\t\tconst globalRoles = identityRow?.roles ?? []\n\t\tconst policy = await this.authPolicyResolver.resolveForIdentity(dbContext, identityId, globalRoles)\n\n\t\tconst defaultExpirationMinutes = intervalToSeconds(config.login.defaultTokenExpiration) / 60\n\t\t// remember_me_allowed === false: ignore a client-supplied longer lifetime and\n\t\t// force the default. (true/null leave the requested expiration untouched.)\n\t\tconst requestedMinutes = policy.rememberMeAllowed === false\n\t\t\t? defaultExpirationMinutes\n\t\t\t: (expiration ?? defaultExpirationMinutes)\n\n\t\t// Cap by maxTokenExpiration (existing behavior) AND by the policy's\n\t\t// tokenExpiration (A19) — strictest wins.\n\t\tlet expirationCapped = config.login.maxTokenExpiration\n\t\t\t? Math.min(requestedMinutes, intervalToSeconds(config.login.maxTokenExpiration) / 60)\n\t\t\t: requestedMinutes\n\t\tif (policy.tokenExpiration) {\n\t\t\texpirationCapped = Math.min(expirationCapped, intervalToSeconds(policy.tokenExpiration) / 60)\n\t\t}\n\n\t\t// Absolute hard cap: issued_at + policy.tokenExpiration. NULL = uncapped\n\t\t// sliding window (today's behavior).\n\t\tconst issuedAt = dbContext.providers.now()\n\t\tconst maxExpiresAt = policy.tokenExpiration\n\t\t\t? new Date(issuedAt.getTime() + intervalToSeconds(policy.tokenExpiration) * 1000)\n\t\t\t: null\n\n\t\tconst command = new CreateApiKeyCommand({\n\t\t\ttype: ApiKey.Type.SESSION,\n\t\t\tidentityId,\n\t\t\texpiration: expirationCapped,\n\t\t\trequestInfo,\n\t\t\ttrustForwardedInfo,\n\t\t\tidleTimeout: policy.idleTimeout ? intervalToPostgres(policy.idleTimeout) : null,\n\t\t\tmaxExpiresAt,\n\t\t})\n\t\tconst { id, token } = await dbContext.commandBus.execute(command)\n\t\tassert(token !== undefined)\n\n\t\t// A19: audit only when a policy is actually in effect. With zero auth_policy\n\t\t// rows the resolved policy is inert and no extra insert happens.\n\t\tconst policyApplied = policy.mfaRequired === true\n\t\t\t|| policy.tokenExpiration !== null\n\t\t\t|| policy.idleTimeout !== null\n\t\t\t|| policy.rememberMeAllowed !== null\n\t\tif (policyApplied) {\n\t\t\ttry {\n\t\t\t\tawait this.authLogService.logSessionEvent(dbContext, {\n\t\t\t\t\ttype: 'session_policy_applied',\n\t\t\t\t\tidentityId,\n\t\t\t\t\tipAddress: requestInfo?.ip,\n\t\t\t\t\tuserAgent: requestInfo?.userAgent,\n\t\t\t\t\tsuccess: true,\n\t\t\t\t\teventData: {\n\t\t\t\t\t\ttokenExpiration: policy.tokenExpiration ? intervalToPostgres(policy.tokenExpiration) : null,\n\t\t\t\t\t\tidleTimeout: policy.idleTimeout ? intervalToPostgres(policy.idleTimeout) : null,\n\t\t\t\t\t\trememberMeAllowed: policy.rememberMeAllowed,\n\t\t\t\t\t\tmfaRequired: policy.mfaRequired,\n\t\t\t\t\t},\n\t\t\t\t})\n\t\t\t} catch {\n\t\t\t\t/* best-effort: sign-in must not break on an audit failure */\n\t\t\t}\n\t\t}\n\n\t\treturn { id, token }\n\t}\n\n\tasync findApiKey(dbContext: DatabaseContext, apiKeyId: string): Promise<ApiKeyRow | null> {\n\t\treturn await dbContext.queryHandler.fetch(\n\t\t\tnew ApiKeyByIdQuery(apiKeyId),\n\t\t)\n\t}\n\n\tasync disableOneOffApiKey(dbContext: DatabaseContext, apiKeyId: string): Promise<void> {\n\t\tawait dbContext.commandBus.execute(new DisableOneOffApiKeyCommand(apiKeyId))\n\t}\n\n\tasync disableApiKey(dbContext: DatabaseContext, apiKeyId: string): Promise<boolean> {\n\t\treturn await dbContext.commandBus.execute(new DisableApiKeyCommand(apiKeyId))\n\t}\n\n\tasync disableIdentityApiKeys(dbContext: DatabaseContext, identityId: string): Promise<void> {\n\t\tawait dbContext.commandBus.execute(new DisableIdentityApiKeysCommand(identityId))\n\t}\n\n\tasync createGlobalPermanentApiKey(\n\t\tdbContext: DatabaseContext,\n\t\tdescription: string,\n\t\troles: readonly string[],\n\t\ttokenHash?: TokenHash,\n\t\ttrustForwardedInfo?: boolean,\n\t): Promise<CreateApiKeyResponse> {\n\t\treturn await dbContext.transaction(async db => {\n\t\t\treturn await this.apiKeyService.createPermanentApiKey(db, description, roles, tokenHash, trustForwardedInfo)\n\t\t})\n\t}\n\n\tasync createProjectPermanentApiKey(\n\t\tdbContext: DatabaseContext,\n\t\tprojectId: string,\n\t\tmemberships: readonly Acl.Membership[],\n\t\tdescription: string,\n\t\ttokenHash?: TokenHash,\n\t\ttrustForwardedInfo?: boolean,\n\t): Promise<CreateApiKeyResponse> {\n\t\treturn await dbContext.transaction(async db => {\n\t\t\treturn await this.apiKeyService.createProjectPermanentApiKey(db, projectId, memberships, description, tokenHash, trustForwardedInfo)\n\t\t})\n\t}\n}\n\nexport type VerifyResponse = Response<VerifyResult, VerifyErrorCode>\n\nexport class VerifyResult {\n\treadonly valid = true\n\n\tconstructor(\n\t\tpublic readonly identityId: string,\n\t\tpublic readonly apiKeyId: string,\n\t\tpublic readonly roles: string[],\n\t\tpublic readonly personId: string | null,\n\t\tpublic readonly trustForwardedInfo: boolean = false,\n\t) {}\n}\n\nexport enum VerifyErrorCode {\n\tNOT_FOUND = 'not_found',\n\tDISABLED = 'disabled',\n\tEXPIRED = 'expired',\n\tNO_AUTH_HEADER = 'no_auth_header',\n\tINVALID_AUTH_HEADER = 'invalid_auth_header',\n}\n"],"names":["UnpersistedApiKeyManager","ResponseOk","ApiKeyByTokenQuery","ResponseError","DisableApiKeyCommand","intervalToSeconds","PROLONG_THROTTLE_MS","ProlongApiKeyCommand","ConfigurationQuery","IdentityQuery","CreateApiKeyCommand","ApiKey","intervalToPostgres","ApiKeyByIdQuery","DisableOneOffApiKeyCommand","DisableIdentityApiKeysCommand","VerifyErrorCode"],"mappings":"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"}

package/dist/production/src/model/service/apiKey/ApiKeyManager.js

@@ -2,28 +2,38 @@ import { CreateApiKeyCommand } from "../../commands/apiKey/CreateApiKeyCommand.j
 import { DisableApiKeyCommand } from "../../commands/apiKey/DisableApiKeyCommand.js";
 import { DisableIdentityApiKeysCommand } from "../../commands/apiKey/DisableIdentityApiKeysCommand.js";
 import { DisableOneOffApiKeyCommand } from "../../commands/apiKey/DisableOneOffApiKeyCommand.js";
-import { ProlongApiKeyCommand } from "../../commands/apiKey/ProlongApiKeyCommand.js";
+import { PROLONG_THROTTLE_MS, ProlongApiKeyCommand } from "../../commands/apiKey/ProlongApiKeyCommand.js";
 import "@contember/database";
-import { ResponseError, ResponseOk } from "../../utils/Response.js";
+import { ResponseOk, ResponseError } from "../../utils/Response.js";
 import "node:crypto";
 import { ApiKey } from "../../type/ApiKey.js";
 import assert from "node:assert";
 import { ApiKeyByTokenQuery, ApiKeyByIdQuery } from "../../queries/apiKey/ApiKeyQuery.js";
 import { ConfigurationQuery } from "../../queries/configuration/ConfigurationQuery.js";
+import { IdentityQuery } from "../../queries/identity/IdentityQuery.js";
 import "../../authorization/PermissionActions.js";
 import "@contember/authorization";
 import "../../authorization/PermissionContext.js";
 import "../../authorization/PermissionsFactory.js";
 import "@contember/schema";
-import { intervalToSeconds } from "../../utils/interval.js";
+import { intervalToSeconds, intervalToPostgres } from "../../utils/interval.js";
+import { UnpersistedApiKeyManager } from "./UnpersistedApiKeyManager.js";
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField = (obj, key, value) => __defNormalProp(obj, key + "", value);
 class ApiKeyManager {
-  constructor(apiKeyService) {
+  constructor(apiKeyService, authPolicyResolver, authLogService, unpersistedApiKeyManager = new UnpersistedApiKeyManager(), idpSessionRevalidator) {
     this.apiKeyService = apiKeyService;
+    this.authPolicyResolver = authPolicyResolver;
+    this.authLogService = authLogService;
+    this.unpersistedApiKeyManager = unpersistedApiKeyManager;
+    this.idpSessionRevalidator = idpSessionRevalidator;
   }
-  async verifyAndProlong(dbContext, readDbContext, token) {
+  async verifyAndProlong(dbContext, readDbContext, token, requestInfo, forwardedInfo) {
+    const unpersistedResult = this.unpersistedApiKeyManager.verify(token);
+    if (unpersistedResult !== null) {
+      return new ResponseOk(unpersistedResult);
+    }
     const apiKeyRow = await readDbContext.queryHandler.fetch(new ApiKeyByTokenQuery(token));
     if (apiKeyRow === null) {
       return new ResponseError("not_found", "API key was not found");
@@ -34,31 +44,133 @@ class ApiKeyManager {
         `API key was disabled at ${apiKeyRow.disabled_at.toISOString()}`
       );
     }
-    const now = /* @__PURE__ */ new Date();
+    const now = dbContext.providers.now();
     if (apiKeyRow.expires_at !== null && apiKeyRow.expires_at <= now) {
       return new ResponseError("disabled", `API key expired at ${apiKeyRow.expires_at.toISOString()}`);
     }
+    if (apiKeyRow.max_expires_at !== null && apiKeyRow.max_expires_at <= now) {
+      await dbContext.commandBus.execute(new DisableApiKeyCommand(apiKeyRow.id));
+      return new ResponseError(
+        "disabled",
+        `API key reached its maximum lifetime at ${apiKeyRow.max_expires_at.toISOString()}`
+      );
+    }
+    if (apiKeyRow.idle_timeout !== null && apiKeyRow.last_used_at !== null) {
+      const idleMs = intervalToSeconds(apiKeyRow.idle_timeout) * 1e3;
+      if (now.getTime() - apiKeyRow.last_used_at.getTime() > idleMs + PROLONG_THROTTLE_MS) {
+        await dbContext.commandBus.execute(new DisableApiKeyCommand(apiKeyRow.id));
+        try {
+          await this.authLogService.logSessionEvent(dbContext, {
+            type: "session_expired_idle",
+            identityId: apiKeyRow.identity_id,
+            personId: apiKeyRow.person_id,
+            ipAddress: requestInfo?.ip,
+            userAgent: requestInfo?.userAgent,
+            success: false,
+            eventData: {
+              lastUsedAt: apiKeyRow.last_used_at?.toISOString() ?? null,
+              idleTimeout: String(apiKeyRow.idle_timeout)
+            }
+          });
+        } catch {
+        }
+        return new ResponseError(
+          "disabled",
+          `API key was idle since ${apiKeyRow.last_used_at.toISOString()} and exceeded the idle timeout`
+        );
+      }
+    }
+    const effectiveInfo = apiKeyRow.trust_forwarded_info && forwardedInfo ? {
+      ip: forwardedInfo.ip ?? requestInfo?.ip,
+      userAgent: forwardedInfo.userAgent ?? requestInfo?.userAgent
+    } : requestInfo;
+    if (this.idpSessionRevalidator) {
+      const outcome = await this.idpSessionRevalidator.revalidate(dbContext, readDbContext, apiKeyRow, effectiveInfo);
+      if (outcome === "revoked") {
+        return new ResponseError("disabled", "IdP session was revoked");
+      }
+    }
     setImmediate(async () => {
       await dbContext.commandBus.execute(
         new ProlongApiKeyCommand(
           apiKeyRow.id,
           apiKeyRow.type,
           apiKeyRow.expiration,
-          apiKeyRow.expires_at
+          apiKeyRow.expires_at,
+          effectiveInfo,
+          {
+            lastIp: apiKeyRow.last_ip,
+            lastUserAgent: apiKeyRow.last_user_agent,
+            lastUsedAt: apiKeyRow.last_used_at
+          },
+          apiKeyRow.max_expires_at
         )
       );
     });
-    return new ResponseOk(new VerifyResult(apiKeyRow.identity_id, apiKeyRow.id, apiKeyRow.roles, apiKeyRow.person_id));
+    return new ResponseOk(
+      new VerifyResult(
+        apiKeyRow.identity_id,
+        apiKeyRow.id,
+        apiKeyRow.roles,
+        apiKeyRow.person_id,
+        apiKeyRow.trust_forwarded_info
+      )
+    );
   }
-  async createSessionApiKey(dbContext, identityId, expiration) {
-    const config = await dbContext.queryHandler.fetch(new ConfigurationQuery());
-    const expirationResolved = expiration ?? intervalToSeconds(config.login.defaultTokenExpiration) / 60;
-    const expirationCapped = config.login.maxTokenExpiration ? Math.min(expirationResolved, intervalToSeconds(config.login.maxTokenExpiration) / 60) : expirationResolved;
-    const command = new CreateApiKeyCommand({ type: ApiKey.Type.SESSION, identityId, expiration: expirationCapped });
-    const token = (await dbContext.commandBus.execute(command)).token;
-    assert(token !== void 0);
+  async createSessionApiKey(dbContext, identityId, expiration, requestInfo, trustForwardedInfo) {
+    const { token } = await this.createSessionApiKeyWithId(dbContext, identityId, expiration, requestInfo, trustForwardedInfo);
     return token;
   }
+  /**
+   * Like {@link createSessionApiKey} but also returns the api_key id — needed when the
+   * caller has to bind another row to the session (e.g. an `idp_session` for IdP
+   * re-validation).
+   */
+  async createSessionApiKeyWithId(dbContext, identityId, expiration, requestInfo, trustForwardedInfo) {
+    const config = await dbContext.queryHandler.fetch(new ConfigurationQuery(dbContext.providers));
+    const [identityRow] = await dbContext.queryHandler.fetch(new IdentityQuery([identityId]));
+    const globalRoles = identityRow?.roles ?? [];
+    const policy = await this.authPolicyResolver.resolveForIdentity(dbContext, identityId, globalRoles);
+    const defaultExpirationMinutes = intervalToSeconds(config.login.defaultTokenExpiration) / 60;
+    const requestedMinutes = policy.rememberMeAllowed === false ? defaultExpirationMinutes : expiration ?? defaultExpirationMinutes;
+    let expirationCapped = config.login.maxTokenExpiration ? Math.min(requestedMinutes, intervalToSeconds(config.login.maxTokenExpiration) / 60) : requestedMinutes;
+    if (policy.tokenExpiration) {
+      expirationCapped = Math.min(expirationCapped, intervalToSeconds(policy.tokenExpiration) / 60);
+    }
+    const issuedAt = dbContext.providers.now();
+    const maxExpiresAt = policy.tokenExpiration ? new Date(issuedAt.getTime() + intervalToSeconds(policy.tokenExpiration) * 1e3) : null;
+    const command = new CreateApiKeyCommand({
+      type: ApiKey.Type.SESSION,
+      identityId,
+      expiration: expirationCapped,
+      requestInfo,
+      trustForwardedInfo,
+      idleTimeout: policy.idleTimeout ? intervalToPostgres(policy.idleTimeout) : null,
+      maxExpiresAt
+    });
+    const { id, token } = await dbContext.commandBus.execute(command);
+    assert(token !== void 0);
+    const policyApplied = policy.mfaRequired === true || policy.tokenExpiration !== null || policy.idleTimeout !== null || policy.rememberMeAllowed !== null;
+    if (policyApplied) {
+      try {
+        await this.authLogService.logSessionEvent(dbContext, {
+          type: "session_policy_applied",
+          identityId,
+          ipAddress: requestInfo?.ip,
+          userAgent: requestInfo?.userAgent,
+          success: true,
+          eventData: {
+            tokenExpiration: policy.tokenExpiration ? intervalToPostgres(policy.tokenExpiration) : null,
+            idleTimeout: policy.idleTimeout ? intervalToPostgres(policy.idleTimeout) : null,
+            rememberMeAllowed: policy.rememberMeAllowed,
+            mfaRequired: policy.mfaRequired
+          }
+        });
+      } catch {
+      }
+    }
+    return { id, token };
+  }
   async findApiKey(dbContext, apiKeyId) {
     return await dbContext.queryHandler.fetch(
       new ApiKeyByIdQuery(apiKeyId)
@@ -73,23 +185,24 @@ class ApiKeyManager {
   async disableIdentityApiKeys(dbContext, identityId) {
     await dbContext.commandBus.execute(new DisableIdentityApiKeysCommand(identityId));
   }
-  async createGlobalPermanentApiKey(dbContext, description, roles, tokenHash) {
+  async createGlobalPermanentApiKey(dbContext, description, roles, tokenHash, trustForwardedInfo) {
     return await dbContext.transaction(async (db) => {
-      return await this.apiKeyService.createPermanentApiKey(db, description, roles, tokenHash);
+      return await this.apiKeyService.createPermanentApiKey(db, description, roles, tokenHash, trustForwardedInfo);
     });
   }
-  async createProjectPermanentApiKey(dbContext, projectId, memberships, description, tokenHash) {
+  async createProjectPermanentApiKey(dbContext, projectId, memberships, description, tokenHash, trustForwardedInfo) {
     return await dbContext.transaction(async (db) => {
-      return await this.apiKeyService.createProjectPermanentApiKey(db, projectId, memberships, description, tokenHash);
+      return await this.apiKeyService.createProjectPermanentApiKey(db, projectId, memberships, description, tokenHash, trustForwardedInfo);
     });
   }
 }
 class VerifyResult {
-  constructor(identityId, apiKeyId, roles, personId) {
+  constructor(identityId, apiKeyId, roles, personId, trustForwardedInfo = false) {
     this.identityId = identityId;
     this.apiKeyId = apiKeyId;
     this.roles = roles;
     this.personId = personId;
+    this.trustForwardedInfo = trustForwardedInfo;
     __publicField(this, "valid", true);
   }
 }