@oneuptime/common 12.0.5 → 12.0.7

package/build/dist/Server/Types/Workflow/Components/BaseModel/ModelArguments.js

@@ -0,0 +1,116 @@
+import TableColumnType from "../../../../../Types/Database/TableColumnType";
+/*
+ * Workflow builders write "id", because that is what an ID is called
+ * everywhere they can see one: in the dashboard, in the API docs, and on the
+ * model itself (`monitor.id`). On a database model, though, "id" is only a
+ * TypeScript accessor - the persisted primary key column is "_id"
+ * (DatabaseBaseModel._id). A query, select or data object keyed on "id"
+ * therefore reached TypeORM verbatim and threw
+ * `Property "id" was not found in "Monitor". Make sure your query is correct.`,
+ * which is what https://github.com/OneUptime/oneuptime/issues/3132 reported.
+ *
+ * The create path has accepted "id" all along - DatabaseBaseModel._fromJSON
+ * rewrites it to "_id" - so the fix is to make every other workflow argument
+ * agree with create, rather than to take the alias away from create.
+ */
+export const ID_ARGUMENT_KEY = "id";
+export const PRIMARY_KEY_COLUMN = "_id";
+const modelAliasesId = (model) => {
+    return (model.hasColumn(PRIMARY_KEY_COLUMN) && !model.hasColumn(ID_ARGUMENT_KEY));
+};
+const isColumnMap = (value) => {
+    if (value === null || value === undefined || typeof value !== "object") {
+        return false;
+    }
+    if (Array.isArray(value) || value instanceof Date) {
+        return false;
+    }
+    return value["_type"] === undefined;
+};
+/*
+ * Relations are queried and selected one level deep - `{"project": {"id":
+ * true}}` - so the alias has to follow the relation into the related model
+ * rather than stopping at the top level.
+ */
+const normalizeValue = (value, columnName, model) => {
+    if (!isColumnMap(value)) {
+        return value;
+    }
+    const metadata = model.getTableColumnMetadata(columnName);
+    if (!metadata ||
+        !metadata.modelType ||
+        (metadata.type !== TableColumnType.Entity &&
+            metadata.type !== TableColumnType.EntityArray)) {
+        return value;
+    }
+    return normalizeModelKeys(value, new metadata.modelType());
+};
+/*
+ * Returns a copy of `json` with the "id" alias resolved to the "_id" column,
+ * including inside related-model objects one level down. Everything else is
+ * copied through untouched - this deliberately does not validate column names,
+ * so an argument that works today keeps working.
+ */
+export const normalizeModelKeys = (json, model) => {
+    const normalized = {};
+    const aliasesId = modelAliasesId(model);
+    /*
+     * Someone who spells out "_id" meant "_id". If both spellings are present
+     * the explicit column wins and the alias is dropped, so the result never
+     * depends on key order.
+     */
+    const explicitPrimaryKeyGiven = json[PRIMARY_KEY_COLUMN] !== undefined;
+    for (const key of Object.keys(json)) {
+        let columnName = key;
+        if (key === ID_ARGUMENT_KEY && aliasesId) {
+            if (explicitPrimaryKeyGiven) {
+                continue;
+            }
+            columnName = PRIMARY_KEY_COLUMN;
+        }
+        normalized[columnName] = normalizeValue(json[key], columnName, model);
+    }
+    return normalized;
+};
+/*
+ * Stamps the record being written with the project the workflow runs in.
+ *
+ * Setting the scalar tenant column is not enough on its own. Every tenant
+ * model also exposes that same physical column through its many-to-one
+ * relation - Monitor.project is @JoinColumn({name: "projectId"}) - and TypeORM
+ * reads the relation property first, writing the column once. So a payload
+ * carrying {"project": "<some other project>"} silently beat the stamp and
+ * moved the record into that project. The relation keys pointing at the tenant
+ * column are therefore dropped before the scalar is written.
+ */
+export const applyTenantColumn = (json, model, tenantId) => {
+    const tenantColumn = model.getTenantColumn();
+    if (!tenantColumn) {
+        return json;
+    }
+    const stamped = {};
+    for (const key of Object.keys(json)) {
+        if (key === tenantColumn) {
+            continue;
+        }
+        const metadata = model.getTableColumnMetadata(key);
+        if (metadata && metadata.manyToOneRelationColumn === tenantColumn) {
+            continue;
+        }
+        stamped[key] = json[key];
+    }
+    stamped[tenantColumn] = tenantId;
+    return stamped;
+};
+/*
+ * The raw TypeORM failure ("Property "foo" was not found in "Monitor") names
+ * neither the argument at fault nor anything the builder can pick from, so the
+ * components append the real column list to it.
+ */
+export const describeModelColumns = (model) => {
+    const columns = [...model.getTableColumns().columns].sort((a, b) => {
+        return a.localeCompare(b);
+    });
+    return columns.join(", ");
+};
+//# sourceMappingURL=ModelArguments.js.map

package/build/dist/Server/Types/Workflow/Components/BaseModel/ModelArguments.js.map

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

package/build/dist/Server/Types/Workflow/Components/BaseModel/OnTriggerBaseModel.js

@@ -20,6 +20,7 @@ import ObjectID from "../../../../../Types/ObjectID";
 import Text from "../../../../../Types/Text";
 import BaseModelComponents from "../../../../../Types/Workflow/Components/BaseModel";
 import CaptureSpan from "../../../../Utils/Telemetry/CaptureSpan";
+import { normalizeModelKeys } from "./ModelArguments";
 export default class OnTriggerBaseModel extends TriggerCode {
     constructor(modelService, type) {
         super();
@@ -106,6 +107,12 @@ export default class OnTriggerBaseModel extends TriggerCode {
                     select[key] = false;
                 }
             }
+            /*
+             * "id" is only a TypeScript accessor on the model - the column is "_id".
+             * Selecting "id" reached TypeORM verbatim and threw, and this trigger
+             * has no error port, so it took the whole workflow run down with it.
+             */
+            select = normalizeModelKeys(select, this.service.getModel());
         }
         const model = await this.service.findOneById({
             id: new ObjectID(data["_id"].toString()),

package/build/dist/Server/Types/Workflow/Components/BaseModel/OnTriggerBaseModel.js.map

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

package/build/dist/Server/Types/Workflow/Components/BaseModel/UpdateManyBaseModel.js

@@ -15,6 +15,8 @@ import PositiveNumber from "../../../../../Types/PositiveNumber";
 import Text from "../../../../../Types/Text";
 import BaseModelComponents from "../../../../../Types/Workflow/Components/BaseModel";
 import CaptureSpan from "../../../../Utils/Telemetry/CaptureSpan";
+import { applyTenantColumn, normalizeModelKeys } from "./ModelArguments";
+import logComponentError from "./LogComponentError";
 export default class UpdateManyBaseModel extends ComponentCode {
     constructor(modelService) {
         super();
@@ -32,6 +34,7 @@ export default class UpdateManyBaseModel extends ComponentCode {
         this.modelService = modelService;
     }
     async run(args, options) {
+        var _a;
         const successPort = this.getMetadata().outPorts.find((p) => {
             return p.id === "success";
         });
@@ -57,9 +60,7 @@ export default class UpdateManyBaseModel extends ComponentCode {
             if (typeof args["data"] !== "object") {
                 throw options.onError(new BadDataException("JSON is should be of type object."));
             }
-            if (this.modelService.getModel().getTenantColumn()) {
-                args["data"][this.modelService.getModel().getTenantColumn()] = options.projectId;
-            }
+            args["data"] = applyTenantColumn(normalizeModelKeys(args["data"], this.modelService.getModel()), this.modelService.getModel(), options.projectId);
             if (!args["query"]) {
                 throw options.onError(new BadDataException("Query is undefined."));
             }
@@ -87,15 +88,19 @@ export default class UpdateManyBaseModel extends ComponentCode {
                 options.log("Setting the limit to " + LIMIT_PER_PROJECT);
                 args["limit"] = LIMIT_PER_PROJECT;
             }
-            let query = args["query"];
-            if (query) {
-                query = JSONFunctions.deserialize(args["query"]);
-            }
+            const query = JSONFunctions.deserialize(normalizeModelKeys(args["query"], this.modelService.getModel()));
+            /*
+             * The tenant column goes on the deserialized query, not on args["query"].
+             * JSONFunctions.deserialize returns a new object, so writing the tenant
+             * column to args afterwards left the query that actually ran unscoped -
+             * and an update as root is not re-scoped by the permission layer, so an
+             * Update Many could reach rows in other projects.
+             */
             if (this.modelService.getModel().getTenantColumn()) {
-                args["query"][this.modelService.getModel().getTenantColumn()] = options.projectId;
+                query[this.modelService.getModel().getTenantColumn()] = options.projectId;
             }
-            await this.modelService.updateBy({
-                query: query || {},
+            const itemsUpdated = await this.modelService.updateBy({
+                query: query,
                 data: args["data"],
                 limit: new PositiveNumber(args["limit"]),
                 skip: new PositiveNumber(args["skip"]),
@@ -104,14 +109,20 @@ export default class UpdateManyBaseModel extends ComponentCode {
                     tenantId: options.projectId,
                 },
             });
+            options.log(`Updated ${itemsUpdated} ${this.modelService.getModel().singularName || "record"}(s).`);
             return {
-                returnValues: {},
+                returnValues: {
+                    "items-updated": itemsUpdated,
+                },
                 executePort: successPort,
             };
         }
         catch (err) {
-            options.log("Error running component");
-            options.log(err.message ? err.message : JSON.stringify(err, null, 2));
+            logComponentError({
+                error: err,
+                model: ((_a = this.modelService) === null || _a === void 0 ? void 0 : _a.getModel()) || null,
+                log: options.log,
+            });
             return {
                 returnValues: {},
                 executePort: errorPort,

package/build/dist/Server/Types/Workflow/Components/BaseModel/UpdateManyBaseModel.js.map

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

package/build/dist/Server/Types/Workflow/Components/BaseModel/UpdateOneBaseModel.js

@@ -13,6 +13,8 @@ import JSONFunctions from "../../../../../Types/JSONFunctions";
 import Text from "../../../../../Types/Text";
 import BaseModelComponents from "../../../../../Types/Workflow/Components/BaseModel";
 import CaptureSpan from "../../../../Utils/Telemetry/CaptureSpan";
+import { applyTenantColumn, normalizeModelKeys } from "./ModelArguments";
+import logComponentError from "./LogComponentError";
 export default class UpdateOneBaseModel extends ComponentCode {
     constructor(modelService) {
         super();
@@ -30,6 +32,7 @@ export default class UpdateOneBaseModel extends ComponentCode {
         this.modelService = modelService;
     }
     async run(args, options) {
+        var _a;
         const successPort = this.getMetadata().outPorts.find((p) => {
             return p.id === "success";
         });
@@ -55,9 +58,7 @@ export default class UpdateOneBaseModel extends ComponentCode {
             if (typeof args["data"] !== "object") {
                 throw options.onError(new BadDataException("JSON is should be of type object."));
             }
-            if (this.modelService.getModel().getTenantColumn()) {
-                args["data"][this.modelService.getModel().getTenantColumn()] = options.projectId;
-            }
+            args["data"] = applyTenantColumn(normalizeModelKeys(args["data"], this.modelService.getModel()), this.modelService.getModel(), options.projectId);
             if (!args["query"]) {
                 throw options.onError(new BadDataException("Query is undefined."));
             }
@@ -67,29 +68,42 @@ export default class UpdateOneBaseModel extends ComponentCode {
             if (typeof args["query"] !== "object") {
                 throw options.onError(new BadDataException("Query is should be of type object."));
             }
+            const query = JSONFunctions.deserialize(normalizeModelKeys(args["query"], this.modelService.getModel()));
+            /*
+             * The tenant column goes on the deserialized query, not on args["query"]
+             * - JSONFunctions.deserialize returns a new object, so anything written
+             * to args after it runs never reaches the database.
+             */
             if (this.modelService.getModel().getTenantColumn()) {
-                args["query"][this.modelService.getModel().getTenantColumn()] = options.projectId;
-            }
-            let query = args["query"];
-            if (query) {
-                query = JSONFunctions.deserialize(args["query"]);
+                query[this.modelService.getModel().getTenantColumn()] = options.projectId;
             }
-            await this.modelService.updateOneBy({
-                query: query || {},
+            const itemsUpdated = await this.modelService.updateOneBy({
+                query: query,
                 data: args["data"],
                 props: {
                     isRoot: true,
                     tenantId: options.projectId,
                 },
             });
+            /*
+             * A query that matches nothing is not an error, but reporting it as a
+             * bare success left builders with no way to tell "updated" from "found
+             * nothing to update".
+             */
+            options.log(`Updated ${itemsUpdated} ${this.modelService.getModel().singularName || "record"}(s).`);
             return {
-                returnValues: {},
+                returnValues: {
+                    "items-updated": itemsUpdated,
+                },
                 executePort: successPort,
             };
         }
         catch (err) {
-            options.log("Error running component");
-            options.log(err.message ? err.message : JSON.stringify(err, null, 2));
+            logComponentError({
+                error: err,
+                model: ((_a = this.modelService) === null || _a === void 0 ? void 0 : _a.getModel()) || null,
+                log: options.log,
+            });
             return {
                 returnValues: {},
                 executePort: errorPort,

package/build/dist/Server/Types/Workflow/Components/BaseModel/UpdateOneBaseModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"UpdateOneBaseModel.js","sourceRoot":"","sources":["../../../../../../../Server/Types/Workflow/Components/BaseModel/UpdateOneBaseModel.ts"],"names":[],"mappings":";;;;;;;;;AAEA,OAAO,aAA4C,MAAM,qBAAqB,CAAC;AAG/E,OAAO,gBAAgB,MAAM,iDAAiD,CAAC;AAE/E,OAAO,aAAa,MAAM,oCAAoC,CAAC;AAC/D,OAAO,IAAI,MAAM,2BAA2B,CAAC;AAI7C,OAAO,mBAAmB,MAAM,oDAAoD,CAAC;AACrF,OAAO,WAAW,MAAM,yCAAyC,CAAC;AAElE,MAAM,CAAC,OAAO,OAAO,kBAEnB,SAAQ,aAAa;IAGrB,YAAmB,YAAyC;QAC1D,KAAK,EAAE,CAAC;QAHF,iBAAY,GAAuC,IAAI,CAAC;QAK9D,MAAM,kBAAkB,GACtB,mBAAmB,CAAC,aAAa,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC,CAAC,IAAI,CAC7D,CAAC,CAAoB,EAAE,EAAE;YACvB,OAAO,CACL,CAAC,CAAC,EAAE;gBACJ,GAAG,IAAI,CAAC,kBAAkB,CACxB,YAAY,CAAC,QAAQ,EAAE,CAAC,SAAU,CACnC,aAAa,CACf,CAAC;QACJ,CAAC,CACF,CAAC;QAEJ,IAAI,CAAC,kBAAkB,EAAE,CAAC;YACxB,MAAM,IAAI,gBAAgB,CACxB,2BAA2B;gBACzB,YAAY,CAAC,QAAQ,EAAE,CAAC,SAAS;gBACjC,aAAa,CAChB,CAAC;QACJ,CAAC;QACD,IAAI,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC;QACrC,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;IACnC,CAAC;IAGqB,AAAN,KAAK,CAAC,GAAG,CACvB,IAAgB,EAChB,OAAmB;QAEnB,MAAM,WAAW,GAAqB,IAAI,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,IAAI,CACpE,CAAC,CAAO,EAAE,EAAE;YACV,OAAO,CAAC,CAAC,EAAE,KAAK,SAAS,CAAC;QAC5B,CAAC,CACF,CAAC;QAEF,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,MAAM,OAAO,CAAC,OAAO,CAAC,IAAI,gBAAgB,CAAC,wBAAwB,CAAC,CAAC,CAAC;QACxE,CAAC;QAED,MAAM,SAAS,GAAqB,IAAI,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,IAAI,CAClE,CAAC,CAAO,EAAE,EAAE;YACV,OAAO,CAAC,CAAC,EAAE,KAAK,OAAO,CAAC;QAC1B,CAAC,CACF,CAAC;QAEF,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,MAAM,OAAO,CAAC,OAAO,CAAC,IAAI,gBAAgB,CAAC,sBAAsB,CAAC,CAAC,CAAC;QACtE,CAAC;QAED,IAAI,CAAC;YACH,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;gBACvB,MAAM,OAAO,CAAC,OAAO,CACnB,IAAI,gBAAgB,CAAC,4BAA4B,CAAC,CACnD,CAAC;YACJ,CAAC;YAED,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;gBAClB,MAAM,OAAO,CAAC,OAAO,CAAC,IAAI,gBAAgB,CAAC,oBAAoB,CAAC,CAAC,CAAC;YACpE,CAAC;YAED,IAAI,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,QAAQ,EAAE,CAAC;gBACrC,IAAI,CAAC,MAAM,CAAC,GAAG,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAW,CAAC,CAAC;YAC7D,CAAC;YAED,IAAI,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,QAAQ,EAAE,CAAC;gBACrC,MAAM,OAAO,CAAC,OAAO,CACnB,IAAI,gBAAgB,CAAC,mCAAmC,CAAC,CAC1D,CAAC;YACJ,CAAC;YAED,IAAI,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC,eAAe,EAAE,EAAE,CAAC;gBAClD,IAAI,CAAC,MAAM,CAAgB,CAC1B,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC,eAAe,EAAY,CACzD,GAAG,OAAO,CAAC,SAAS,CAAC;YACxB,CAAC;YAED,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;gBACnB,MAAM,OAAO,CAAC,OAAO,CAAC,IAAI,gBAAgB,CAAC,qBAAqB,CAAC,CAAC,CAAC;YACrE,CAAC;YAED,IAAI,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,QAAQ,EAAE,CAAC;gBACtC,IAAI,CAAC,OAAO,CAAC,GAAG,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAW,CAAC,CAAC;YAC/D,CAAC;YAED,IAAI,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,QAAQ,EAAE,CAAC;gBACtC,MAAM,OAAO,CAAC,OAAO,CACnB,IAAI,gBAAgB,CAAC,oCAAoC,CAAC,CAC3D,CAAC;YACJ,CAAC;YAED,IAAI,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC,eAAe,EAAE,EAAE,CAAC;gBAClD,IAAI,CAAC,OAAO,CAAgB,CAC3B,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC,eAAe,EAAY,CACzD,GAAG,OAAO,CAAC,SAAS,CAAC;YACxB,CAAC;YAED,IAAI,KAAK,GAAsB,IAAI,CAAC,OAAO,CAAsB,CAAC;YAElE,IAAI,KAAK,EAAE,CAAC;gBACV,KAAK,GAAG,aAAa,CAAC,WAAW,CAC/B,IAAI,CAAC,OAAO,CAAe,CACP,CAAC;YACzB,CAAC;YAED,MAAM,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC;gBAClC,KAAK,EAAE,KAAK,IAAI,EAAE;gBAClB,IAAI,EAAE,IAAI,CAAC,MAAM,CAAuC;gBACxD,KAAK,EAAE;oBACL,MAAM,EAAE,IAAI;oBACZ,QAAQ,EAAE,OAAO,CAAC,SAAS;iBAC5B;aACF,CAAC,CAAC;YAEH,OAAO;gBACL,YAAY,EAAE,EAAE;gBAChB,WAAW,EAAE,WAAW;aACzB,CAAC;QACJ,CAAC;QAAC,OAAO,GAAQ,EAAE,CAAC;YAClB,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;YACvC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;YACtE,OAAO;gBACL,YAAY,EAAE,EAAE;gBAChB,WAAW,EAAE,SAAS;aACvB,CAAC;QACJ,CAAC;IACH,CAAC;CACF;AArGuB;IADrB,WAAW,EAAE;;;;6CAqGb"}
+{"version":3,"file":"UpdateOneBaseModel.js","sourceRoot":"","sources":["../../../../../../../Server/Types/Workflow/Components/BaseModel/UpdateOneBaseModel.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/Types/Workflow/Components/Discord/SendMessageToChannel.js

@@ -8,8 +8,8 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 import ComponentCode from "../../ComponentCode";
+import IncomingWebhookUtils, { DISCORD_WEBHOOK_DOMAINS, } from "../IncomingWebhookUtils";
 import HTTPErrorResponse from "../../../../../Types/API/HTTPErrorResponse";
-import URL from "../../../../../Types/API/URL";
 import APIException from "../../../../../Types/Exception/ApiException";
 import BadDataException from "../../../../../Types/Exception/BadDataException";
 import ComponentID from "../../../../../Types/Workflow/ComponentID";
@@ -28,7 +28,6 @@ export default class SendMessageToChannel extends ComponentCode {
         this.setMetadata(Component);
     }
     async run(args, options) {
-        var _a;
         const successPort = this.getMetadata().outPorts.find((p) => {
             return p.id === "success";
         });
@@ -44,10 +43,12 @@ export default class SendMessageToChannel extends ComponentCode {
         if (!args["text"]) {
             throw options.onError(new BadDataException("Discord message not found"));
         }
-        if (!args["webhook-url"]) {
-            throw options.onError(new BadDataException("Discord Webhook URL not found"));
-        }
-        args["webhook-url"] = URL.fromString((_a = args["webhook-url"]) === null || _a === void 0 ? void 0 : _a.toString());
+        args["webhook-url"] = IncomingWebhookUtils.getPinnedWebhookUrl({
+            args,
+            options,
+            allowedDomains: DISCORD_WEBHOOK_DOMAINS,
+            vendorName: "Discord",
+        });
         let apiResult = null;
         try {
             // https://discord.com/developers/docs/resources/webhook#execute-webhook
@@ -56,6 +57,13 @@ export default class SendMessageToChannel extends ComponentCode {
                 data: {
                     content: args["text"],
                 },
+                /*
+                 * The host is pinned above; following a redirect would hand the
+                 * destination back to whoever controls that host.
+                 */
+                options: {
+                    doNotFollowRedirects: true,
+                },
             });
             if (apiResult instanceof HTTPErrorResponse) {
                 return Promise.resolve({

package/build/dist/Server/Types/Workflow/Components/Discord/SendMessageToChannel.js.map

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

package/build/dist/Server/Types/Workflow/Components/IncomingWebhookUtils.js

@@ -0,0 +1,42 @@
+import URL from "../../../../Types/API/URL";
+import BadDataException from "../../../../Types/Exception/BadDataException";
+import SSRFProtection from "../../../Utils/SSRFProtection";
+/*
+ * The Slack / Discord / Microsoft Teams workflow components each take a
+ * free-text "webhook-url" argument off the workflow graph, which any project
+ * member can author and which can additionally be templated from trigger data.
+ * They then POST to it from the API server - the same SSRF primitive that
+ * GHSA-v5xh-rw9h-77fv reported against the API components.
+ *
+ * These are chat webhooks, so unlike the generic API components there is a
+ * vendor host to pin to, and a pin is strictly better than a blocklist: it
+ * cannot be walked around with DNS rebinding, an alternate IP notation, or a
+ * redirect. Nothing legitimate is lost - a self-hosted OneUptime still posts to
+ * hooks.slack.com like everyone else.
+ */
+export const DISCORD_WEBHOOK_DOMAINS = [
+    "discord.com",
+    "discordapp.com",
+];
+export class IncomingWebhookUtils {
+    /*
+     * Reads the component's "webhook-url" argument, requires it to be on one of
+     * `allowedDomains`, and returns it parsed. Throws through options.onError so
+     * the workflow stops with a message the author can act on.
+     *
+     * Validates the RAW string: URL.fromString defaults an unrecognized scheme to
+     * https, so converting first would let "gopher://..." arrive looking clean.
+     */
+    static getPinnedWebhookUrl(data) {
+        const rawUrl = data.args["webhook-url"];
+        if (!rawUrl) {
+            throw data.options.onError(new BadDataException(`${data.vendorName} Webhook URL not found`));
+        }
+        if (!SSRFProtection.isUrlOnAllowedDomain(rawUrl.toString(), data.allowedDomains)) {
+            throw data.options.onError(new BadDataException(`${data.vendorName} Webhook URL must be an https URL on ${data.allowedDomains.join(" or ")}.`));
+        }
+        return URL.fromString(rawUrl.toString());
+    }
+}
+export default IncomingWebhookUtils;
+//# sourceMappingURL=IncomingWebhookUtils.js.map

package/build/dist/Server/Types/Workflow/Components/IncomingWebhookUtils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"IncomingWebhookUtils.js","sourceRoot":"","sources":["../../../../../../Server/Types/Workflow/Components/IncomingWebhookUtils.ts"],"names":[],"mappings":"AACA,OAAO,GAAG,MAAM,2BAA2B,CAAC;AAC5C,OAAO,gBAAgB,MAAM,8CAA8C,CAAC;AAE5E,OAAO,cAAc,MAAM,+BAA+B,CAAC;AAE3D;;;;;;;;;;;;GAYG;AAEH,MAAM,CAAC,MAAM,uBAAuB,GAAkB;IACpD,aAAa;IACb,gBAAgB;CACjB,CAAC;AAEF,MAAM,OAAO,oBAAoB;IAC/B;;;;;;;OAOG;IACI,MAAM,CAAC,mBAAmB,CAAC,IAKjC;QACC,MAAM,MAAM,GAAY,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAEjD,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CACxB,IAAI,gBAAgB,CAAC,GAAG,IAAI,CAAC,UAAU,wBAAwB,CAAC,CACjE,CAAC;QACJ,CAAC;QAED,IACE,CAAC,cAAc,CAAC,oBAAoB,CAClC,MAAM,CAAC,QAAQ,EAAE,EACjB,IAAI,CAAC,cAAc,CACpB,EACD,CAAC;YACD,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CACxB,IAAI,gBAAgB,CAClB,GAAG,IAAI,CAAC,UAAU,wCAAwC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAC9F,CACF,CAAC;QACJ,CAAC;QAED,OAAO,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC3C,CAAC;CACF;AAED,eAAe,oBAAoB,CAAC"}

package/build/dist/Server/Types/Workflow/Components/MicrosoftTeams/SendMessageToChannel.js

@@ -8,8 +8,9 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 import ComponentCode from "../../ComponentCode";
+import IncomingWebhookUtils from "../IncomingWebhookUtils";
+import { MICROSOFT_TEAMS_WEBHOOK_DOMAINS } from "../../../../Utils/Workspace/MicrosoftTeams/MicrosoftTeams";
 import HTTPErrorResponse from "../../../../../Types/API/HTTPErrorResponse";
-import URL from "../../../../../Types/API/URL";
 import APIException from "../../../../../Types/Exception/ApiException";
 import BadDataException from "../../../../../Types/Exception/BadDataException";
 import ComponentID from "../../../../../Types/Workflow/ComponentID";
@@ -28,7 +29,6 @@ export default class SendMessageToChannel extends ComponentCode {
         this.setMetadata(Component);
     }
     async run(args, options) {
-        var _a;
         const successPort = this.getMetadata().outPorts.find((p) => {
             return p.id === "success";
         });
@@ -44,10 +44,12 @@ export default class SendMessageToChannel extends ComponentCode {
         if (!args["text"]) {
             throw options.onError(new BadDataException("Microsoft teams message not found"));
         }
-        if (!args["webhook-url"]) {
-            throw options.onError(new BadDataException("Microsoft teams Webhook URL not found"));
-        }
-        args["webhook-url"] = URL.fromString((_a = args["webhook-url"]) === null || _a === void 0 ? void 0 : _a.toString());
+        args["webhook-url"] = IncomingWebhookUtils.getPinnedWebhookUrl({
+            args,
+            options,
+            allowedDomains: MICROSOFT_TEAMS_WEBHOOK_DOMAINS,
+            vendorName: "Microsoft Teams",
+        });
         let apiResult = null;
         try {
             // https://github.com/OfficeDev/Microsoft-Teams-Samples/blob/main/samples/incoming-webhook/nodejs/api/server/index.js#L28
@@ -77,6 +79,13 @@ export default class SendMessageToChannel extends ComponentCode {
                         },
                     ],
                 },
+                /*
+                 * The host is pinned above; following a redirect would hand the
+                 * destination back to whoever controls that host.
+                 */
+                options: {
+                    doNotFollowRedirects: true,
+                },
             });
             if (apiResult instanceof HTTPErrorResponse) {
                 return Promise.resolve({

package/build/dist/Server/Types/Workflow/Components/MicrosoftTeams/SendMessageToChannel.js.map

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

package/build/dist/Server/Types/Workflow/Components/Slack/SendMessageToChannel.js

@@ -28,7 +28,7 @@ export default class SendMessageToChannel extends ComponentCode {
         this.setMetadata(Component);
     }
     async run(args, options) {
-        var _a;
+        var _a, _b;
         const successPort = this.getMetadata().outPorts.find((p) => {
             return p.id === "success";
         });
@@ -47,7 +47,15 @@ export default class SendMessageToChannel extends ComponentCode {
         if (!args["webhook-url"]) {
             throw options.onError(new BadDataException("Slack Webhook URL not found"));
         }
-        args["webhook-url"] = URL.fromString((_a = args["webhook-url"]) === null || _a === void 0 ? void 0 : _a.toString());
+        /*
+         * Pin the target to Slack's own incoming-webhook endpoint. Without this the
+         * component POSTs from the API server to any URL a workflow author types -
+         * the SSRF reported as GHSA-v5xh-rw9h-77fv against the API components.
+         */
+        if (!SlackUtil.isValidSlackIncomingWebhookUrl((_a = args["webhook-url"]) === null || _a === void 0 ? void 0 : _a.toString())) {
+            throw options.onError(new BadDataException("Slack Webhook URL must start with https://hooks.slack.com/services/"));
+        }
+        args["webhook-url"] = URL.fromString((_b = args["webhook-url"]) === null || _b === void 0 ? void 0 : _b.toString());
         let apiResult = null;
         try {
             // https://api.slack.com/messaging/webhooks#advanced_message_formatting

package/build/dist/Server/Types/Workflow/Components/Slack/SendMessageToChannel.js.map

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

package/build/dist/Server/Utils/AI/Chat/ObservabilityChatPrompt.js

@@ -124,7 +124,7 @@ If the project has connected code repositories you can read their source, which
 
 ## Changing the code
 
-You can propose code changes. open_code_pull_request is the right tool almost always: it opens a DRAFT pull request off the default branch for a human to review. commit_code_to_branch is only for when the user names an existing branch to commit onto.
+You can propose code changes. open_code_pull_request is the right tool almost always: it opens a pull request off the default branch, ready for review, for a human to review and merge. commit_code_to_branch is only for when the user names an existing branch to commit onto.
 
 - ALWAYS read_code_file the exact file first. \`content\` replaces the file's ENTIRE contents, so writing from memory or from a guess destroys code you never read. If you have not read it in this conversation, read it now.
 - Never write to the default branch. The tools refuse it, and so should you — if the user asks you to commit straight to main/master, explain that changes go through a reviewable pull request.