@oneuptime/common 13.0.7 → 14.0.0

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

@@ -10,7 +10,14 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 import DatabaseService from "./DatabaseService";
 import Model from "../../Models/DatabaseModels/RumSessionPin";
 import BadDataException from "../../Types/Exception/BadDataException";
+import Exception from "../../Types/Exception/Exception";
+import NotAuthorizedException from "../../Types/Exception/NotAuthorizedException";
+import ObjectID from "../../Types/ObjectID";
 import OneUptimeDate from "../../Types/Date";
+import DatabaseRequestType from "../Types/BaseDatabase/DatabaseRequestType";
+import CreatePermission from "../Types/Database/Permissions/CreatePermission";
+import ReadPermission from "../Types/Database/Permissions/ReadPermission";
+import TablePermission from "../Types/Database/Permissions/TablePermission";
 import QueryHelper from "../Types/Database/QueryHelper";
 import PostgresErrorTranslator from "../Utils/Database/PostgresErrorTranslator";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
@@ -24,6 +31,33 @@ import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 const isUniqueViolation = (error) => {
     return PostgresErrorTranslator.isUniqueViolation(error);
 };
+/*
+ * ObjectID.equals compares the strings as given, but a UUID is the same
+ * project in any case - and the tenant an API key resolves to comes back
+ * from Postgres in lower case whatever the client typed.
+ */
+const isSameId = (a, b) => {
+    return a.toString().toLowerCase() === b.toString().toLowerCase();
+};
+/*
+ * An id from the request body as a plain ObjectID. The body is deserialized
+ * generically, so a field typed as an id can arrive as some other object.
+ */
+const toPlainId = (value, field) => {
+    if (value === undefined || value === null) {
+        return undefined;
+    }
+    if (value instanceof ObjectID || typeof value === "string") {
+        const id = value.toString();
+        if (ObjectID.isValidUUID(id)) {
+            return new ObjectID(id);
+        }
+    }
+    throw new BadDataException(`${field} must be an ID.`);
+};
+const isInternalCaller = (props) => {
+    return Boolean(props.isRoot || props.isMasterAdmin);
+};
 /*
  * Pins that keep a session recording past its retention window.
  *
@@ -79,22 +113,48 @@ export class Service extends DatabaseService {
      *
      * The pre-check handles the common case and the catch closes the race
      * between two concurrent pins of the same session.
+     *
+     * Both lookups read as root, so neither may run until the caller has
+     * passed the create check that super.create would otherwise have been the
+     * first to apply, and what they find is handed back only as far as the
+     * caller could have read it.
      */
     async create(createBy) {
-        const projectId = createBy.data.projectId;
-        const rumApplicationId = createBy.data.rumApplicationId;
-        const sessionId = createBy.data.sessionId;
-        if (!projectId || !rumApplicationId || !sessionId) {
+        this.assertCallerMayCreatePins(createBy.props);
+        if (!isInternalCaller(createBy.props)) {
+            /*
+             * The database keeps these for itself; a request does not set them.
+             *
+             * Cleared rather than deleted: `createBy.data` is a live model instance,
+             * and the column-metadata lookups downstream used to enumerate the own
+             * keys of whichever instance reached them first and cache that as the
+             * CLASS's column list - so deleting `_id` off this instance taught the
+             * whole process that RumSessionPin has no id, and every later response
+             * for it lost one. TableColumn.ts no longer reads the caller's instance
+             * (see CanonicalModelInstance.ts), so this is defence in depth. An
+             * unset column holds `undefined` anyway, which TypeORM and the write
+             * path treat exactly as an absent key - the save is still an INSERT.
+             */
+            const databaseManagedColumns = [
+                "_id",
+                "createdAt",
+                "updatedAt",
+                "deletedAt",
+                "version",
+            ];
+            for (const columnName of databaseManagedColumns) {
+                createBy.data[columnName] =
+                    undefined;
+            }
+        }
+        const pinKey = this.resolvePinKey(createBy);
+        if (!pinKey) {
             /* Let onBeforeCreate produce the specific validation message. */
             return await super.create(createBy);
         }
-        const existingPin = await this.getPinForSession({
-            projectId: projectId,
-            rumApplicationId: rumApplicationId,
-            sessionId: sessionId,
-        });
+        const existingPin = await this.getPinForSession(pinKey);
         if (existingPin) {
-            return existingPin;
+            return await this.presentExistingPin(existingPin, pinKey, createBy.props);
         }
         try {
             return await super.create(createBy);
@@ -103,17 +163,136 @@ export class Service extends DatabaseService {
             if (!isUniqueViolation(err)) {
                 throw err;
             }
-            const racedPin = await this.getPinForSession({
-                projectId: projectId,
-                rumApplicationId: rumApplicationId,
-                sessionId: sessionId,
-            });
+            const racedPin = await this.getPinForSession(pinKey);
             if (racedPin) {
-                return racedPin;
+                return await this.presentExistingPin(racedPin, pinKey, createBy.props);
             }
             throw err;
         }
     }
+    /*
+     * The table half of ModelPermission.checkCreatePermissions: signed in or
+     * holding an API key, and granted something on the model's create list in
+     * the tenant. The column half stays with super.create, which runs it after
+     * onBeforeCreate has stripped the fields it rewrites; the idempotent path
+     * writes no columns for it to judge.
+     */
+    assertCallerMayCreatePins(props) {
+        if (isInternalCaller(props)) {
+            return;
+        }
+        CreatePermission.checkCreateBlockPermissions(Model, props);
+        TablePermission.checkTableLevelPermissions(Model, props, DatabaseRequestType.Create);
+    }
+    /*
+     * The (projectId, rumApplicationId, sessionId) this request would insert,
+     * which is therefore what both lookups must search - or null when a part
+     * is missing, so that onBeforeCreate can say which. The lookups are
+     * queries, so every part has to be a plain id or string.
+     *
+     * projectId is the one super.create will write: the caller's tenant when
+     * there is one, otherwise the projectId an internal caller passed. A
+     * request naming any other project is refused, because the caller's
+     * grants were checked in the tenant and nowhere else; internal callers
+     * keep DatabaseService's rule that the tenant replaces it.
+     *
+     * The project and the application can also be named through the `project`
+     * and `rumApplication` relations. Each shares its scalar's column and wins
+     * over it when TypeORM saves, so a relation that disagrees is refused and
+     * both are dropped, leaving the scalars as the only thing saved.
+     */
+    resolvePinKey(createBy) {
+        var _a, _b;
+        const props = createBy.props;
+        const isInternal = isInternalCaller(props);
+        const claimedProjectId = toPlainId(createBy.data.projectId, "projectId");
+        const rumApplicationId = toPlainId(createBy.data.rumApplicationId, "rumApplicationId");
+        const rawSessionId = createBy.data.sessionId;
+        if (rawSessionId !== undefined &&
+            rawSessionId !== null &&
+            typeof rawSessionId !== "string") {
+            throw new BadDataException("sessionId must be a string.");
+        }
+        const sessionId = typeof rawSessionId === "string" ? rawSessionId : undefined;
+        const projectRelationId = toPlainId((_a = createBy.data.project) === null || _a === void 0 ? void 0 : _a._id, "project");
+        const applicationRelationId = toPlainId((_b = createBy.data.rumApplication) === null || _b === void 0 ? void 0 : _b._id, "rumApplication");
+        delete createBy.data.project;
+        delete createBy.data.rumApplication;
+        const projectId = isInternal
+            ? props.tenantId || claimedProjectId
+            : props.tenantId;
+        const projectClaims = [];
+        if (projectRelationId) {
+            projectClaims.push(projectRelationId);
+        }
+        if (claimedProjectId && !isInternal) {
+            projectClaims.push(claimedProjectId);
+        }
+        for (const projectClaim of projectClaims) {
+            if (!projectId || !isSameId(projectClaim, projectId)) {
+                throw isInternal
+                    ? new BadDataException("project does not match projectId.")
+                    : new NotAuthorizedException("You are not authorized to pin recordings in this project.");
+            }
+        }
+        if (applicationRelationId &&
+            !(rumApplicationId && isSameId(applicationRelationId, rumApplicationId))) {
+            throw new BadDataException("rumApplication does not match rumApplicationId.");
+        }
+        if (!claimedProjectId || !projectId || !rumApplicationId || !sessionId) {
+            return null;
+        }
+        createBy.data.projectId = projectId;
+        createBy.data.rumApplicationId = rumApplicationId;
+        return {
+            projectId: projectId,
+            rumApplicationId: rumApplicationId,
+            sessionId: sessionId,
+        };
+    }
+    /*
+     * An existing pin was read as root, and passing the create check says
+     * nothing about reading it: CreateRumSessionReplay, the ingest grant, is
+     * on the create list but not the read list, and a team can block reads
+     * alone. Such a caller learns that the recording is pinned, which is all
+     * pinning it again needs, and nothing that somebody else wrote on the pin.
+     */
+    async presentExistingPin(pin, pinKey, props) {
+        if (await this.callerMayReadPins(props)) {
+            return pin;
+        }
+        /*
+         * Not even the pin's id: it is what the update and delete endpoints
+         * take, and this caller could not have listed it.
+         */
+        const acknowledgement = new Model();
+        acknowledgement.projectId = pinKey.projectId;
+        acknowledgement.rumApplicationId = pinKey.rumApplicationId;
+        acknowledgement.sessionId = pinKey.sessionId;
+        return acknowledgement;
+    }
+    /*
+     * The gates a read of this table applies, answered instead of thrown: the
+     * read block list (label-scoped blocks included, which this model cannot
+     * narrow to rows and so refuses outright) and the read list itself. Any
+     * refusal, whatever its type, means the caller does not get the pin.
+     */
+    async callerMayReadPins(props) {
+        if (isInternalCaller(props)) {
+            return true;
+        }
+        try {
+            await ReadPermission.checkReadBlockPermission(Model, {}, props);
+            TablePermission.checkTableLevelPermissions(Model, props, DatabaseRequestType.Read);
+        }
+        catch (err) {
+            if (err instanceof Exception) {
+                return false;
+            }
+            throw err;
+        }
+        return true;
+    }
     /* Null when the recording is not pinned. */
     async getPinForSession(data) {
         return await this.findOneBy({
@@ -124,6 +303,9 @@ export class Service extends DatabaseService {
             },
             select: {
                 _id: true,
+                projectId: true,
+                rumApplicationId: true,
+                sessionId: true,
                 reason: true,
                 incidentId: true,
                 alertId: true,

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

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

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

@@ -7,8 +7,10 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+import crypto from "crypto";
 import DatabaseConfig from "../DatabaseConfig";
 import { EncryptionSecret } from "../EnvironmentConfig";
+import EditionEnforcement from "../Utils/EditionEnforcement";
 import logger from "../Utils/Logger";
 import DatabaseService from "./DatabaseService";
 import MailService from "./MailService";
@@ -22,7 +24,6 @@ import EmailTemplateType from "../../Types/Email/EmailTemplateType";
 import LIMIT_MAX from "../../Types/Database/LimitMax";
 import HashedString from "../../Types/HashedString";
 import BadDataException from "../../Types/Exception/BadDataException";
-import ObjectID from "../../Types/ObjectID";
 import Model from "../../Models/DatabaseModels/StatusPagePrivateUser";
 export class Service extends DatabaseService {
     constructor() {
@@ -164,8 +165,10 @@ export class Service extends DatabaseService {
         /*
          * SCIM and admin-created users must follow the page's login policy too.
          * Do not create a password-reset credential when only SSO can be used.
+         * On the Community Edition there is no SSO login for status pages, so a
+         * leftover requirement is not enforced and the user gets a password link.
          */
-        if (statusPage.requireSsoForLogin) {
+        if (EditionEnforcement.isSsoRequired(statusPage.requireSsoForLogin)) {
             return createdItem;
         }
         /*
@@ -180,7 +183,8 @@ export class Service extends DatabaseService {
          * Same split as `/status-page-api/forgot-password`: the digest is
          * persisted, the raw token is only ever mailed.
          */
-        const token = ObjectID.generate().toString();
+        // A bearer secret: from the CSPRNG, never ObjectID's non-crypto fallback.
+        const token = crypto.randomUUID();
         const hashedToken = await HashedString.hashValue(token, EncryptionSecret);
         await this.updateOneById({
             id: createdItem.id,

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

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

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

@@ -10,6 +10,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 import DatabaseConfig from "../DatabaseConfig";
 import InMemoryTTLCache from "../Infrastructure/InMemoryTTLCache";
 import CookieUtil from "../Utils/Cookie";
+import EditionEnforcement from "../Utils/EditionEnforcement";
 import JSONWebToken from "../Utils/JsonWebToken";
 import logger from "../Utils/Logger";
 import ProductAnalytics from "../Utils/ProductAnalytics";
@@ -62,6 +63,13 @@ import StatusPageGroupService from "./StatusPageGroupService";
 import StatusPageGroupTreeUtil from "../../Utils/StatusPage/GroupTree";
 import StatusPageReportTreeUtil from "../../Utils/StatusPage/Report";
 import StatusPageReportPeriodUtil from "../../Utils/StatusPage/ReportPeriod";
+/*
+ * The status page column that holds its SSO requirement: the one
+ * onFindSuccess masks and onBeforeUpdate guards while SSO is not active.
+ */
+export const STATUS_PAGE_SSO_REQUIREMENT_COLUMNS = [
+    "requireSsoForLogin",
+];
 export class Service extends DatabaseService {
     constructor() {
         super(StatusPage);
@@ -186,6 +194,28 @@ export class Service extends DatabaseService {
         }
         return this.getDefaultEmailFooterText();
     }
+    /*
+     * While SSO is not active a status page's SSO requirement is not enforced:
+     * on the Community Edition (status page SSO login is part of the
+     * Enterprise Edition), and on an Enterprise install whose license is
+     * lapsed or does not include SSO (the SSO routes refuse). Reads made for a
+     * caller then report the EFFECTIVE value: not required. Internal (root)
+     * reads and the stored row keep the real value, and onBeforeUpdate keeps a
+     * caller from writing the masked value back, so running the Enterprise
+     * Edition with a valid license (or in its trial or grace period) again
+     * restores enforcement exactly as configured. The public master-page route
+     * reads as root and applies the same rule itself.
+     */
+    async onFindSuccess(onFind, items) {
+        if (EditionEnforcement.shouldMaskSsoRequirementOnRead(onFind.findBy.props)) {
+            for (const item of items) {
+                if (item.requireSsoForLogin !== undefined) {
+                    item.requireSsoForLogin = false;
+                }
+            }
+        }
+        return Object.assign(Object.assign({}, onFind), { carryForward: items });
+    }
     async onBeforeCreate(createBy) {
         var _a, _b;
         if (!createBy.data.projectId) {
@@ -536,6 +566,25 @@ export class Service extends DatabaseService {
         }
         return false;
     }
+    /**
+     * Per-monitor, per-day status durations for this status page's bars.
+     *
+     * This is what the uptime bars are painted from. It exists because the raw
+     * row fetch below is capped at LIMIT_MAX across EVERY monitor on the page,
+     * sorted newest-first - a bound that silently destroyed history. Measured
+     * on a real page: 254,550 rows matched the window, 10,000 came back, and
+     * three flapping monitors held 9,995 of those slots, starving the quiet
+     * monitors out entirely. See MonitorStatusTimelineService for the full
+     * account and for the traps in the SQL.
+     */
+    async getUptimeDailyAggregateForStatusPage(data) {
+        return await MonitorStatusTimelineService.getDailyUptimeAggregate({
+            monitorIds: data.monitorIds,
+            startDate: data.startDate,
+            endDate: data.endDate,
+            timezone: data.timezone,
+        });
+    }
     async getMonitorStatusTimelineForStatusPage(data) {
         const startDate = data.startDate;
         const endDate = data.endDate;
@@ -715,6 +764,16 @@ export class Service extends DatabaseService {
             .toString();
     }
     async onBeforeUpdate(updateBy) {
+        /*
+         * While SSO is not active this caller only ever read the requirement as
+         * off (see onFindSuccess), so a write of it must not switch the stored
+         * requirement off, or set one nobody could see. Drops or refuses it.
+         */
+        EditionEnforcement.guardSsoRequirementWrite({
+            props: updateBy.props,
+            data: updateBy.data,
+            columns: STATUS_PAGE_SSO_REQUIREMENT_COLUMNS,
+        });
         // is enabling SMS subscribers.
         if (updateBy.data.enableSmsSubscribers) {
             const statusPagesToBeUpdated = await this.findBy({
@@ -1353,6 +1412,12 @@ __decorate([
     __metadata("design:paramtypes", [String]),
     __metadata("design:returntype", Promise)
 ], Service.prototype, "isMcpServerEnabled", null);
+__decorate([
+    CaptureSpan(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Array]),
+    __metadata("design:returntype", Promise)
+], Service.prototype, "onFindSuccess", null);
 __decorate([
     CaptureSpan(),
     __metadata("design:type", Function),
@@ -1393,6 +1458,12 @@ __decorate([
     __metadata("design:paramtypes", [Object]),
     __metadata("design:returntype", Promise)
 ], Service.prototype, "hasReadAccess", null);
+__decorate([
+    CaptureSpan(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Promise)
+], Service.prototype, "getUptimeDailyAggregateForStatusPage", null);
 __decorate([
     CaptureSpan(),
     __metadata("design:type", Function),