npm - @oneuptime/common - Versions diffs - 12.0.13 → 12.0.15 - Mend

@oneuptime/common 12.0.13 → 12.0.15

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (561) hide show

package/build/dist/Server/API/BaseAPI.js CHANGED Viewed

@@ -8,6 +8,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 import UserMiddleware from "../Middleware/UserAuthorization";
+import DatabaseService from "../Services/DatabaseService";
 import Express from "../Utils/Express";
 import Response from "../Utils/Response";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
@@ -192,19 +193,74 @@ export default class BaseAPI {
             groupBy = JSONFunctions.deserialize(req.body["groupBy"]);
         }
         const databaseProps = await CommonAPI.getDatabaseCommonInteractionProps(req);
-        const list = await this.service.findBy({
-            query,
-            select,
-            skip: skip,
-            limit: limit,
-            groupBy: groupBy,
-            sort: sort,
-            props: databaseProps,
-        });
-        const count = await this.service.countBy({
-            query,
-            props: databaseProps,
-        });
+        /*
+         * findBy and countBy are independent reads, so run them in parallel to
+         * cut list latency where the count is costly. The one thing that makes
+         * the sequential order load-bearing is a service-level onBeforeFind
+         * override that mutates the shared query/props objects in place (e.g.
+         * ProjectService elevates props.isRoot and pins query._id for users with
+         * no projects; the incident/alert privacy filters rewrite query keys):
+         * countBy historically ran after findBy and inherited those mutations.
+         * Services on the stock hook cannot mutate anything (and the permission
+         * pipeline copies the query before touching it, ReadPermission.ts:33),
+         * so only they run in parallel; hook-overriding services keep the
+         * sequential order and its exact semantics.
+         */
+        const usesStockOnBeforeFindHook = this.service.onBeforeFind ===
+            DatabaseService.prototype
+                .onBeforeFind;
+        let list;
+        let count;
+        if (usesStockOnBeforeFindHook) {
+            const listPromise = this.service.findBy({
+                query,
+                select,
+                skip: skip,
+                limit: limit,
+                groupBy: groupBy,
+                sort: sort,
+                props: databaseProps,
+            });
+            /*
+             * Shallow copies so a countBy override that rewrites top-level query
+             * keys (the established privacy-filter pattern) can never race the
+             * concurrent findBy's reads of the shared objects.
+             */
+            const countPromise = this.service.countBy({
+                query: Object.assign({}, query),
+                props: Object.assign({}, databaseProps),
+            });
+            /*
+             * allSettled instead of Promise.all: a findBy rejection must not leave
+             * countPromise as an unhandled rejection, and findBy's error keeps
+             * priority when both fail - the same failure the sequential code
+             * surfaced.
+             */
+            const [listResult, countResult] = await Promise.allSettled([listPromise, countPromise]);
+            if (listResult.status === "rejected") {
+                throw listResult.reason;
+            }
+            if (countResult.status === "rejected") {
+                throw countResult.reason;
+            }
+            list = listResult.value;
+            count = countResult.value;
+        }
+        else {
+            list = await this.service.findBy({
+                query,
+                select,
+                skip: skip,
+                limit: limit,
+                groupBy: groupBy,
+                sort: sort,
+                props: databaseProps,
+            });
+            count = await this.service.countBy({
+                query,
+                props: databaseProps,
+            });
+        }
         return Response.sendEntityArrayResponse(req, res, list, count, this.entityType);
     }
     async count(req, res) {

package/build/dist/Server/API/BaseAPI.js.map CHANGED Viewed

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

package/build/dist/Server/API/StatusPageAPI.js CHANGED Viewed

@@ -96,6 +96,7 @@ import { MASTER_PASSWORD_INVALID_MESSAGE } from "../../Types/StatusPage/MasterPa
 import StatusPageSubscriberNotificationEventType from "../../Types/StatusPage/StatusPageSubscriberNotificationEventType";
 import StatusPageSubscriberNotificationMethod from "../../Types/StatusPage/StatusPageSubscriberNotificationMethod";
 import StatusPageSubscriberNotificationTemplateService, { Service as StatusPageSubscriberNotificationTemplateServiceClass, } from "../Services/StatusPageSubscriberNotificationTemplateService";
+import { canServeStatusPageCustomizations } from "../Utils/StatusPageCustomizationAccess";
 /*
  * The status badge is hand-built SVG served as image/svg+xml, and SVG is a
  * document - anything interpolated into it is markup, not text. A monitor
@@ -573,6 +574,10 @@ class StatusPageAPI extends BaseAPI {
                 const statusPageIdParam = req.params["statusPageId"];
                 ObjectID.validateUUID(statusPageIdParam);
                 const objectId = new ObjectID(statusPageIdParam);
+                const allowStatusPageCustomizations = await canServeStatusPageCustomizations({
+                    req,
+                    statusPageId: objectId,
+                });
                 const select = {
                     _id: true,
                     slug: true,
@@ -583,11 +588,7 @@ class StatusPageAPI extends BaseAPI {
                     pageTitle: true,
                     pageDescription: true,
                     copyrightText: true,
-                    customCSS: true,
-                    customJavaScript: true,
                     hidePoweredByOneUptimeBranding: true,
-                    headerHTML: true,
-                    footerHTML: true,
                     enableEmailSubscribers: true,
                     enableSlackSubscribers: true,
                     enableMicrosoftTeamsSubscribers: true,
@@ -623,6 +624,12 @@ class StatusPageAPI extends BaseAPI {
                     defaultLanguage: true,
                     enabledLanguages: true,
                 };
+                if (allowStatusPageCustomizations) {
+                    select.customCSS = true;
+                    select.customJavaScript = true;
+                    select.headerHTML = true;
+                    select.footerHTML = true;
+                }
                 const hasEnabledSSO = await StatusPageSsoService.countBy({
                     query: {
                         isEnabled: true,
@@ -642,6 +649,19 @@ class StatusPageAPI extends BaseAPI {
                 if (!item) {
                     throw new BadDataException("Status Page not found");
                 }
+                if (!allowStatusPageCustomizations) {
+                    /*
+                     * The conditional select above keeps these values out of the
+                     * normal database result. Explicit redaction is the second half
+                     * of the boundary: it prevents a future eager-load, hook, cache,
+                     * or over-populated service result from serializing tenant code
+                     * onto the authenticated application's origin.
+                     */
+                    delete item.customCSS;
+                    delete item.customJavaScript;
+                    delete item.headerHTML;
+                    delete item.footerHTML;
+                }
                 const footerLinks = await StatusPageFooterLinkService.findBy({
                     query: {
                         statusPageId: objectId,
@@ -685,6 +705,7 @@ class StatusPageAPI extends BaseAPI {
                     footerLinks: BaseModel.toJSONArray(footerLinks, StatusPageFooterLink),
                     headerLinks: BaseModel.toJSONArray(headerLinks, StatusPageHeaderLink),
                     hasEnabledSSO: hasEnabledSSO.toNumber(),
+                    allowStatusPageCustomizations,
                 };
                 return Response.sendJsonObjectResponse(req, res, response);
             }