@oneuptime/common 11.0.1 → 11.0.3

package/Models/DatabaseModels/ScheduledMaintenance.ts

@@ -1,10 +1,14 @@
+import CephCluster from "./CephCluster";
 import DockerHost from "./DockerHost";
+import PodmanHost from "./PodmanHost";
 import Host from "./Host";
 import KubernetesCluster from "./KubernetesCluster";
 import Label from "./Label";
 import Monitor from "./Monitor";
 import MonitorStatus from "./MonitorStatus";
 import Project from "./Project";
+import ProxmoxCluster from "./ProxmoxCluster";
+import DockerSwarmCluster from "./DockerSwarmCluster";
 import ScheduledMaintenanceState from "./ScheduledMaintenanceState";
 import Service from "./Service";
 import StatusPage from "./StatusPage";
@@ -652,6 +656,222 @@ export default class ScheduledMaintenance extends BaseModel {
   })
   public dockerHosts?: Array<DockerHost> = undefined;
 
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ScheduledMaintenanceAdmin,
+      Permission.ScheduledMaintenanceMember,
+      Permission.CreateProjectScheduledMaintenance,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.ScheduledMaintenanceAdmin,
+      Permission.ScheduledMaintenanceMember,
+      Permission.ScheduledMaintenanceViewer,
+      Permission.ReadProjectScheduledMaintenance,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ScheduledMaintenanceAdmin,
+      Permission.ScheduledMaintenanceMember,
+      Permission.EditProjectScheduledMaintenance,
+    ],
+  })
+  @TableColumn({
+    required: false,
+    type: TableColumnType.EntityArray,
+    modelType: PodmanHost,
+    title: "Podman Hosts",
+    description: "List of Podman hosts affected by this event.",
+  })
+  @ManyToMany(
+    () => {
+      return PodmanHost;
+    },
+    { eager: false },
+  )
+  @JoinTable({
+    name: "ScheduledMaintenancePodmanHost",
+    inverseJoinColumn: {
+      name: "podmanHostId",
+      referencedColumnName: "_id",
+    },
+    joinColumn: {
+      name: "scheduledMaintenanceId",
+      referencedColumnName: "_id",
+    },
+  })
+  public podmanHosts?: Array<PodmanHost> = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ScheduledMaintenanceAdmin,
+      Permission.ScheduledMaintenanceMember,
+      Permission.CreateProjectScheduledMaintenance,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.ScheduledMaintenanceAdmin,
+      Permission.ScheduledMaintenanceMember,
+      Permission.ScheduledMaintenanceViewer,
+      Permission.ReadProjectScheduledMaintenance,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ScheduledMaintenanceAdmin,
+      Permission.ScheduledMaintenanceMember,
+      Permission.EditProjectScheduledMaintenance,
+    ],
+  })
+  @TableColumn({
+    required: false,
+    type: TableColumnType.EntityArray,
+    modelType: ProxmoxCluster,
+    title: "Proxmox Clusters",
+    description: "List of Proxmox clusters affected by this event.",
+  })
+  @ManyToMany(
+    () => {
+      return ProxmoxCluster;
+    },
+    { eager: false },
+  )
+  @JoinTable({
+    name: "ScheduledMaintenanceProxmoxCluster",
+    inverseJoinColumn: {
+      name: "proxmoxClusterId",
+      referencedColumnName: "_id",
+    },
+    joinColumn: {
+      name: "scheduledMaintenanceId",
+      referencedColumnName: "_id",
+    },
+  })
+  public proxmoxClusters?: Array<ProxmoxCluster> = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ScheduledMaintenanceAdmin,
+      Permission.ScheduledMaintenanceMember,
+      Permission.CreateProjectScheduledMaintenance,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.ScheduledMaintenanceAdmin,
+      Permission.ScheduledMaintenanceMember,
+      Permission.ScheduledMaintenanceViewer,
+      Permission.ReadProjectScheduledMaintenance,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ScheduledMaintenanceAdmin,
+      Permission.ScheduledMaintenanceMember,
+      Permission.EditProjectScheduledMaintenance,
+    ],
+  })
+  @TableColumn({
+    required: false,
+    type: TableColumnType.EntityArray,
+    modelType: DockerSwarmCluster,
+    title: "Docker Swarm Clusters",
+    description: "List of Docker Swarm clusters affected by this event.",
+  })
+  @ManyToMany(
+    () => {
+      return DockerSwarmCluster;
+    },
+    { eager: false },
+  )
+  @JoinTable({
+    name: "ScheduledMaintenanceDockerSwarmCluster",
+    inverseJoinColumn: {
+      name: "dockerSwarmClusterId",
+      referencedColumnName: "_id",
+    },
+    joinColumn: {
+      name: "scheduledMaintenanceId",
+      referencedColumnName: "_id",
+    },
+  })
+  public dockerSwarmClusters?: Array<DockerSwarmCluster> = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ScheduledMaintenanceAdmin,
+      Permission.ScheduledMaintenanceMember,
+      Permission.CreateProjectScheduledMaintenance,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.ScheduledMaintenanceAdmin,
+      Permission.ScheduledMaintenanceMember,
+      Permission.ScheduledMaintenanceViewer,
+      Permission.ReadProjectScheduledMaintenance,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ScheduledMaintenanceAdmin,
+      Permission.ScheduledMaintenanceMember,
+      Permission.EditProjectScheduledMaintenance,
+    ],
+  })
+  @TableColumn({
+    required: false,
+    type: TableColumnType.EntityArray,
+    modelType: CephCluster,
+    title: "Ceph Clusters",
+    description: "List of Ceph clusters affected by this event.",
+  })
+  @ManyToMany(
+    () => {
+      return CephCluster;
+    },
+    { eager: false },
+  )
+  @JoinTable({
+    name: "ScheduledMaintenanceCephCluster",
+    inverseJoinColumn: {
+      name: "cephClusterId",
+      referencedColumnName: "_id",
+    },
+    joinColumn: {
+      name: "scheduledMaintenanceId",
+      referencedColumnName: "_id",
+    },
+  })
+  public cephClusters?: Array<CephCluster> = undefined;
+
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,

package/Models/DatabaseModels/ScheduledMaintenanceLabelRule.ts

@@ -754,6 +754,44 @@ export default class ScheduledMaintenanceLabelRule extends BaseModel {
   })
   public inheritLabelsFromDockerHosts?: boolean = undefined;
 
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.CreateScheduledMaintenanceLabelRule,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.ScheduledMaintenanceAdmin,
+      Permission.ScheduledMaintenanceMember,
+      Permission.ScheduledMaintenanceViewer,
+      Permission.ReadScheduledMaintenanceLabelRule,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.EditScheduledMaintenanceLabelRule,
+    ],
+  })
+  @TableColumn({
+    required: false,
+    type: TableColumnType.Boolean,
+    title: "Inherit Labels From Podman Hosts",
+    description:
+      "When this rule matches, also copy every label of the event's affected Podman hosts onto the event.",
+    defaultValue: false,
+    isDefaultValueColumn: true,
+  })
+  @Column({
+    type: ColumnType.Boolean,
+    nullable: false,
+    default: false,
+  })
+  public inheritLabelsFromPodmanHosts?: boolean = undefined;
+
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,

package/Models/DatabaseModels/ScheduledMaintenanceOwnerRule.ts

@@ -842,6 +842,44 @@ export default class ScheduledMaintenanceOwnerRule extends BaseModel {
   })
   public inheritOwnersFromDockerHosts?: boolean = undefined;
 
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.CreateScheduledMaintenanceOwnerRule,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.ScheduledMaintenanceAdmin,
+      Permission.ScheduledMaintenanceMember,
+      Permission.ScheduledMaintenanceViewer,
+      Permission.ReadScheduledMaintenanceOwnerRule,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.EditScheduledMaintenanceOwnerRule,
+    ],
+  })
+  @TableColumn({
+    required: false,
+    type: TableColumnType.Boolean,
+    title: "Inherit Owners From Podman Hosts",
+    description:
+      "When this rule matches, also assign every owner of the event's affected Podman hosts to the event.",
+    defaultValue: false,
+    isDefaultValueColumn: true,
+  })
+  @Column({
+    type: ColumnType.Boolean,
+    nullable: false,
+    default: false,
+  })
+  public inheritOwnersFromPodmanHosts?: boolean = undefined;
+
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,

package/Models/DatabaseModels/ScheduledMaintenanceTemplate.ts

@@ -1,4 +1,5 @@
 import DockerHost from "./DockerHost";
+import PodmanHost from "./PodmanHost";
 import Host from "./Host";
 import KubernetesCluster from "./KubernetesCluster";
 import Label from "./Label";
@@ -736,6 +737,61 @@ export default class ScheduledMaintenanceTemplate extends BaseModel {
   })
   public dockerHosts?: Array<DockerHost> = undefined;
 
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ScheduledMaintenanceAdmin,
+      Permission.ScheduledMaintenanceMember,
+      Permission.CreateScheduledMaintenanceTemplate,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.ScheduledMaintenanceAdmin,
+      Permission.ScheduledMaintenanceMember,
+      Permission.ScheduledMaintenanceViewer,
+      Permission.ReadScheduledMaintenanceTemplate,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ScheduledMaintenanceAdmin,
+      Permission.ScheduledMaintenanceMember,
+      Permission.EditScheduledMaintenanceTemplate,
+    ],
+  })
+  @TableColumn({
+    required: false,
+    type: TableColumnType.EntityArray,
+    modelType: PodmanHost,
+    title: "Podman Hosts",
+    description:
+      "List of Podman hosts to pre-populate on scheduled maintenance events created from this template.",
+  })
+  @ManyToMany(
+    () => {
+      return PodmanHost;
+    },
+    { eager: false },
+  )
+  @JoinTable({
+    name: "ScheduledMaintenanceTemplatePodmanHost",
+    inverseJoinColumn: {
+      name: "podmanHostId",
+      referencedColumnName: "_id",
+    },
+    joinColumn: {
+      name: "scheduledMaintenanceTemplateId",
+      referencedColumnName: "_id",
+    },
+  })
+  public podmanHosts?: Array<PodmanHost> = undefined;
+
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,

package/Models/DatabaseModels/TelemetryException.ts

@@ -23,6 +23,7 @@ import DatabaseBaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
 import Service from "./Service";
 import Host from "./Host";
 import DockerHost from "./DockerHost";
+import PodmanHost from "./PodmanHost";
 import KubernetesCluster from "./KubernetesCluster";
 import ServerlessFunction from "./ServerlessFunction";
 import CloudResource from "./CloudResource";
@@ -80,6 +81,7 @@ import RumApplication from "./RumApplication";
     Service,
     Host,
     DockerHost,
+    PodmanHost,
     KubernetesCluster,
     ServerlessFunction,
     CloudResource,

package/Server/API/BillingInvoiceAPI.ts

@@ -41,7 +41,9 @@ export default class UserAPI extends BaseAPI<
           }
 
           if (req.body["projectId"]) {
-            throw new BadDataException("projectId is required in request body");
+            throw new BadDataException(
+              "projectId should not be passed in the request body. The project is resolved from the tenantid header.",
+            );
           }
 
           const userPermissions: Array<UserPermission> = (
@@ -102,20 +104,57 @@ export default class UserAPI extends BaseAPI<
             throw new BadDataException("Invoice ID not found");
           }
 
-          if (!item.paymentProviderCustomerId) {
-            throw new BadDataException("Customer ID not found");
+          /*
+           * Never trust the customer id from the request body — always
+           * charge the authenticated project's own Stripe customer. A
+           * mismatch means the caller is trying to pay against another
+           * tenant's customer.
+           */
+          if (
+            item.paymentProviderCustomerId &&
+            item.paymentProviderCustomerId !== project.paymentProviderCustomerId
+          ) {
+            throw new BadDataException(
+              "Customer ID does not belong to this project",
+            );
+          }
+
+          // the invoice must belong to this project.
+          const billingInvoice: BillingInvoice | null =
+            await BillingInvoiceService.findOneBy({
+              query: {
+                projectId: project.id!,
+                paymentProviderInvoiceId: item.paymentProviderInvoiceId,
+              },
+              select: {
+                _id: true,
+              },
+              props: {
+                isRoot: true,
+                /*
+                 * skip onBeforeFind: it requires props.tenantId and would
+                 * re-sync all invoices from Stripe on every pay attempt.
+                 * The query above is already scoped to the project.
+                 */
+                ignoreHooks: true,
+              },
+            });
+
+          if (!billingInvoice) {
+            throw new BadDataException("Invoice not found for this project");
           }
+
           let invoice: Invoice | null = null;
 
           try {
             invoice = await BillingService.payInvoice(
-              item.paymentProviderCustomerId!,
-              item.paymentProviderInvoiceId!,
+              project.paymentProviderCustomerId,
+              item.paymentProviderInvoiceId,
             );
           } catch (err) {
             invoice = await BillingService.getInvoice(
-              item.paymentProviderCustomerId!,
-              item.paymentProviderInvoiceId!,
+              project.paymentProviderCustomerId,
+              item.paymentProviderInvoiceId,
             );
 
             // check if this invoice needs more authentication like 3ds secure.
@@ -142,6 +181,7 @@ export default class UserAPI extends BaseAPI<
 
           await this.service.updateOneBy({
             query: {
+              projectId: project.id!,
               paymentProviderInvoiceId: invoice.id!,
             },
             props: {

package/Server/API/CephResourceAPI.ts

@@ -0,0 +1,134 @@
+import CephResource from "../../Models/DatabaseModels/CephResource";
+import CephCluster from "../../Models/DatabaseModels/CephCluster";
+import BadDataException from "../../Types/Exception/BadDataException";
+import ObjectID from "../../Types/ObjectID";
+import CephResourceService, {
+  CephInventorySummary,
+  Service as CephResourceServiceType,
+} from "../Services/CephResourceService";
+import CephClusterService from "../Services/CephClusterService";
+import UserMiddleware from "../Middleware/UserAuthorization";
+import Response from "../Utils/Response";
+import BaseAPI from "./BaseAPI";
+import {
+  ExpressRequest,
+  ExpressResponse,
+  NextFunction,
+} from "../Utils/Express";
+import CommonAPI from "./CommonAPI";
+import DatabaseCommonInteractionProps from "../../Types/BaseDatabase/DatabaseCommonInteractionProps";
+import NotFoundException from "../../Types/Exception/NotFoundException";
+import { JSONObject } from "../../Types/JSON";
+
+/*
+ * ------------------------------------------------------------------
+ * CephResourceAPI
+ *
+ * Augments the auto-generated CRUD router with a single custom
+ * endpoint the Ceph layout/overview pages use to fetch sidebar badge
+ * counts in one round-trip:
+ *
+ *   POST /ceph-resource/inventory-summary/:clusterId
+ *
+ * The standard CRUD endpoints (list / get) are still registered by
+ * BaseAPI; the UI uses them via ModelAPI for list/detail reads.
+ * Write endpoints reject (@TableAccessControl create/update/delete
+ * = []); ingest writes go through CephResourceService as root.
+ * ------------------------------------------------------------------
+ */
+export default class CephResourceAPI extends BaseAPI<
+  CephResource,
+  CephResourceServiceType
+> {
+  public constructor() {
+    super(CephResource, CephResourceService);
+
+    this.router.post(
+      `${new this.entityType()
+        .getCrudApiPath()
+        ?.toString()}/inventory-summary/:clusterId`,
+      UserMiddleware.getUserMiddleware,
+      async (req: ExpressRequest, res: ExpressResponse, next: NextFunction) => {
+        try {
+          await this.getInventorySummary(req, res);
+        } catch (err) {
+          next(err);
+        }
+      },
+    );
+  }
+
+  /*
+   * Cluster + auth resolution for the cluster-scoped sub-route.
+   * Returns the (projectId, cephClusterId) tuple after enforcing the
+   * standard ACL chain. Throws NotFound when the cluster is missing
+   * or the caller lacks read access (indistinguishable on purpose).
+   */
+  private async resolveClusterForRequest(req: ExpressRequest): Promise<{
+    projectId: ObjectID;
+    cephClusterId: ObjectID;
+  }> {
+    const clusterIdParam: string | undefined = req.params["clusterId"];
+    if (!clusterIdParam) {
+      throw new BadDataException("Cluster ID is required");
+    }
+
+    let cephClusterId: ObjectID;
+    try {
+      cephClusterId = new ObjectID(clusterIdParam);
+    } catch {
+      throw new BadDataException("Invalid Cluster ID");
+    }
+
+    const props: DatabaseCommonInteractionProps =
+      await CommonAPI.getDatabaseCommonInteractionProps(req);
+
+    const cluster: CephCluster | null = await CephClusterService.findOneById({
+      id: cephClusterId,
+      select: {
+        _id: true,
+        projectId: true,
+      },
+      props,
+    });
+
+    if (!cluster || !cluster.projectId) {
+      throw new NotFoundException("Ceph Cluster not found");
+    }
+
+    return {
+      projectId: cluster.projectId,
+      cephClusterId,
+    };
+  }
+
+  private async getInventorySummary(
+    req: ExpressRequest,
+    res: ExpressResponse,
+  ): Promise<void> {
+    const { projectId, cephClusterId } =
+      await this.resolveClusterForRequest(req);
+
+    const summary: CephInventorySummary =
+      await this.service.getInventorySummary({
+        projectId,
+        cephClusterId,
+      });
+
+    const responseBody: JSONObject = {
+      countsByKind: summary.countsByKind as unknown as JSONObject,
+      // Convenience fields so the UI doesn't have to repeat COALESCE:
+      osdCount: summary.countsByKind["Osd"] || 0,
+      poolCount: summary.countsByKind["Pool"] || 0,
+      monCount: summary.countsByKind["Mon"] || 0,
+      mgrCount: summary.countsByKind["Mgr"] || 0,
+      mdsCount: summary.countsByKind["Mds"] || 0,
+      rgwCount: summary.countsByKind["Rgw"] || 0,
+      osdUpCount: summary.osdUpCount,
+      osdInCount: summary.osdInCount,
+      monInQuorumCount: summary.monInQuorumCount,
+    };
+
+    return Response.sendJsonObjectResponse(req, res, responseBody);
+  }
+}