@oneuptime/common 12.0.13 → 12.0.14

package/build/dist/Server/Utils/ChannelVerification.js

@@ -0,0 +1,348 @@
+import logger from "./Logger";
+import VerificationCode from "./VerificationCode";
+import BadDataException from "../../Types/Exception/BadDataException";
+/*
+ * The ownership check shared by every notification channel a user can add to
+ * their own account: email, SMS, voice call, WhatsApp and the incoming-call
+ * number. Each of those had its own copy of "compare the column, set
+ * isVerified", and each copy had the same three holes.
+ *
+ * WHAT WAS WRONG
+ *
+ * The code was a stable six-digit value with no expiry, no attempt counter
+ * and no lockout. Nothing stops a caller creating a channel row pointing at
+ * SOMEBODY ELSE'S address or number - that is the normal, intended flow, it
+ * is how you add your own phone - so an authenticated low-privilege user
+ * could add a colleague's number and then walk the whole 10^6 code space
+ * against /verify at request speed. A million requests is minutes of
+ * scripting, and the code at the end of it was still the same code it was at
+ * the start. Success marks the row verified, which creates the default
+ * notification rules, which makes the victim's phone a delivery target for
+ * whatever that project pages about.
+ *
+ * WHAT REPLACES IT
+ *
+ * Four controls, each of which has to be defeated on its own:
+ *
+ *   EXPIRY       a code lives 15 minutes, so the search space is not
+ *                available indefinitely.
+ *   ATTEMPTS     five wrong guesses per issued code, counted with a single
+ *                atomic UPDATE ... RETURNING so racing requests cannot all
+ *                read the same pre-increment value and all decide they are
+ *                under the limit.
+ *   ROTATION     crossing the attempt limit does not merely pause the
+ *                attacker with the target still valid behind it - the stored
+ *                challenge is burned. Continuing costs a resend, which
+ *                notifies the victim.
+ *   THROTTLE     resends are on a cooldown, so "burn the code and get a new
+ *                one" is not free either, and the victim is not the one who
+ *                pays for it in unsolicited messages.
+ *
+ * On top of that the stored value is a keyed digest rather than the code (see
+ * VerificationCode.ts) and the routes are rate limited per user, per row and
+ * per address (see Middleware/VerificationCodeRateLimit.ts).
+ *
+ * Together: five guesses per code, a resend needed for the next five, a
+ * cooldown on resends, and every resend visible to the person being attacked.
+ */
+const parsePositiveIntFromEnv = (envKey, fallback) => {
+    const rawValue = process.env[envKey];
+    if (!rawValue) {
+        return fallback;
+    }
+    const parsedValue = parseInt(rawValue, 10);
+    if (!Number.isFinite(parsedValue) || parsedValue <= 0) {
+        return fallback;
+    }
+    return parsedValue;
+};
+/*
+ * Long enough to survive a slow SMS carrier, an email that lands in a spam
+ * folder the user has to go and look in, or a voice call the user missed and
+ * had to wait to be repeated. Short enough that the code space is not
+ * standing open. Fifteen minutes is the usual figure for exactly this
+ * trade-off and is what the notification copy tells the user.
+ */
+export const VERIFICATION_CODE_EXPIRY_MINUTES = parsePositiveIntFromEnv("NOTIFICATION_VERIFICATION_CODE_EXPIRY_MINUTES", 15);
+/*
+ * Five is chosen for the human, not the attacker: somebody typing a code off
+ * a phone screen will fat-finger it once or twice, and almost never five
+ * times. The attacker's number is not five - it is five multiplied by how
+ * many resends they are willing to send to their victim's phone, which is the
+ * point of the cooldown below.
+ */
+export const MAX_VERIFICATION_ATTEMPTS = parsePositiveIntFromEnv("NOTIFICATION_VERIFICATION_MAX_ATTEMPTS", 5);
+/*
+ * A resend both issues a fresh code and, for SMS/call/WhatsApp, spends real
+ * money sending it to a real handset. The cooldown is the control on the
+ * "burn five guesses, resend, repeat" loop AND on using the resend button as
+ * a way to text somebody 200 times.
+ *
+ * Sixty seconds is the interval a user who did not receive the first message
+ * will tolerate, and it caps the loop above at five guesses a minute: roughly
+ * 200,000 minutes, or four months of uninterrupted attack with a message
+ * landing on the victim's phone every sixty seconds of it, for an even chance
+ * of hitting one code.
+ */
+export const RESEND_COOLDOWN_SECONDS = parsePositiveIntFromEnv("NOTIFICATION_VERIFICATION_RESEND_COOLDOWN_SECONDS", 60);
+export var ChannelVerificationOutcome;
+(function (ChannelVerificationOutcome) {
+    ChannelVerificationOutcome["Verified"] = "verified";
+    ChannelVerificationOutcome["NotFound"] = "not-found";
+    ChannelVerificationOutcome["NotOwner"] = "not-owner";
+    ChannelVerificationOutcome["AlreadyVerified"] = "already-verified";
+    ChannelVerificationOutcome["Expired"] = "expired";
+    ChannelVerificationOutcome["TooManyAttempts"] = "too-many-attempts";
+    ChannelVerificationOutcome["IncorrectCode"] = "incorrect-code";
+})(ChannelVerificationOutcome || (ChannelVerificationOutcome = {}));
+const asWriter = (service) => {
+    return service;
+};
+export default class ChannelVerification {
+    /*
+     * When a code issued now stops being accepted.
+     */
+    static getExpiresAt(now = new Date()) {
+        return new Date(now.getTime() + VERIFICATION_CODE_EXPIRY_MINUTES * 60 * 1000);
+    }
+    /*
+     * A missing expiry is treated as expired, NOT as "never expires".
+     *
+     * That is the direction that matters for the rows written before this
+     * column existed: they carry a plaintext code and no expiry, and the
+     * conservative reading turns them into "request a new code" rather than
+     * leaving a permanently valid challenge in place. The cost is that a user
+     * who had an unverified channel across the upgrade has to press resend
+     * once.
+     */
+    static isCodeExpired(data) {
+        if (!data.expiresAt) {
+            return true;
+        }
+        const now = data.now || new Date();
+        return new Date(data.expiresAt).getTime() <= now.getTime();
+    }
+    /*
+     * Seconds the caller must wait before another code may be sent, or 0 if a
+     * send is allowed right now.
+     */
+    static getResendRetryAfterSeconds(data) {
+        if (!data.lastSentAt) {
+            return 0;
+        }
+        const now = data.now || new Date();
+        const elapsedSeconds = (now.getTime() - new Date(data.lastSentAt).getTime()) / 1000;
+        /*
+         * A lastSentAt in the future means a clock went backwards, not that the
+         * caller may send freely. Treat it as a full cooldown.
+         */
+        if (elapsedSeconds < 0) {
+            return RESEND_COOLDOWN_SECONDS;
+        }
+        if (elapsedSeconds >= RESEND_COOLDOWN_SECONDS) {
+            return 0;
+        }
+        return Math.max(1, Math.ceil(RESEND_COOLDOWN_SECONDS - elapsedSeconds));
+    }
+    /*
+     * The column values that put a freshly issued code on a row. Returned
+     * rather than written so the caller can fold them into whatever write it
+     * was already making, and so the plaintext - which exists in memory for
+     * exactly as long as it takes to hand it to the notification service -
+     * comes back alongside them.
+     */
+    static issueCode(data) {
+        const now = data.now || new Date();
+        const plainCode = VerificationCode.generate();
+        return {
+            plainCode,
+            fields: {
+                verificationCode: VerificationCode.hashCode({
+                    code: plainCode,
+                    channelId: data.channelId,
+                }),
+                verificationCodeExpiresAt: ChannelVerification.getExpiresAt(now),
+                verificationCodeSentAt: now,
+                verificationFailedAttempts: 0,
+            },
+        };
+    }
+    /*
+     * The column values that leave a row with NO live challenge on it: a digest
+     * no code can produce, and no expiry.
+     *
+     * `verificationCode` is NOT NULL on every one of these tables, so "there is
+     * no code" cannot be written as null. A random 256-bit digest says the same
+     * thing and cannot be hit by any of the 10^6 codes.
+     */
+    static getClearedCodeFields() {
+        return {
+            verificationCode: VerificationCode.generateUnusableHash(),
+            verificationCodeExpiresAt: null,
+        };
+    }
+    /*
+     * Write a fresh code onto an existing row and return the plaintext to send.
+     *
+     * Callers must have already decided that a send is allowed - this does not
+     * check the cooldown, because whether a resend is permitted is a question
+     * about the CHANNEL (already verified? project out of SMS credit?) that
+     * only the channel's own service can answer.
+     */
+    static async issueCodeOnItem(data) {
+        const issued = ChannelVerification.issueCode({ channelId: data.itemId });
+        await asWriter(data.service).updateOneById({
+            id: data.itemId,
+            props: {
+                isRoot: true,
+            },
+            data: issued.fields,
+        });
+        return issued.plainCode;
+    }
+    /*
+     * Check a submitted code and, if it is right, mark the row verified.
+     *
+     * The ORDER of the steps is the security-relevant part:
+     *
+     *   ownership first, so one user cannot even probe the state of another
+     *   user's row;
+     *
+     *   already-verified before the counter, so re-submitting a code against a
+     *   row that is already done is not a way to burn somebody's attempts;
+     *
+     *   the lockout gate before the counter, so a row whose budget is already
+     *   spent is refused without growing the counter forever and without a
+     *   database write per request;
+     *
+     *   expiry before the counter, because an expired code is refused
+     *   unconditionally and there is no reason to spend a user's remaining
+     *   attempts telling them so;
+     *
+     *   the counter before the comparison, so every attempt - including the
+     *   ones racing each other - has already consumed its slot by the time
+     *   anybody learns whether it was right.
+     *
+     * The lockout gate reads a value that a concurrent request may already have
+     * moved, which is exactly why it is a fast path and not the control. The
+     * control is the atomic increment below: N requests that all slip past the
+     * stale gate together still receive N DISTINCT attempt numbers, so all but
+     * the first MAX_VERIFICATION_ATTEMPTS of them are refused.
+     */
+    static async verifyCode(data) {
+        var _a;
+        const item = await data.service.findOneById({
+            id: data.itemId,
+            props: {
+                isRoot: true,
+            },
+            select: {
+                userId: true,
+                projectId: true,
+                isVerified: true,
+                verificationCode: true,
+                verificationCodeExpiresAt: true,
+                verificationFailedAttempts: true,
+            },
+        });
+        const writer = asWriter(data.service);
+        if (!item) {
+            return { outcome: ChannelVerificationOutcome.NotFound };
+        }
+        if (((_a = item.userId) === null || _a === void 0 ? void 0 : _a.toString()) !== data.userId.toString()) {
+            return { outcome: ChannelVerificationOutcome.NotOwner };
+        }
+        if (item.isVerified) {
+            return { outcome: ChannelVerificationOutcome.AlreadyVerified };
+        }
+        if ((item.verificationFailedAttempts || 0) >= MAX_VERIFICATION_ATTEMPTS) {
+            return { outcome: ChannelVerificationOutcome.TooManyAttempts };
+        }
+        if (ChannelVerification.isCodeExpired({
+            expiresAt: item.verificationCodeExpiresAt,
+        })) {
+            return { outcome: ChannelVerificationOutcome.Expired };
+        }
+        const attemptNumber = await writer.atomicIncrementColumnValueByOneAndGetValue({
+            id: data.itemId,
+            columnName: "verificationFailedAttempts",
+        });
+        /*
+         * Only reachable when requests raced past the gate above together. They
+         * are refused here rather than being given a comparison, and the request
+         * holding attempt number MAX_VERIFICATION_ATTEMPTS still burns the
+         * challenge below.
+         */
+        if (attemptNumber > MAX_VERIFICATION_ATTEMPTS) {
+            return { outcome: ChannelVerificationOutcome.TooManyAttempts };
+        }
+        const submittedHash = VerificationCode.hashCode({
+            code: String(data.code),
+            channelId: data.itemId,
+        });
+        if (!VerificationCode.isHashEqual(submittedHash, item.verificationCode || "")) {
+            /*
+             * That was the last attempt this code gets, so burn it now rather than
+             * leave a spent-but-still-valid challenge on the row. The attacker's
+             * next move has to be a resend, which costs them the cooldown and tells
+             * the victim what is happening.
+             *
+             * Done exactly once, on the attempt that exhausts the budget; every
+             * later request is turned away by the gate above without a write.
+             */
+            if (attemptNumber >= MAX_VERIFICATION_ATTEMPTS) {
+                await writer.updateOneById({
+                    id: data.itemId,
+                    props: {
+                        isRoot: true,
+                    },
+                    data: ChannelVerification.getClearedCodeFields(),
+                });
+                logger.warn(`ChannelVerification: attempt limit reached on ${writer.getModel().tableName} ${data.itemId.toString()} for user ${data.userId.toString()}; verification code invalidated`);
+            }
+            return { outcome: ChannelVerificationOutcome.IncorrectCode };
+        }
+        /*
+         * Correct. Mark verified AND clear the challenge in the same write: a
+         * used code must not remain usable, and the attempt counter goes back to
+         * zero so a later re-issue (if the row is ever un-verified) starts fresh.
+         */
+        await writer.updateOneById({
+            id: data.itemId,
+            props: {
+                isRoot: true,
+            },
+            data: Object.assign({ isVerified: true, verificationFailedAttempts: 0 }, ChannelVerification.getClearedCodeFields()),
+        });
+        return {
+            outcome: ChannelVerificationOutcome.Verified,
+            itemId: data.itemId,
+            userId: item.userId,
+            projectId: item.projectId,
+        };
+    }
+    /*
+     * The message a failed outcome is reported to the caller with.
+     *
+     * IncorrectCode and NotFound deliberately do NOT say anything the caller
+     * did not already know, and every failure is a plain BadDataException so
+     * the shape of the response does not vary with the reason either.
+     */
+    static getFailureException(outcome) {
+        switch (outcome) {
+            case ChannelVerificationOutcome.NotFound:
+                return new BadDataException("Item not found");
+            case ChannelVerificationOutcome.NotOwner:
+                return new BadDataException("Invalid user ID");
+            case ChannelVerificationOutcome.AlreadyVerified:
+                return new BadDataException("This is already verified");
+            case ChannelVerificationOutcome.Expired:
+                return new BadDataException("This verification code has expired. Please request a new code.");
+            case ChannelVerificationOutcome.TooManyAttempts:
+                return new BadDataException("Too many incorrect attempts. This verification code is no longer valid. Please request a new code.");
+            default:
+                return new BadDataException("Invalid code");
+        }
+    }
+}
+//# sourceMappingURL=ChannelVerification.js.map

package/build/dist/Server/Utils/ChannelVerification.js.map

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

package/build/dist/Server/Utils/Monitor/Criteria/IncomingRequestCriteria.js

@@ -108,26 +108,27 @@ export default class IncomingRequestCriteria {
             }
         }
         if (input.criteriaFilter.checkOn === CheckOn.RequestBody) {
-            let responseBody = input.dataToProcess.requestBody;
-            if (responseBody && typeof responseBody === Typeof.Object) {
-                responseBody = JSON.stringify(responseBody);
-            }
-            if (!responseBody) {
-                return null;
+            let requestBody = input.dataToProcess.requestBody;
+            if (requestBody && typeof requestBody === Typeof.Object) {
+                requestBody = JSON.stringify(requestBody);
             }
+            /*
+             * A request that carried no body is an empty body, not an unknown one.
+             * Normalising to "" (the same thing IncomingEmailCriteria does for the
+             * email fields) is what lets a "Not Contains" filter match a bodiless
+             * heartbeat ping - the default online criteria for this monitor type.
+             * "Contains" is unaffected: "" contains nothing.
+             */
+            const body = requestBody || "";
             // contains
             if (input.criteriaFilter.filterType === FilterType.Contains) {
-                if (value &&
-                    responseBody &&
-                    responseBody.includes(value)) {
+                if (value && body.includes(value)) {
                     return `Request body contains ${value}.`;
                 }
                 return null;
             }
             if (input.criteriaFilter.filterType === FilterType.NotContains) {
-                if (value &&
-                    responseBody &&
-                    !responseBody.includes(value)) {
+                if (value && !body.includes(value)) {
                     return `Request body does not contain ${value}.`;
                 }
                 return null;

package/build/dist/Server/Utils/Monitor/Criteria/IncomingRequestCriteria.js.map

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

package/build/dist/Server/Utils/Monitor/MonitorAlert.js

@@ -23,7 +23,7 @@ import AlertStateTimelineService from "../../Services/AlertStateTimelineService"
 import NetworkDeviceOwnerUserService from "../../Services/NetworkDeviceOwnerUserService";
 import logger from "../Logger";
 import CaptureSpan from "../Telemetry/CaptureSpan";
-import MonitorClusterContextUtil from "./MonitorClusterContext";
+import MonitorResourceContextUtil from "./MonitorResourceContext";
 import MonitorTemplateUtil from "./MonitorTemplateUtil";
 import SeriesResourceLinker from "./SeriesResourceLinker";
 import MonitorDependencySuppression from "./MonitorDependencySuppression";
@@ -198,14 +198,16 @@ export default class MonitorAlert {
             return;
         }
         /*
-         * Proxmox/Ceph monitors: resolve the monitored cluster once per
-         * evaluation (lookup-only, from the step config's clusterIdentifier)
-         * so every alert created below is attached to it. Series labels
-         * cannot supply this — they carry datapoint labels (`id`,
-         * `ceph_daemon`, `pool_id`), not cluster identity, and ungrouped
-         * templates have no series at all. No-op for other monitor types.
+         * Resolve the resources this monitor's own config names — its host,
+         * cluster, fleet, telemetry services, or the resource its metric
+         * filters scope it to — once per evaluation, so every alert created
+         * below is attached to them. Series labels cannot supply this: they
+         * only exist for grouped criteria, and most monitors (every shipped
+         * Host/Docker/Podman template, all Logs/Traces/Exceptions monitors)
+         * are ungrouped. No-op, and no round-trip, for monitor types whose
+         * config names no resource.
          */
-        const clusterContext = await MonitorClusterContextUtil.resolveClusterContextForMonitor({
+        const resourceContext = await MonitorResourceContextUtil.resolveResourceContextForMonitor({
             monitor: input.monitor,
         });
         /*
@@ -372,20 +374,21 @@ export default class MonitorAlert {
                         model: alert,
                         seriesLabels,
                         projectId: input.monitor.projectId,
+                        monitorType: input.monitor.monitorType,
                     });
                 }
                 /*
-                 * Deterministic Proxmox/Ceph/Swarm/IoT cluster link from the
-                 * monitor's step config (resolved once above). The shipped
-                 * templates for those monitor types group by datapoint labels
-                 * that carry no cluster identity, so this — not the label path
-                 * above — is what makes the per-cluster Activity tabs and badge
-                 * counts see monitor-created alerts. Runs for both grouped and
-                 * ungrouped alerts, and merges with whatever the labels resolved.
+                 * Deterministic resource link from the monitor's step config
+                 * (resolved once above). For most monitor types this — not the
+                 * label path above — is what makes the per-resource Activity
+                 * tabs and badge counts see monitor-created alerts, because
+                 * their criteria are ungrouped and emit no series labels at
+                 * all. Runs for both grouped and ungrouped alerts, and merges
+                 * with whatever the labels resolved.
                  */
-                SeriesResourceLinker.attachClusterContext({
+                SeriesResourceLinker.attachResolvedResources({
                     model: alert,
-                    clusterContext,
+                    resolved: resourceContext,
                 });
                 alert.onCallDutyPolicies =
                     ((_0 = criteriaAlert.onCallPolicyIds) === null || _0 === void 0 ? void 0 : _0.map((id) => {

package/build/dist/Server/Utils/Monitor/MonitorAlert.js.map

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

package/build/dist/Server/Utils/Monitor/MonitorIncident.js

@@ -29,7 +29,7 @@ import MonitorTemplateUtil from "./MonitorTemplateUtil";
 import MonitorDependencySuppression from "./MonitorDependencySuppression";
 import OneUptimeDate from "../../../Types/Date";
 import MonitorSummarySnapshotUtil from "../../../Utils/Monitor/MonitorSummarySnapshotUtil";
-import MonitorClusterContextUtil from "./MonitorClusterContext";
+import MonitorResourceContextUtil from "./MonitorResourceContext";
 import SeriesResourceLinker from "./SeriesResourceLinker";
 export default class MonitorIncident {
     static async checkOpenIncidentsAndCloseIfResolved(input) {
@@ -213,14 +213,16 @@ export default class MonitorIncident {
             return;
         }
         /*
-         * Proxmox/Ceph monitors: resolve the monitored cluster once per
-         * evaluation (lookup-only, from the step config's clusterIdentifier)
-         * so every incident created below is attached to it. Series labels
-         * cannot supply this — they carry datapoint labels (`id`,
-         * `ceph_daemon`, `pool_id`), not cluster identity, and ungrouped
-         * templates have no series at all. No-op for other monitor types.
+         * Resolve the resources this monitor's own config names — its host,
+         * cluster, fleet, telemetry services, or the resource its metric
+         * filters scope it to — once per evaluation, so every incident
+         * created below is attached to them. Series labels cannot supply
+         * this: they only exist for grouped criteria, and most monitors
+         * (every shipped Host/Docker/Podman template, all Logs/Traces/
+         * Exceptions monitors) are ungrouped. No-op, and no round-trip, for
+         * monitor types whose config names no resource.
          */
-        const clusterContext = await MonitorClusterContextUtil.resolveClusterContextForMonitor({
+        const resourceContext = await MonitorResourceContextUtil.resolveResourceContextForMonitor({
             monitor: input.monitor,
         });
         /*
@@ -437,18 +439,19 @@ export default class MonitorIncident {
                         model: incident,
                         seriesLabels,
                         projectId: input.monitor.projectId,
+                        monitorType: input.monitor.monitorType,
                     });
                 }
                 /*
-                 * Deterministic Proxmox/Ceph cluster link from the monitor's
-                 * step config (resolved once above). Runs for both grouped and
-                 * ungrouped incidents and merges with anything the series-label
-                 * path resolved, so the per-cluster Activity tabs always see
+                 * Deterministic resource link from the monitor's step config
+                 * (resolved once above). Runs for both grouped and ungrouped
+                 * incidents and merges with anything the series-label path
+                 * resolved, so the per-resource Activity tabs always see
                  * monitor-created incidents.
                  */
-                SeriesResourceLinker.attachClusterContext({
+                SeriesResourceLinker.attachResolvedResources({
                     model: incident,
-                    clusterContext,
+                    resolved: resourceContext,
                 });
                 incident.onCallDutyPolicies =
                     ((_6 = criteriaIncident.onCallPolicyIds) === null || _6 === void 0 ? void 0 : _6.map((id) => {