@oneuptime/common 12.0.32 → 12.0.34

package/build/dist/Server/Services/EnterpriseLicenseInstanceService.js

@@ -1,9 +1,176 @@
 import DatabaseService from "./DatabaseService";
 import EnterpriseLicenseInstance from "../../Models/DatabaseModels/EnterpriseLicenseInstance";
+import EnterpriseLicenseService from "./EnterpriseLicenseService";
+import EnterpriseLicenseUsageUtil from "../../Utils/EnterpriseLicense/EnterpriseLicenseUsage";
+import EnterpriseLicenseUserCountSource from "../../Types/EnterpriseLicense/EnterpriseLicenseUserCountSource";
+import LIMIT_MAX from "../../Types/Database/LimitMax";
+import OneUptimeDate from "../../Types/Date";
+import SortOrder from "../../Types/BaseDatabase/SortOrder";
+import ModelPermission from "../Types/Database/Permissions/Index";
 export class Service extends DatabaseService {
     constructor() {
         super(EnterpriseLicenseInstance);
     }
+    async deleteOneById(deleteById) {
+        /*
+         * A source marker is written before deleting some upgrade-era rows. Check
+         * permission first so a refused delete can never produce that write. The
+         * inherited deletion below deliberately performs its normal check again.
+         */
+        await ModelPermission.checkDeletePermissionByModel({
+            modelType: this.modelType,
+            fetchModelWithAccessControlIds: async () => {
+                return await this.findOneById({
+                    id: deleteById.id,
+                    select: {},
+                    props: {
+                        isRoot: true,
+                    },
+                });
+            },
+            props: deleteById.props,
+        });
+        /*
+         * Resolve the owning license before taking its lock. The actual delete
+         * still goes through DatabaseService below with the caller's original
+         * props, so this root read does not bypass delete permission checks.
+         */
+        const instance = await this.findOneById({
+            id: deleteById.id,
+            select: {
+                enterpriseLicenseId: true,
+            },
+            props: {
+                isRoot: true,
+            },
+        });
+        const licenseId = instance === null || instance === void 0 ? void 0 : instance.enterpriseLicenseId;
+        if (!licenseId) {
+            return await super.deleteOneById(deleteById);
+        }
+        return await EnterpriseLicenseService.runWithUsageAggregationLock({
+            licenseId,
+            fn: async () => {
+                /*
+                 * A report for this row uses the same lock. Re-read its provenance in
+                 * the critical section so the fallback decision cannot race a report.
+                 */
+                const lockedInstance = await this.findOneById({
+                    id: deleteById.id,
+                    select: {
+                        lastReportedAt: true,
+                    },
+                    props: {
+                        isRoot: true,
+                    },
+                });
+                const deletedTargetHadReportedUsage = Boolean(lockedInstance === null || lockedInstance === void 0 ? void 0 : lockedInstance.lastReportedAt);
+                if (deletedTargetHadReportedUsage) {
+                    const sourceLicense = await EnterpriseLicenseService.findOneById({
+                        id: licenseId,
+                        select: {
+                            userCountSource: true,
+                        },
+                        props: {
+                            isRoot: true,
+                        },
+                    });
+                    /*
+                     * Old rows predate the persisted provenance column. Mark the stored
+                     * aggregate before deleting its last evidence, so even a later
+                     * aggregate-write failure cannot resurrect it as legacy usage.
+                     */
+                    if (sourceLicense && !sourceLicense.userCountSource) {
+                        await EnterpriseLicenseService.updateOneById({
+                            id: licenseId,
+                            data: {
+                                userCountSource: EnterpriseLicenseUserCountSource.Instance,
+                            },
+                            props: {
+                                isRoot: true,
+                                ignoreHooks: true,
+                            },
+                        });
+                    }
+                }
+                const deletedCount = await super.deleteOneById(deleteById);
+                /*
+                 * The row may have disappeared between the ownership lookup and lock
+                 * acquisition. Preserve DatabaseService's zero-row result and avoid
+                 * changing an aggregate for a deletion this call did not perform.
+                 */
+                if (deletedCount === 0) {
+                    return 0;
+                }
+                const now = OneUptimeDate.getCurrentDate();
+                const remainingInstances = await this.findBy({
+                    query: {
+                        enterpriseLicenseId: licenseId,
+                    },
+                    select: {
+                        createdAt: true,
+                        userCount: true,
+                        userEmailHashes: true,
+                        lastReportedAt: true,
+                    },
+                    sort: {
+                        createdAt: SortOrder.Ascending,
+                    },
+                    skip: 0,
+                    limit: LIMIT_MAX,
+                    props: {
+                        isRoot: true,
+                    },
+                });
+                const license = await EnterpriseLicenseService.findOneById({
+                    id: licenseId,
+                    select: {
+                        currentUserCount: true,
+                        userCountUpdatedAt: true,
+                        userCountSource: true,
+                        legacyUserCount: true,
+                        legacyUserCountUpdatedAt: true,
+                    },
+                    props: {
+                        isRoot: true,
+                    },
+                });
+                if (!license) {
+                    return deletedCount;
+                }
+                const effectiveUsage = EnterpriseLicenseUsageUtil.getEffectiveUserCountAndSource({
+                    instances: remainingInstances,
+                    storedUserCount: license.currentUserCount,
+                    storedUserCountUpdatedAt: license.userCountUpdatedAt,
+                    storedUserCountSource: license.userCountSource ||
+                        (deletedTargetHadReportedUsage
+                            ? EnterpriseLicenseUserCountSource.Instance
+                            : undefined),
+                    legacyUserCount: license.legacyUserCount,
+                    legacyUserCountUpdatedAt: license.legacyUserCountUpdatedAt,
+                    allowStoredUserCountAsLegacyFallback: !deletedTargetHadReportedUsage,
+                    now,
+                });
+                if (effectiveUsage.userCount !== null) {
+                    const usageUpdate = {
+                        currentUserCount: effectiveUsage.userCount,
+                    };
+                    if (effectiveUsage.source !== null) {
+                        usageUpdate.userCountSource = effectiveUsage.source;
+                    }
+                    await EnterpriseLicenseService.updateOneById({
+                        id: licenseId,
+                        data: usageUpdate,
+                        props: {
+                            isRoot: true,
+                            ignoreHooks: true,
+                        },
+                    });
+                }
+                return deletedCount;
+            },
+        });
+    }
 }
 export default new Service();
 //# sourceMappingURL=EnterpriseLicenseInstanceService.js.map

package/build/dist/Server/Services/EnterpriseLicenseInstanceService.js.map

@@ -1 +1 @@
-{"version":3,"file":"EnterpriseLicenseInstanceService.js","sourceRoot":"","sources":["../../../../Server/Services/EnterpriseLicenseInstanceService.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,yBAAyB,MAAM,uDAAuD,CAAC;AAE9F,MAAM,OAAO,OAAQ,SAAQ,eAA0C;IACrE;QACE,KAAK,CAAC,yBAAyB,CAAC,CAAC;IACnC,CAAC;CACF;AAED,eAAe,IAAI,OAAO,EAAE,CAAC"}
+{"version":3,"file":"EnterpriseLicenseInstanceService.js","sourceRoot":"","sources":["../../../../Server/Services/EnterpriseLicenseInstanceService.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/Services/EnterpriseLicenseService.js

@@ -13,10 +13,49 @@ import MarketingEventUtil from "../Utils/Marketing/MarketingEventUtil";
 import { MarketingEventType } from "../../Types/Marketing/MarketingEvent";
 import OneUptimeDate from "../../Types/Date";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
+import Semaphore from "../Infrastructure/Semaphore";
+import logger from "../Utils/Logger";
+export const ENTERPRISE_LICENSE_USAGE_AGGREGATION_LOCK_NAMESPACE = "EnterpriseLicenseService.usageAggregation";
+export const ENTERPRISE_LICENSE_USAGE_AGGREGATION_LOCK_OPTIONS = Object.freeze({
+    namespace: ENTERPRISE_LICENSE_USAGE_AGGREGATION_LOCK_NAMESPACE,
+    lockTimeout: 60000,
+    acquireTimeout: 10000,
+});
 export class Service extends DatabaseService {
     constructor() {
         super(EnterpriseLicense);
     }
+    /**
+     * Serialize usage aggregation for one enterprise license across every API
+     * and worker process. Callers must put the complete read-compute-write
+     * operation inside `fn`; locking only the write would leave the stale-read
+     * race intact.
+     */
+    async runWithUsageAggregationLock(data) {
+        /*
+         * Acquisition is deliberately outside the callback try/finally. If Redis
+         * is unavailable or contention exceeds the bounded acquire timeout, the
+         * operation fails closed and there is no unowned mutex to release.
+         */
+        const mutex = await Semaphore.lock(Object.assign({ key: data.licenseId.toString() }, ENTERPRISE_LICENSE_USAGE_AGGREGATION_LOCK_OPTIONS));
+        try {
+            return await data.fn();
+        }
+        finally {
+            try {
+                await Semaphore.release(mutex);
+            }
+            catch (error) {
+                /*
+                 * redis-semaphore refreshes held locks and lets them expire after the
+                 * lock timeout if explicit release fails. Logging is best effort: a
+                 * release error must not replace either the callback's value or its
+                 * more useful error.
+                 */
+                logger.error(`Failed to release enterprise license usage aggregation lock for ${data.licenseId.toString()}; it will expire automatically: ${error}`);
+            }
+        }
+    }
     async onCreateSuccess(_onCreate, createdItem) {
         /*
          * The outbound enterprise_license_issued conversion.

package/build/dist/Server/Services/EnterpriseLicenseService.js.map

@@ -1 +1 @@
-{"version":3,"file":"EnterpriseLicenseService.js","sourceRoot":"","sources":["../../../../Server/Services/EnterpriseLicenseService.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,iBAAiB,MAAM,+CAA+C,CAAC;AAC9E,OAAO,kBAAkB,MAAM,uCAAuC,CAAC;AACvE,OAAO,EAAE,kBAAkB,EAAE,MAAM,sCAAsC,CAAC;AAE1E,OAAO,aAAa,MAAM,kBAAkB,CAAC;AAC7C,OAAO,WAAW,MAAM,gCAAgC,CAAC;AAEzD,MAAM,OAAO,OAAQ,SAAQ,eAAkC;IAC7D;QACE,KAAK,CAAC,iBAAiB,CAAC,CAAC;IAC3B,CAAC;IAGwB,AAAN,KAAK,CAAC,eAAe,CACtC,SAAsC,EACtC,WAA8B;QAE9B;;;;;;;;;;;;;WAaG;QACH,kBAAkB,CAAC,gBAAgB,CAAC,GAAG,EAAE;;YACvC,OAAO,kBAAkB,CAAC,UAAU,CAAC;gBACnC,SAAS,EAAE,kBAAkB,CAAC,uBAAuB;gBACrD,OAAO,EAAE,GAAG,kBAAkB,CAAC,uBAAuB,IAAI,MAAA,WAAW,CAAC,EAAE,0CAAE,QAAQ,EAAE,EAAE;gBACtF,UAAU,EAAE,WAAW,CAAC,SAAS,IAAI,IAAI,IAAI,EAAE;gBAC/C,KAAK,EAAE,MAAA,WAAW,CAAC,KAAK,0CAAE,QAAQ,EAAE;gBACpC;;;;;mBAKG;gBACH,IAAI,EAAE;oBACJ,mBAAmB,EAAE,CAAA,MAAA,WAAW,CAAC,EAAE,0CAAE,QAAQ,EAAE,KAAI,EAAE;oBACrD,WAAW,EAAE,WAAW,CAAC,WAAW,IAAI,EAAE;oBAC1C,wBAAwB,EACtB,WAAW,CAAC,mBAAmB,KAAK,SAAS;wBAC7C,WAAW,CAAC,mBAAmB,KAAK,IAAI;wBACtC,CAAC,CAAC,IAAI;wBACN,CAAC,CAAC,WAAW,CAAC,mBAAmB;oBACrC,QAAQ,EAAE,KAAK;oBACf,mBAAmB,EAAE,OAAO,CAAC,WAAW,CAAC,mBAAmB,CAAC;oBAC7D,SAAS,EACP,WAAW,CAAC,SAAS,KAAK,SAAS;wBACnC,WAAW,CAAC,SAAS,KAAK,IAAI;wBAC5B,CAAC,CAAC,IAAI;wBACN,CAAC,CAAC,WAAW,CAAC,SAAS;oBAC3B;;;;;;;;uBAQG;oBACH,SAAS,EAAE,aAAa,CAAC,iBAAiB,CAAC,WAAW,CAAC,SAAS,CAAC;iBAClE;aACF,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,OAAO,WAAW,CAAC;IACrB,CAAC;CACF;AA7D0B;IADxB,WAAW,EAAE;;6CAGC,iBAAiB;;8CA0D/B;AAGH,eAAe,IAAI,OAAO,EAAE,CAAC"}
+{"version":3,"file":"EnterpriseLicenseService.js","sourceRoot":"","sources":["../../../../Server/Services/EnterpriseLicenseService.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,iBAAiB,MAAM,+CAA+C,CAAC;AAC9E,OAAO,kBAAkB,MAAM,uCAAuC,CAAC;AACvE,OAAO,EAAE,kBAAkB,EAAE,MAAM,sCAAsC,CAAC;AAE1E,OAAO,aAAa,MAAM,kBAAkB,CAAC;AAC7C,OAAO,WAAW,MAAM,gCAAgC,CAAC;AAEzD,OAAO,SAA6B,MAAM,6BAA6B,CAAC;AACxE,OAAO,MAAM,MAAM,iBAAiB,CAAC;AAErC,MAAM,CAAC,MAAM,mDAAmD,GAC9D,2CAA2C,CAAC;AAE9C,MAAM,CAAC,MAAM,iDAAiD,GAIzD,MAAM,CAAC,MAAM,CAAC;IACjB,SAAS,EAAE,mDAAmD;IAC9D,WAAW,EAAE,KAAM;IACnB,cAAc,EAAE,KAAM;CACvB,CAAC,CAAC;AAEH,MAAM,OAAO,OAAQ,SAAQ,eAAkC;IAC7D;QACE,KAAK,CAAC,iBAAiB,CAAC,CAAC;IAC3B,CAAC;IAED;;;;;OAKG;IACI,KAAK,CAAC,2BAA2B,CAAU,IAGjD;QACC;;;;WAIG;QACH,MAAM,KAAK,GAAmB,MAAM,SAAS,CAAC,IAAI,iBAChD,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAC3B,iDAAiD,EACpD,CAAC;QAEH,IAAI,CAAC;YACH,OAAO,MAAM,IAAI,CAAC,EAAE,EAAE,CAAC;QACzB,CAAC;gBAAS,CAAC;YACT,IAAI,CAAC;gBACH,MAAM,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YACjC,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf;;;;;mBAKG;gBACH,MAAM,CAAC,KAAK,CACV,mEAAmE,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,mCAAmC,KAAK,EAAE,CACvI,CAAC;YACJ,CAAC;QACH,CAAC;IACH,CAAC;IAGwB,AAAN,KAAK,CAAC,eAAe,CACtC,SAAsC,EACtC,WAA8B;QAE9B;;;;;;;;;;;;;WAaG;QACH,kBAAkB,CAAC,gBAAgB,CAAC,GAAG,EAAE;;YACvC,OAAO,kBAAkB,CAAC,UAAU,CAAC;gBACnC,SAAS,EAAE,kBAAkB,CAAC,uBAAuB;gBACrD,OAAO,EAAE,GAAG,kBAAkB,CAAC,uBAAuB,IAAI,MAAA,WAAW,CAAC,EAAE,0CAAE,QAAQ,EAAE,EAAE;gBACtF,UAAU,EAAE,WAAW,CAAC,SAAS,IAAI,IAAI,IAAI,EAAE;gBAC/C,KAAK,EAAE,MAAA,WAAW,CAAC,KAAK,0CAAE,QAAQ,EAAE;gBACpC;;;;;mBAKG;gBACH,IAAI,EAAE;oBACJ,mBAAmB,EAAE,CAAA,MAAA,WAAW,CAAC,EAAE,0CAAE,QAAQ,EAAE,KAAI,EAAE;oBACrD,WAAW,EAAE,WAAW,CAAC,WAAW,IAAI,EAAE;oBAC1C,wBAAwB,EACtB,WAAW,CAAC,mBAAmB,KAAK,SAAS;wBAC7C,WAAW,CAAC,mBAAmB,KAAK,IAAI;wBACtC,CAAC,CAAC,IAAI;wBACN,CAAC,CAAC,WAAW,CAAC,mBAAmB;oBACrC,QAAQ,EAAE,KAAK;oBACf,mBAAmB,EAAE,OAAO,CAAC,WAAW,CAAC,mBAAmB,CAAC;oBAC7D,SAAS,EACP,WAAW,CAAC,SAAS,KAAK,SAAS;wBACnC,WAAW,CAAC,SAAS,KAAK,IAAI;wBAC5B,CAAC,CAAC,IAAI;wBACN,CAAC,CAAC,WAAW,CAAC,SAAS;oBAC3B;;;;;;;;uBAQG;oBACH,SAAS,EAAE,aAAa,CAAC,iBAAiB,CAAC,WAAW,CAAC,SAAS,CAAC;iBAClE;aACF,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,OAAO,WAAW,CAAC;IACrB,CAAC;CACF;AA7D0B;IADxB,WAAW,EAAE;;6CAGC,iBAAiB;;8CA0D/B;AAGH,eAAe,IAAI,OAAO,EAAE,CAAC"}

package/build/dist/Server/Services/GlobalConfigService.js

@@ -10,8 +10,16 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 import DatabaseService from "./DatabaseService";
 import Model from "../../Models/DatabaseModels/GlobalConfig";
 import InMemoryTTLCache from "../Infrastructure/InMemoryTTLCache";
+import ObjectID from "../../Types/ObjectID";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 import BadDataException from "../../Types/Exception/BadDataException";
+import TelegramVerificationToken from "../Utils/TelegramVerificationToken";
+import GlobalCache from "../Infrastructure/GlobalCache";
+const TELEGRAM_WEBHOOK_SECRET_CACHE_NAMESPACE = "global-config-security";
+const TELEGRAM_WEBHOOK_SECRET_GENERATION_KEY = "telegram-webhook-secret-generation";
+const TELEGRAM_WEBHOOK_SECRET_INITIAL_GENERATION = "initial";
+const TELEGRAM_WEBHOOK_SECRET_MISSING_VALUE = "__not_configured__";
+const TELEGRAM_WEBHOOK_SECRET_CACHE_TTL_SECONDS = 5;
 export class Service extends DatabaseService {
     constructor() {
         super(Model);
@@ -21,6 +29,13 @@ export class Service extends DatabaseService {
          * time. Refreshed at most once per 60s and invalidated on update below.
          */
         this.requireSsoForLoginCache = new InMemoryTTLCache(10000);
+        /*
+         * The public Telegram webhook is hit without a OneUptime session. The value
+         * cache lives in Redis so every app replica observes the same generation.
+         * Only the in-flight promise is process-local: it collapses a cache-miss
+         * burst to one Postgres read per replica without retaining a retired secret.
+         */
+        this.telegramWebhookSecretTokenLoad = undefined;
     }
     /*
      * Instance-wide: must every user sign in with SSO to access projects?
@@ -41,7 +56,115 @@ export class Service extends DatabaseService {
         this.requireSsoForLoginCache.set(key, value, 60000);
         return value;
     }
+    async getTelegramWebhookSecretToken() {
+        while (true) {
+            const generation = await this.getTelegramWebhookSecretTokenGeneration();
+            const cacheKey = this.getTelegramWebhookSecretTokenCacheKey(generation);
+            const cached = await GlobalCache.getString(TELEGRAM_WEBHOOK_SECRET_CACHE_NAMESPACE, cacheKey);
+            if (cached !== null) {
+                return cached === TELEGRAM_WEBHOOK_SECRET_MISSING_VALUE
+                    ? undefined
+                    : cached;
+            }
+            const existingLoad = this.telegramWebhookSecretTokenLoad;
+            /*
+             * Cache expiry is visible to every public webhook request at once. Share
+             * the database read for that generation so a burst cannot turn one
+             * expiry into one root Postgres query per request.
+             */
+            const load = (existingLoad === null || existingLoad === void 0 ? void 0 : existingLoad.generation) === generation
+                ? existingLoad
+                : {
+                    generation,
+                    promise: this.loadTelegramWebhookSecretToken(generation, cacheKey),
+                };
+            if (load !== existingLoad) {
+                this.telegramWebhookSecretTokenLoad = load;
+            }
+            try {
+                const result = await load.promise;
+                /*
+                 * A rotation that completed during the database read makes the result
+                 * unreachable through the new generation key. Loop so this request
+                 * also joins the new generation instead of authenticating with the
+                 * value that was retired while it waited.
+                 */
+                if (result.isCurrentGeneration) {
+                    return result.value;
+                }
+            }
+            finally {
+                /*
+                 * An invalidation can start a newer-generation load while this one is
+                 * still pending. The older promise must not clear that newer flight.
+                 */
+                if (this.telegramWebhookSecretTokenLoad === load) {
+                    this.telegramWebhookSecretTokenLoad = undefined;
+                }
+            }
+        }
+    }
+    async getTelegramWebhookSecretTokenGeneration() {
+        return ((await GlobalCache.getString(TELEGRAM_WEBHOOK_SECRET_CACHE_NAMESPACE, TELEGRAM_WEBHOOK_SECRET_GENERATION_KEY)) || TELEGRAM_WEBHOOK_SECRET_INITIAL_GENERATION);
+    }
+    getTelegramWebhookSecretTokenCacheKey(generation) {
+        return `telegram-webhook-secret:${generation}`;
+    }
+    async loadTelegramWebhookSecretToken(generation, cacheKey) {
+        var _a;
+        const config = await this.findOneBy({
+            query: {
+                _id: ObjectID.getZeroObjectID().toString(),
+            },
+            select: {
+                telegramWebhookSecretToken: true,
+            },
+            props: {
+                isRoot: true,
+            },
+        });
+        const value = ((_a = config === null || config === void 0 ? void 0 : config.telegramWebhookSecretToken) === null || _a === void 0 ? void 0 : _a.trim()) || undefined;
+        /*
+         * A read begun before a rotation may return after the update has committed.
+         * Check the shared generation before populating Redis; an old replica can
+         * still finish its query, but it cannot republish the retired value under
+         * the generation every other replica now reads.
+         */
+        if (generation !== (await this.getTelegramWebhookSecretTokenGeneration())) {
+            return {
+                value: undefined,
+                isCurrentGeneration: false,
+            };
+        }
+        await GlobalCache.setString(TELEGRAM_WEBHOOK_SECRET_CACHE_NAMESPACE, cacheKey, value || TELEGRAM_WEBHOOK_SECRET_MISSING_VALUE, { expiresInSeconds: TELEGRAM_WEBHOOK_SECRET_CACHE_TTL_SECONDS });
+        return {
+            value,
+            isCurrentGeneration: generation === (await this.getTelegramWebhookSecretTokenGeneration()),
+        };
+    }
+    async rotateTelegramWebhookSecretTokenGeneration() {
+        await GlobalCache.setString(TELEGRAM_WEBHOOK_SECRET_CACHE_NAMESPACE, TELEGRAM_WEBHOOK_SECRET_GENERATION_KEY, ObjectID.generate().toString());
+    }
     async onBeforeUpdate(updateBy) {
+        if (updateBy.data.telegramWebhookSecretToken !== undefined) {
+            const secret = updateBy.data.telegramWebhookSecretToken;
+            if (secret !== null &&
+                secret !== "" &&
+                !TelegramVerificationToken.isWebhookSecretStrong(secret)) {
+                throw new BadDataException("Telegram webhook secret token must be 32-100 characters and contain only letters, numbers, underscores, or hyphens.");
+            }
+            if (typeof secret === "string") {
+                updateBy.data.telegramWebhookSecretToken = secret.trim();
+            }
+            /*
+             * Move every replica to a fresh shared generation before the write. A
+             * request during the transaction may still read the currently committed
+             * secret, but it cannot repopulate the generation used before rotation.
+             * The success hook rotates once more after commit. If the write fails,
+             * this generation simply continues to cache the still-valid old value.
+             */
+            await this.rotateTelegramWebhookSecretTokenGeneration();
+        }
         const capacitySettingKeys = [
             "clickhouseCapacityNotificationEnabled",
             "clickhouseCapacityNotificationThresholdPercent",
@@ -123,6 +246,10 @@ export class Service extends DatabaseService {
             .requireSsoForLogin !== undefined) {
             this.requireSsoForLoginCache.clear();
         }
+        if (onUpdate.updateBy.data
+            .telegramWebhookSecretToken !== undefined) {
+            await this.rotateTelegramWebhookSecretTokenGeneration();
+        }
         return onUpdate;
     }
 }
@@ -132,6 +259,12 @@ __decorate([
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", Promise)
 ], Service.prototype, "getRequireSsoForLogin", null);
+__decorate([
+    CaptureSpan(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], Service.prototype, "getTelegramWebhookSecretToken", null);
 __decorate([
     CaptureSpan(),
     __metadata("design:type", Function),

package/build/dist/Server/Services/GlobalConfigService.js.map

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

package/build/dist/Server/Services/IncidentCustomFieldService.js

@@ -1,9 +1,102 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
 import DatabaseService from "./DatabaseService";
 import Model from "../../Models/DatabaseModels/IncidentCustomField";
+import { backfillMappedCustomFieldValues } from "../Utils/CustomField/CustomFieldDefinitionMappingHooks";
+import { validateCustomFieldMappingOnCreate, validateCustomFieldMappingOnUpdate, } from "../Utils/CustomField/CustomFieldMappingValidator";
+import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
+/*
+ * An incident custom field can take its value from the same field on the
+ * incident's monitors instead of being typed in again
+ * (OneUptime/oneuptime#3549). These hooks are the two halves of that
+ * configuration being saved: refusing a mapping that could never resolve, and
+ * filling in the incidents that already exist once one is saved.
+ */
 export class Service extends DatabaseService {
     constructor() {
         super(Model);
     }
+    async onBeforeCreate(createBy) {
+        await validateCustomFieldMappingOnCreate({
+            definitionModelType: Model,
+            createBy: createBy,
+        });
+        return { createBy, carryForward: null };
+    }
+    async onBeforeUpdate(updateBy) {
+        await validateCustomFieldMappingOnUpdate({
+            definitionModelType: Model,
+            definitionService: this,
+            updateBy: updateBy,
+        });
+        return { updateBy, carryForward: null };
+    }
+    async onCreateSuccess(_onCreate, createdItem) {
+        backfillMappedCustomFieldValues({
+            definitionModelType: Model,
+            projectId: createdItem.projectId,
+            definitionName: "incident custom field",
+        });
+        return createdItem;
+    }
+    async onUpdateSuccess(onUpdate, updatedItemIds) {
+        if (updatedItemIds.length > 0) {
+            backfillMappedCustomFieldValues({
+                definitionModelType: Model,
+                projectId: await this.getProjectIdForBackfill(onUpdate, updatedItemIds),
+                definitionName: "incident custom field",
+            });
+        }
+        return onUpdate;
+    }
+    /*
+     * `props.tenantId` is set on every dashboard write but not on internal
+     * root-scoped ones, so fall back to the row itself rather than skipping the
+     * backfill for a mapping that was changed by a script.
+     */
+    async getProjectIdForBackfill(onUpdate, updatedItemIds) {
+        const tenantId = onUpdate.updateBy.props.tenantId;
+        if (tenantId) {
+            return tenantId;
+        }
+        const item = await this.findOneById({
+            id: updatedItemIds[0],
+            select: { projectId: true },
+            props: { isRoot: true },
+        });
+        return item === null || item === void 0 ? void 0 : item.projectId;
+    }
 }
+__decorate([
+    CaptureSpan(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Promise)
+], Service.prototype, "onBeforeCreate", null);
+__decorate([
+    CaptureSpan(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Promise)
+], Service.prototype, "onBeforeUpdate", null);
+__decorate([
+    CaptureSpan(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Model]),
+    __metadata("design:returntype", Promise)
+], Service.prototype, "onCreateSuccess", null);
+__decorate([
+    CaptureSpan(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Array]),
+    __metadata("design:returntype", Promise)
+], Service.prototype, "onUpdateSuccess", null);
 export default new Service();
 //# sourceMappingURL=IncidentCustomFieldService.js.map

package/build/dist/Server/Services/IncidentCustomFieldService.js.map

@@ -1 +1 @@
-{"version":3,"file":"IncidentCustomFieldService.js","sourceRoot":"","sources":["../../../../Server/Services/IncidentCustomFieldService.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,MAAM,iDAAiD,CAAC;AAEpE,MAAM,OAAO,OAAQ,SAAQ,eAAsB;IACjD;QACE,KAAK,CAAC,KAAK,CAAC,CAAC;IACf,CAAC;CACF;AACD,eAAe,IAAI,OAAO,EAAE,CAAC"}
+{"version":3,"file":"IncidentCustomFieldService.js","sourceRoot":"","sources":["../../../../Server/Services/IncidentCustomFieldService.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,MAAM,iDAAiD,CAAC;AAKpE,OAAO,EAAE,+BAA+B,EAAE,MAAM,wDAAwD,CAAC;AACzG,OAAO,EACL,kCAAkC,EAClC,kCAAkC,GACnC,MAAM,kDAAkD,CAAC;AAC1D,OAAO,WAAW,MAAM,gCAAgC,CAAC;AAEzD;;;;;;GAMG;AACH,MAAM,OAAO,OAAQ,SAAQ,eAAsB;IACjD;QACE,KAAK,CAAC,KAAK,CAAC,CAAC;IACf,CAAC;IAGwB,AAAN,KAAK,CAAC,cAAc,CACrC,QAAyB;QAEzB,MAAM,kCAAkC,CAAC;YACvC,mBAAmB,EAAE,KAAK;YAC1B,QAAQ,EAAE,QAAQ;SACnB,CAAC,CAAC;QAEH,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC;IAC1C,CAAC;IAGwB,AAAN,KAAK,CAAC,cAAc,CACrC,QAAyB;QAEzB,MAAM,kCAAkC,CAAC;YACvC,mBAAmB,EAAE,KAAK;YAC1B,iBAAiB,EAAE,IAAI;YACvB,QAAQ,EAAE,QAAQ;SACnB,CAAC,CAAC;QAEH,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC;IAC1C,CAAC;IAGwB,AAAN,KAAK,CAAC,eAAe,CACtC,SAA0B,EAC1B,WAAkB;QAElB,+BAA+B,CAAC;YAC9B,mBAAmB,EAAE,KAAK;YAC1B,SAAS,EAAE,WAAW,CAAC,SAAS;YAChC,cAAc,EAAE,uBAAuB;SACxC,CAAC,CAAC;QAEH,OAAO,WAAW,CAAC;IACrB,CAAC;IAGwB,AAAN,KAAK,CAAC,eAAe,CACtC,QAAyB,EACzB,cAA+B;QAE/B,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC9B,+BAA+B,CAAC;gBAC9B,mBAAmB,EAAE,KAAK;gBAC1B,SAAS,EAAE,MAAM,IAAI,CAAC,uBAAuB,CAAC,QAAQ,EAAE,cAAc,CAAC;gBACvE,cAAc,EAAE,uBAAuB;aACxC,CAAC,CAAC;QACL,CAAC;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED;;;;OAIG;IACK,KAAK,CAAC,uBAAuB,CACnC,QAAyB,EACzB,cAA+B;QAE/B,MAAM,QAAQ,GAAyB,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,QAElD,CAAC;QAEd,IAAI,QAAQ,EAAE,CAAC;YACb,OAAO,QAAQ,CAAC;QAClB,CAAC;QAED,MAAM,IAAI,GAAiB,MAAM,IAAI,CAAC,WAAW,CAAC;YAChD,EAAE,EAAE,cAAc,CAAC,CAAC,CAAE;YACtB,MAAM,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE;YAC3B,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE;SACxB,CAAC,CAAC;QAEH,OAAO,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,SAAS,CAAC;IACzB,CAAC;CACF;AA/E0B;IADxB,WAAW,EAAE;;;;6CAUb;AAGwB;IADxB,WAAW,EAAE;;;;6CAWb;AAGwB;IADxB,WAAW,EAAE;;6CAGC,KAAK;;8CASnB;AAGwB;IADxB,WAAW,EAAE;;6CAGI,KAAK;;8CAWtB;AA4BH,eAAe,IAAI,OAAO,EAAE,CAAC"}

package/build/dist/Server/Services/IncidentService.js

@@ -12,6 +12,8 @@ import MeasurementMetricWriter from "../Utils/Measurement/MeasurementMetricWrite
 import IncidentMeasurementService from "./IncidentMeasurementService";
 import QueryHelper from "../Types/Database/QueryHelper";
 import DatabaseService from "./DatabaseService";
+import IncidentCustomField from "../../Models/DatabaseModels/IncidentCustomField";
+import CustomFieldMappingService from "./CustomFieldMappingService";
 import AIRunService from "./AIRunService";
 import AIRunType from "../../Types/AI/AIRunType";
 import AIRunStatus from "../../Types/AI/AIRunStatus";
@@ -396,6 +398,17 @@ export class Service extends DatabaseService {
                     StatusPageSubscriberNotificationStatus.Pending;
             }
         }
+        /*
+         * Re-apply mapped custom field values. Covers the Custom Fields modal
+         * saving the whole bag back over a mapped value, and the incident's
+         * monitors being added or removed — both change what a mapped field should
+         * hold, and folding the answer into this payload keeps it one write with a
+         * truthful audit entry.
+         */
+        await CustomFieldMappingService.applyMappingsToUpdate({
+            definitionModelType: IncidentCustomField,
+            updateBy: updateBy,
+        });
         return {
             updateBy: updateBy,
             carryForward: carryForward,
@@ -747,6 +760,20 @@ export class Service extends DatabaseService {
             createBy.data.subscriberNotificationStatusOnIncidentCreated =
                 StatusPageSubscriberNotificationStatus.Pending;
         }
+        /*
+         * Last, because the incident template copy above can still be adding
+         * monitors and mapped custom fields are resolved from the final set.
+         *
+         * In onBeforeCreate rather than onCreateSuccess because `customFields` is
+         * a column on this row and the onCreateSuccess chain is un-awaited — a
+         * value written there would be missing from the incident the caller gets
+         * back. Written not to throw: a custom field failing to inherit must not
+         * stop an incident from being declared.
+         */
+        await CustomFieldMappingService.applyMappingsToCreate({
+            definitionModelType: IncidentCustomField,
+            createBy: createBy,
+        });
         return {
             createBy,
             carryForward: null,
@@ -1463,6 +1490,11 @@ ${incident.remediationNotes || "No remediation notes provided."}
     }
     async onUpdateSuccess(onUpdate, updatedItemIds) {
         var _a, _b, _c, _d, _e;
+        CustomFieldMappingService.restampAfterMultiRowUpdate({
+            definitionModelType: IncidentCustomField,
+            updateBy: onUpdate.updateBy,
+            updatedItemIds: updatedItemIds,
+        });
         /*
          * Correcting a timestamp is the whole point of making these fields
          * editable, so the numbers derived from them have to move. Without this