@oneuptime/common 12.0.13 → 12.0.15

package/Server/Services/GlobalSsoProjectService.ts

@@ -4,18 +4,138 @@ import Team from "../../Models/DatabaseModels/Team";
 import { LIMIT_PER_PROJECT } from "../../Types/Database/LimitMax";
 import ObjectID from "../../Types/ObjectID";
 import CreateBy from "../Types/Database/CreateBy";
-import { OnCreate, OnUpdate } from "../Types/Database/Hooks";
+import { OnCreate, OnDelete, OnUpdate } from "../Types/Database/Hooks";
 import UpdateBy from "../Types/Database/UpdateBy";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 import validateGlobalProviderProjectTeams, {
   resolveAttachmentProjectId,
 } from "../Utils/ValidateGlobalProviderProjectTeams";
+import {
+  GLOBAL_SSO_AUTHORIZATION_CACHE_TTL_MS,
+  GlobalProviderAttachments,
+  clearGlobalSsoAuthorizationCaches,
+  doAttachmentsGovernProject,
+  globalProviderCacheKey,
+  globalSsoAttachmentsCache,
+  loadAttachmentsOnce,
+} from "../Utils/GlobalSsoAuthorization";
+import DeleteBy from "../Types/Database/DeleteBy";
 
 export class Service extends DatabaseService<Model> {
   public constructor() {
     super(Model);
   }
 
+  /**
+   * Whether this provider's attachments cover `projectId`.
+   *
+   * Only consulted when the provider has `restrictToAttachedProjects` on -
+   * attachments are the PROVISIONING allow-list by default, not an access
+   * boundary, and reading them as one without the admin asking would lock
+   * existing users out of projects they legitimately reach.
+   *
+   * "No attachment rows at all" means instance-wide, matching the login
+   * router's default-all mode. "Rows exist but none are enabled" is a
+   * different answer and denies - otherwise an admin disabling the last
+   * attachment would WIDEN the provider to every project.
+   *
+   * Cached for 60s, with concurrent misses sharing one query.
+   */
+  @CaptureSpan()
+  public async doesProviderGovernProject(data: {
+    globalSsoId: ObjectID;
+    projectId: ObjectID;
+  }): Promise<boolean> {
+    const key: string = globalProviderCacheKey("sso", data.globalSsoId);
+
+    const cached: GlobalProviderAttachments | undefined =
+      globalSsoAttachmentsCache.get(key);
+
+    if (cached !== undefined) {
+      return doAttachmentsGovernProject(cached, data.projectId);
+    }
+
+    const attachments: GlobalProviderAttachments = await loadAttachmentsOnce(
+      key,
+      async (): Promise<GlobalProviderAttachments> => {
+        /*
+         * Fetched WITHOUT the isEnabled filter so a disabled row still counts
+         * as "this provider has attachments"; the enabled ones are selected
+         * out below.
+         */
+        const rows: Array<Model> = await this.findBy({
+          query: { globalSsoId: data.globalSsoId },
+          select: { _id: true, projectId: true, isEnabled: true },
+          limit: LIMIT_PER_PROJECT,
+          skip: 0,
+          props: { isRoot: true },
+        });
+
+        const loaded: GlobalProviderAttachments = {
+          hasAnyAttachmentRows: rows.length > 0,
+          enabledProjectIds: rows
+            .filter((row: Model) => {
+              return Boolean(row.isEnabled) && Boolean(row.projectId);
+            })
+            .map((row: Model) => {
+              return row.projectId!.toString();
+            }),
+        };
+
+        globalSsoAttachmentsCache.set(
+          key,
+          loaded,
+          GLOBAL_SSO_AUTHORIZATION_CACHE_TTL_MS,
+        );
+
+        return loaded;
+      },
+    );
+
+    return doAttachmentsGovernProject(attachments, data.projectId);
+  }
+
+  @CaptureSpan()
+  protected override async onBeforeDelete(
+    deleteBy: DeleteBy<Model>,
+  ): Promise<OnDelete<Model>> {
+    // Detaching a project has to take effect now, not in 60s, on this node.
+    clearGlobalSsoAuthorizationCaches();
+    return { deleteBy, carryForward: null };
+  }
+
+  /*
+   * Cleared again AFTER the write commits. A clear that runs before the row
+   * lands can be immediately re-filled with the pre-change answer by a
+   * concurrent request, handing the old attachment set another full TTL.
+   */
+  @CaptureSpan()
+  protected override async onDeleteSuccess(
+    onDelete: OnDelete<Model>,
+    _itemIdsBeforeDelete: Array<ObjectID>,
+  ): Promise<OnDelete<Model>> {
+    clearGlobalSsoAuthorizationCaches();
+    return onDelete;
+  }
+
+  @CaptureSpan()
+  protected override async onCreateSuccess(
+    _onCreate: OnCreate<Model>,
+    createdItem: Model,
+  ): Promise<Model> {
+    clearGlobalSsoAuthorizationCaches();
+    return createdItem;
+  }
+
+  @CaptureSpan()
+  protected override async onUpdateSuccess(
+    onUpdate: OnUpdate<Model>,
+    _updatedItemIds: Array<ObjectID>,
+  ): Promise<OnUpdate<Model>> {
+    clearGlobalSsoAuthorizationCaches();
+    return onUpdate;
+  }
+
   @CaptureSpan()
   protected override async onBeforeCreate(
     createBy: CreateBy<Model>,
@@ -38,6 +158,9 @@ export class Service extends DatabaseService<Model> {
       projectId,
     });
 
+    // A new attachment narrows (or widens) which projects the provider governs.
+    clearGlobalSsoAuthorizationCaches();
+
     return { createBy, carryForward: null };
   }
 
@@ -78,6 +201,8 @@ export class Service extends DatabaseService<Model> {
       }
     }
 
+    clearGlobalSsoAuthorizationCaches();
+
     return { updateBy, carryForward: null };
   }
 }

package/Server/Services/GlobalSsoService.ts

@@ -1,10 +1,142 @@
 import DatabaseService from "./DatabaseService";
 import Model from "../../Models/DatabaseModels/GlobalSso";
+import ObjectID from "../../Types/ObjectID";
+import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
+import CreateBy from "../Types/Database/CreateBy";
+import DeleteBy from "../Types/Database/DeleteBy";
+import UpdateBy from "../Types/Database/UpdateBy";
+import { OnCreate, OnDelete, OnUpdate } from "../Types/Database/Hooks";
+import {
+  GLOBAL_SSO_AUTHORIZATION_CACHE_TTL_MS,
+  GlobalProviderTrust,
+  clearGlobalSsoAuthorizationCaches,
+  globalProviderCacheKey,
+  globalSsoProviderTrustCache,
+  loadTrustOnce,
+} from "../Utils/GlobalSsoAuthorization";
 
 export class Service extends DatabaseService<Model> {
   public constructor() {
     super(Model);
   }
+
+  /**
+   * What the SSO-enforcement middleware needs to know about this provider:
+   * whether it is still usable at all, and whether the admin opted it into
+   * attachment-scoped access.
+   *
+   * Called on every authenticated request against an SSO-enforced project, so
+   * the answer is cached for 60s and concurrent misses share one query.
+   * Without this lookup, turning a provider off leaves every token it ever
+   * issued working until each one expires - up to thirty days.
+   */
+  @CaptureSpan()
+  public async getProviderTrust(
+    providerId: ObjectID,
+  ): Promise<GlobalProviderTrust> {
+    const key: string = globalProviderCacheKey("sso", providerId);
+
+    const cached: GlobalProviderTrust | undefined =
+      globalSsoProviderTrustCache.get(key);
+
+    if (cached !== undefined) {
+      return cached;
+    }
+
+    return loadTrustOnce(key, async (): Promise<GlobalProviderTrust> => {
+      const provider: Model | null = await this.findOneBy({
+        query: { _id: providerId.toString() },
+        select: {
+          _id: true,
+          isEnabled: true,
+          restrictToAttachedProjects: true,
+        },
+        props: { isRoot: true },
+      });
+
+      /*
+       * A deleted provider and a disabled one are the same answer: no. Both
+       * are cached, so a revoked provider does not cost a query per request.
+       */
+      const trust: GlobalProviderTrust = {
+        isUsable: Boolean(provider && provider.isEnabled),
+        restrictToAttachedProjects: Boolean(
+          provider && provider.restrictToAttachedProjects,
+        ),
+      };
+
+      globalSsoProviderTrustCache.set(
+        key,
+        trust,
+        GLOBAL_SSO_AUTHORIZATION_CACHE_TTL_MS,
+      );
+
+      return trust;
+    });
+  }
+
+  /*
+   * Cache invalidation runs in the SUCCESS hooks, not the before-hooks: a
+   * clear that happens before the row is written can be immediately re-filled
+   * with the pre-change answer by a concurrent request, which would hand a
+   * disabled provider another full TTL of life on the very node that served
+   * the disable. Clearing in both is deliberate - the before-hook narrows the
+   * window, the success hook closes it.
+   *
+   * These caches are per-process, so the hooks make a change immediate on the
+   * node that served it and the TTL bounds every other node.
+   */
+
+  @CaptureSpan()
+  protected override async onBeforeUpdate(
+    updateBy: UpdateBy<Model>,
+  ): Promise<OnUpdate<Model>> {
+    clearGlobalSsoAuthorizationCaches();
+    return { updateBy, carryForward: null };
+  }
+
+  @CaptureSpan()
+  protected override async onUpdateSuccess(
+    onUpdate: OnUpdate<Model>,
+    _updatedItemIds: Array<ObjectID>,
+  ): Promise<OnUpdate<Model>> {
+    clearGlobalSsoAuthorizationCaches();
+    return onUpdate;
+  }
+
+  @CaptureSpan()
+  protected override async onBeforeDelete(
+    deleteBy: DeleteBy<Model>,
+  ): Promise<OnDelete<Model>> {
+    clearGlobalSsoAuthorizationCaches();
+    return { deleteBy, carryForward: null };
+  }
+
+  @CaptureSpan()
+  protected override async onDeleteSuccess(
+    onDelete: OnDelete<Model>,
+    _itemIdsBeforeDelete: Array<ObjectID>,
+  ): Promise<OnDelete<Model>> {
+    clearGlobalSsoAuthorizationCaches();
+    return onDelete;
+  }
+
+  @CaptureSpan()
+  protected override async onBeforeCreate(
+    createBy: CreateBy<Model>,
+  ): Promise<OnCreate<Model>> {
+    clearGlobalSsoAuthorizationCaches();
+    return { createBy, carryForward: null };
+  }
+
+  @CaptureSpan()
+  protected override async onCreateSuccess(
+    _onCreate: OnCreate<Model>,
+    createdItem: Model,
+  ): Promise<Model> {
+    clearGlobalSsoAuthorizationCaches();
+    return createdItem;
+  }
 }
 
 export default new Service();

package/Server/Services/LogAggregationService.ts

@@ -282,6 +282,7 @@ export class LogAggregationService {
       getQuerySettings({
         maxExecutionTimeInSeconds: 45,
         timeoutOverflowMode: "break",
+        boundScanMemory: true,
         additionalSettings: { optimize_use_projections: 1 },
       }),
     );
@@ -392,6 +393,7 @@ export class LogAggregationService {
       getQuerySettings({
         maxExecutionTimeInSeconds: 45,
         timeoutOverflowMode: "break",
+        boundScanMemory: true,
       }),
     );
 
@@ -634,6 +636,7 @@ export class LogAggregationService {
       getQuerySettings({
         maxExecutionTimeInSeconds: 45,
         timeoutOverflowMode: "break",
+        boundScanMemory: true,
       }),
     );
 
@@ -714,6 +717,7 @@ export class LogAggregationService {
       getQuerySettings({
         maxExecutionTimeInSeconds: 45,
         timeoutOverflowMode: "break",
+        boundScanMemory: true,
       }),
     );
 
@@ -783,6 +787,7 @@ export class LogAggregationService {
       getQuerySettings({
         maxExecutionTimeInSeconds: 45,
         timeoutOverflowMode: "break",
+        boundScanMemory: true,
       }),
     );
 

package/Server/Services/PushNotificationService.ts

@@ -26,6 +26,7 @@ import UserPush from "../../Models/DatabaseModels/UserPush";
 import PushNotificationLog from "../../Models/DatabaseModels/PushNotificationLog";
 import PushNotificationLogService from "./PushNotificationLogService";
 import PushStatus from "../../Types/PushNotification/PushStatus";
+import AndroidNotificationChannel from "../../Types/PushNotification/AndroidNotificationChannel";
 
 /*
  * The push services the browsers actually use. A Web Push subscription is a
@@ -67,6 +68,43 @@ export interface PushNotificationOptions {
   teamId?: ObjectID | undefined;
 }
 
+/*
+ * What Expo needs to be told for a notification to ring through a silenced
+ * handset. The two platforms disagree about where the answer lives, so this is
+ * computed once and reused by both the direct-SDK and relay send paths.
+ *
+ * iOS reads the payload: a `sound` object with `critical: true` plus
+ * `interruptionLevel: "critical"` is what makes APNs ignore the ringer switch
+ * and Focus, and it is refused unless the app carries Apple's critical-alert
+ * entitlement.
+ *
+ * Android ignores all of that and reads the CHANNEL. Sound, importance and Do
+ * Not Disturb bypass are baked into the channel when the app creates it and
+ * cannot be raised by a payload, so the only lever the server has is which
+ * channel id it names.
+ */
+export type ExpoPushSound =
+  | string
+  | null
+  | {
+      critical?: boolean;
+      name?: string | null;
+      volume?: number;
+    };
+
+export type ExpoInterruptionLevel =
+  | "active"
+  | "critical"
+  | "passive"
+  | "time-sensitive";
+
+export interface ExpoDeliveryOptions {
+  channelId: string;
+  sound: ExpoPushSound;
+  priority: "high";
+  interruptionLevel?: ExpoInterruptionLevel;
+}
+
 export default class PushNotificationService {
   public static isWebPushInitialized = false;
   private static expoClient: Expo = new Expo(
@@ -408,6 +446,57 @@ export default class PushNotificationService {
     }
   }
 
+  /*
+   * Volume is pinned rather than exposed as a setting. A critical alert exists
+   * to wake somebody, and a responder who has already opted this device in and
+   * granted the OS permission has not asked to be woken quietly.
+   */
+  public static readonly CRITICAL_ALERT_VOLUME: number = 1;
+
+  public static getExpoDeliveryOptions(
+    message: PushNotificationMessage,
+    deviceType: PushDeviceType,
+  ): ExpoDeliveryOptions {
+    const isAndroid: boolean = deviceType === PushDeviceType.Android;
+    const isCritical: boolean = Boolean(message.isCriticalAlert);
+
+    /*
+     * iOS has no channels, so "default" here is the payload's own sound rather
+     * than a channel id. Android without the critical flag stays on
+     * oncall_high, which is what every push has used until now.
+     */
+    const channelId: string = isAndroid
+      ? isCritical
+        ? AndroidNotificationChannel.Critical
+        : AndroidNotificationChannel.High
+      : "default";
+
+    if (!isCritical) {
+      return {
+        channelId: channelId,
+        sound: "default",
+        priority: "high",
+      };
+    }
+
+    return {
+      channelId: channelId,
+      /*
+       * Sent to Android too, and harmlessly ignored there. Expo forwards it to
+       * APNs where it is the whole mechanism, and to FCM where the channel has
+       * already decided the sound; keeping one shape avoids a per-platform
+       * branch that could silently drop the iOS half.
+       */
+      sound: {
+        critical: true,
+        name: "default",
+        volume: PushNotificationService.CRITICAL_ALERT_VOLUME,
+      },
+      priority: "high",
+      interruptionLevel: "critical",
+    };
+  }
+
   private static async sendExpoPushNotification(
     expoPushToken: string,
     message: PushNotificationMessage,
@@ -430,8 +519,10 @@ export default class PushNotificationService {
       dataPayload["url"] = message.url || message.clickAction || "";
     }
 
-    const channelId: string =
-      deviceType === PushDeviceType.Android ? "oncall_high" : "default";
+    const delivery: ExpoDeliveryOptions = this.getExpoDeliveryOptions(
+      message,
+      deviceType,
+    );
 
     // If EXPO_ACCESS_TOKEN is not set, relay through the push notification gateway
     if (!ExpoAccessToken) {
@@ -439,7 +530,7 @@ export default class PushNotificationService {
         expoPushToken,
         message,
         dataPayload,
-        channelId,
+        delivery,
         deviceType,
       );
       return;
@@ -452,9 +543,12 @@ export default class PushNotificationService {
         title: message.title,
         body: message.body,
         data: dataPayload,
-        sound: "default",
-        priority: "high",
-        channelId: channelId,
+        sound: delivery.sound,
+        priority: delivery.priority,
+        channelId: delivery.channelId,
+        ...(delivery.interruptionLevel
+          ? { interruptionLevel: delivery.interruptionLevel }
+          : {}),
       };
 
       const tickets: ExpoPushTicket[] =
@@ -500,7 +594,7 @@ export default class PushNotificationService {
     expoPushToken: string,
     message: PushNotificationMessage,
     dataPayload: { [key: string]: string },
-    channelId: string,
+    delivery: ExpoDeliveryOptions,
     deviceType: PushDeviceType,
   ): Promise<void> {
     logger.info(
@@ -516,9 +610,19 @@ export default class PushNotificationService {
             title: message.title || "",
             body: message.body || "",
             data: dataPayload,
-            sound: "default",
-            priority: "high",
-            channelId: channelId,
+            /*
+             * The relay re-sends exactly what it is given, so a critical page
+             * that loses its sound object here arrives on the responder's
+             * phone as an ordinary silent notification. That is the failure
+             * this feature exists to prevent, so the whole delivery shape
+             * crosses the wire rather than the channel id alone.
+             */
+            sound: delivery.sound,
+            priority: delivery.priority,
+            channelId: delivery.channelId,
+            ...(delivery.interruptionLevel
+              ? { interruptionLevel: delivery.interruptionLevel }
+              : {}),
           },
         });
 
@@ -552,9 +656,10 @@ export default class PushNotificationService {
     title?: string;
     body?: string;
     data?: { [key: string]: string };
-    sound?: string;
+    sound?: ExpoPushSound;
     priority?: string;
     channelId?: string;
+    interruptionLevel?: ExpoInterruptionLevel;
   }): Promise<void> {
     if (!ExpoAccessToken) {
       throw new Error(
@@ -562,14 +667,24 @@ export default class PushNotificationService {
       );
     }
 
+    /*
+     * `sound: null` is a caller asking for a silent notification and has to
+     * survive, so the fallback tests for undefined rather than falsiness.
+     */
+    const sound: ExpoPushSound =
+      data.sound === undefined ? "default" : data.sound;
+
     const expoPushMessage: ExpoPushMessage = {
       to: data.to,
       title: data.title || "",
       body: data.body || "",
       data: data.data || {},
-      sound: (data.sound as "default" | null) || "default",
+      sound: sound,
       priority: (data.priority as "default" | "normal" | "high") || "high",
       channelId: data.channelId || "default",
+      ...(data.interruptionLevel
+        ? { interruptionLevel: data.interruptionLevel }
+        : {}),
     };
 
     const tickets: ExpoPushTicket[] =

package/Server/Services/TeamMemberService.ts

@@ -10,6 +10,7 @@ import UpdateBy from "../Types/Database/UpdateBy";
 import Errors from "../Utils/Errors";
 import logger, { LogAttributes } from "../Utils/Logger";
 import ProductAnalytics from "../Utils/ProductAnalytics";
+import UserRegistrationToken from "../Utils/UserRegistrationToken";
 import AccessTokenService from "./AccessTokenService";
 import BillingService from "./BillingService";
 import DatabaseService from "./DatabaseService";
@@ -166,8 +167,23 @@ export class TeamMemberService extends DatabaseService<TeamMember> {
         ? (createBy.miscDataProps["name"] as string).trim()
         : undefined;
 
-      let user: User | null = await UserService.findByEmail(email, {
-        isRoot: true,
+      /*
+       * `password` comes back too, because whether this person has finished
+       * registering decides both which link the invitation carries and whether
+       * that link needs a registration token. UserService.findByEmail selects
+       * only the id, so it cannot answer that.
+       */
+      let user: User | null = await UserService.findOneBy({
+        query: {
+          email: email,
+        },
+        select: {
+          _id: true,
+          password: true,
+        },
+        props: {
+          isRoot: true,
+        },
       });
 
       let isNewUser: boolean = false;
@@ -228,6 +244,39 @@ export class TeamMemberService extends DatabaseService<TeamMember> {
         const host: Hostname = await DatabaseConfig.getHost();
         const httpProtocol: Protocol = await DatabaseConfig.getHttpProtocol();
 
+        /*
+         * "Still has to register", not "we just created the row". Someone
+         * invited to a second project before they ever signed up already has a
+         * user row and still has no password, and used to be sent the sign-in
+         * link — which they could not use, having no password to sign in with.
+         */
+        const needsRegistration: boolean = isNewUser || !user.password;
+
+        /*
+         * The token is what lets the recipient claim this account, so it exists
+         * only on the link inside this email and only for someone who has not
+         * registered yet. An already-registered invitee gets the plain link;
+         * they sign in instead, and minting a claim token for an account that
+         * cannot be claimed would just be a spare key lying around.
+         */
+        const registerLink: string = needsRegistration
+          ? (
+              await UserRegistrationToken.generateRegistrationLink({
+                userId: user.id!,
+                email: email,
+              })
+            ).toString()
+          : URL.fromString(
+              new URL(
+                httpProtocol,
+                host,
+                new Route(AccountsRoute.toString()),
+              ).toString(),
+            )
+              .addRoute("/register")
+              .addQueryParam("email", email.toString(), true)
+              .toString();
+
         MailService.sendMail(
           {
             toEmail: email,
@@ -240,17 +289,8 @@ export class TeamMemberService extends DatabaseService<TeamMember> {
                   new Route(AccountsRoute.toString()),
                 ).toString(),
               ).toString(),
-              registerLink: URL.fromString(
-                new URL(
-                  httpProtocol,
-                  host,
-                  new Route(AccountsRoute.toString()),
-                ).toString(),
-              )
-                .addRoute("/register")
-                .addQueryParam("email", email.toString(), true)
-                .toString(),
-              isNewUser: isNewUser.toString(),
+              registerLink: registerLink,
+              isNewUser: needsRegistration.toString(),
               /*
                * An auto-accepted member has nothing left to accept, so the
                * template drops the "sign in to accept your invitation" framing