@oneuptime/common 12.0.5 → 12.0.7

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

@@ -7,11 +7,13 @@ 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 { getWorkspaceTypeDisplayName, } from "../../Types/Workspace/WorkspaceType";
 import DatabaseService from "./DatabaseService";
 import Model from "../../Models/DatabaseModels/WorkspaceProjectAuthToken";
 import { LIMIT_PER_PROJECT } from "../../Types/Database/LimitMax";
 import BadDataException from "../../Types/Exception/BadDataException";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
+import logger from "../Utils/Logger";
 export class Service extends DatabaseService {
     constructor() {
         super(Model);
@@ -86,11 +88,32 @@ export class Service extends DatabaseService {
             },
             select: {
                 _id: true,
+                workspaceProjectId: true,
             },
             props: {
                 isRoot: true,
             },
         });
+        /*
+         * A project stores exactly one workspace (one Microsoft tenant / one Slack
+         * team). Re-running the connect flow from a DIFFERENT workspace used to
+         * silently repoint the project, which breaks every existing notification
+         * rule and orphans the bot conversations captured under the old workspace —
+         * with no error and nothing in the logs.
+         *
+         * Refuse instead, and tell the admin to disconnect first if the change is
+         * deliberate.
+         */
+        if (projectAuth &&
+            projectAuth.workspaceProjectId &&
+            projectAuth.workspaceProjectId !== data.workspaceProjectId) {
+            logger.error(`Refusing to repoint ${data.workspaceType} for project ${data.projectId.toString()} from workspace ${projectAuth.workspaceProjectId} to ${data.workspaceProjectId}.`, {
+                projectId: data.projectId.toString(),
+                workspaceType: data.workspaceType,
+            });
+            const workspaceName = getWorkspaceTypeDisplayName(data.workspaceType);
+            throw new BadDataException(`This OneUptime project is already connected to a different ${workspaceName} workspace. Disconnect the existing ${workspaceName} connection in Project Settings before connecting a new one.`);
+        }
         if (!projectAuth) {
             projectAuth = new Model();
             projectAuth.projectId = data.projectId;

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

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

package/build/dist/Server/Types/Database/Permissions/BasePermission.js

@@ -23,6 +23,12 @@ import ObjectID from "../../../../Types/ObjectID";
 import CaptureSpan from "../../../Utils/Telemetry/CaptureSpan";
 export default class BasePermission {
     static async checkPermissions(modelType, query, select, props, type) {
+        /*
+         * Permission checks add predicates and QueryUtil serializes values in
+         * place. Callers such as BaseAPI intentionally reuse the original query
+         * for list and count, so work on a fresh top-level object.
+         */
+        query = Object.assign({}, query);
         const model = new modelType();
         if (props.isRoot || props.isMasterAdmin) {
             query = await PermissionUtil.addTenantScopeToQueryAsRoot(modelType, query, props);

package/build/dist/Server/Types/Database/Permissions/BasePermission.js.map

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

package/build/dist/Server/Types/Database/Permissions/DeletePermission.js

@@ -20,6 +20,7 @@ export default class DeletePermission {
         await AccessControlUtil.checkAccessControlPermissionByModel(Object.assign(Object.assign({}, data), { type: DatabaseRequestType.Delete }));
     }
     static async checkDeletePermission(modelType, query, props) {
+        query = Object.assign({}, query);
         if (props.isRoot || props.isMasterAdmin) {
             query = await PermissionUtil.addTenantScopeToQueryAsRoot(modelType, query, props);
         }

package/build/dist/Server/Types/Database/Permissions/DeletePermission.js.map

@@ -1 +1 @@
-{"version":3,"file":"DeletePermission.js","sourceRoot":"","sources":["../../../../../../Server/Types/Database/Permissions/DeletePermission.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,mBAAmB,MAAM,wCAAwC,CAAC;AAEzE,OAAO,iBAAiB,MAAM,2BAA2B,CAAC;AAC1D,OAAO,cAAc,MAAM,mBAAmB,CAAC;AAC/C,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,gBAAgB,MAAM,oBAAoB,CAAC;AAGlD,OAAO,WAAW,MAAM,sCAAsC,CAAC;AAE/D,MAAM,CAAC,OAAO,OAAO,gBAAgB;IAEf,AAAb,MAAM,CAAC,KAAK,CAAC,4BAA4B,CAE9C,IAID;QACC,+BAA+B;QAC/B,MAAM,iBAAiB,CAAC,wCAAwC,iCACzD,IAAI,KAAE,IAAI,EAAE,mBAAmB,CAAC,MAAM,IAC5C,CAAC;QAEF,MAAM,iBAAiB,CAAC,mCAAmC,iCACtD,IAAI,KACP,IAAI,EAAE,mBAAmB,CAAC,MAAM,IAChC,CAAC;IACL,CAAC;IAGmB,AAAb,MAAM,CAAC,KAAK,CAAC,qBAAqB,CACvC,SAAiC,EACjC,KAAwB,EACxB,KAAqC;QAErC,IAAI,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,aAAa,EAAE,CAAC;YACxC,KAAK,GAAG,MAAM,cAAc,CAAC,2BAA2B,CACtD,SAAS,EACT,KAAK,EACL,KAAK,CACN,CAAC;QACJ,CAAC;QAED,IAAI,CAAC,KAAK,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE,CAAC;YAC1C,gGAAgG;YAChG,eAAe,CAAC,0BAA0B,CACxC,SAAS,EACT,KAAK,EACL,mBAAmB,CAAC,MAAM,CAC3B,CAAC;YAEF,6BAA6B;YAC7B,KAAK,GAAG,MAAM,gBAAgB,CAAC,qBAAqB,CAClD,SAAS,EACT,KAAK,EACL,IAAI,EACJ,KAAK,EACL,mBAAmB,CAAC,MAAM,CAC3B,CAAC;YAEF,kCAAkC;YAClC,KAAK,GAAG,MAAM,iBAAiB,CAAC,0BAA0B,CACxD,SAAS,EACT,KAAK,EACL,IAAI,EACJ,KAAK,EACL,mBAAmB,CAAC,MAAM,CAC3B,CAAC;QACJ,CAAC;QAED,OAAO,KAAK,CAAC;IACf,CAAC;CACF;AA7DqB;IADnB,WAAW,EAAE;;;;0DAiBb;AAGmB;IADnB,WAAW,EAAE;;;;mDA0Cb"}
+{"version":3,"file":"DeletePermission.js","sourceRoot":"","sources":["../../../../../../Server/Types/Database/Permissions/DeletePermission.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,mBAAmB,MAAM,wCAAwC,CAAC;AAEzE,OAAO,iBAAiB,MAAM,2BAA2B,CAAC;AAC1D,OAAO,cAAc,MAAM,mBAAmB,CAAC;AAC/C,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,gBAAgB,MAAM,oBAAoB,CAAC;AAGlD,OAAO,WAAW,MAAM,sCAAsC,CAAC;AAE/D,MAAM,CAAC,OAAO,OAAO,gBAAgB;IAEf,AAAb,MAAM,CAAC,KAAK,CAAC,4BAA4B,CAE9C,IAID;QACC,+BAA+B;QAC/B,MAAM,iBAAiB,CAAC,wCAAwC,iCACzD,IAAI,KAAE,IAAI,EAAE,mBAAmB,CAAC,MAAM,IAC5C,CAAC;QAEF,MAAM,iBAAiB,CAAC,mCAAmC,iCACtD,IAAI,KACP,IAAI,EAAE,mBAAmB,CAAC,MAAM,IAChC,CAAC;IACL,CAAC;IAGmB,AAAb,MAAM,CAAC,KAAK,CAAC,qBAAqB,CACvC,SAAiC,EACjC,KAAwB,EACxB,KAAqC;QAErC,KAAK,qBAAQ,KAAK,CAAE,CAAC;QAErB,IAAI,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,aAAa,EAAE,CAAC;YACxC,KAAK,GAAG,MAAM,cAAc,CAAC,2BAA2B,CACtD,SAAS,EACT,KAAK,EACL,KAAK,CACN,CAAC;QACJ,CAAC;QAED,IAAI,CAAC,KAAK,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE,CAAC;YAC1C,gGAAgG;YAChG,eAAe,CAAC,0BAA0B,CACxC,SAAS,EACT,KAAK,EACL,mBAAmB,CAAC,MAAM,CAC3B,CAAC;YAEF,6BAA6B;YAC7B,KAAK,GAAG,MAAM,gBAAgB,CAAC,qBAAqB,CAClD,SAAS,EACT,KAAK,EACL,IAAI,EACJ,KAAK,EACL,mBAAmB,CAAC,MAAM,CAC3B,CAAC;YAEF,kCAAkC;YAClC,KAAK,GAAG,MAAM,iBAAiB,CAAC,0BAA0B,CACxD,SAAS,EACT,KAAK,EACL,IAAI,EACJ,KAAK,EACL,mBAAmB,CAAC,MAAM,CAC3B,CAAC;QACJ,CAAC;QAED,OAAO,KAAK,CAAC;IACf,CAAC;CACF;AA/DqB;IADnB,WAAW,EAAE;;;;0DAiBb;AAGmB;IADnB,WAAW,EAAE;;;;mDA4Cb"}

package/build/dist/Server/Types/Database/Permissions/ReadPermission.js

@@ -16,6 +16,8 @@ import DatabaseCommonInteractionPropsUtil, { PermissionType, } from "../../../..
 import CaptureSpan from "../../../Utils/Telemetry/CaptureSpan";
 export default class ReadPermission {
     static async checkReadPermission(modelType, query, select, props) {
+        // Block and base permission checks both add predicates to the query.
+        query = Object.assign({}, query);
         // check block permission first.
         await this.checkReadBlockPermission(modelType, query, props);
         const baseFunctionReturn = await BasePermission.checkPermissions(modelType, query, select, props, DatabaseRequestType.Read);

package/build/dist/Server/Types/Database/Permissions/ReadPermission.js.map

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

package/build/dist/Server/Types/Database/Permissions/TenantPermission.js

@@ -14,6 +14,7 @@ import Includes from "../../../../Types/BaseDatabase/Includes";
 import DatabaseCommonInteractionPropsUtil, { PermissionType, } from "../../../../Types/BaseDatabase/DatabaseCommonInteractionPropsUtil";
 import BadDataException from "../../../../Types/Exception/BadDataException";
 import NotAuthorizedException from "../../../../Types/Exception/NotAuthorizedException";
+import ObjectID from "../../../../Types/ObjectID";
 import Permission from "../../../../Types/Permission";
 import CaptureSpan from "../../../Utils/Telemetry/CaptureSpan";
 /*
@@ -34,6 +35,28 @@ export default class TenantPermission {
         if (props.isMultiTenantRequest && !model.canQueryMultiTenant()) {
             throw new BadDataException(`isMultiTenantRequest not allowed on ${model.singularName}`);
         }
+        const isAccessGrantedOnlyByCurrentUser = TenantPermission.isAccessGrantedOnlyByCurrentUser(modelType, props, type);
+        const userColumn = model.getUserColumn();
+        /*
+         * CurrentUser is an auto-granted permission, not a tenant-wide role. A
+         * query operation that relies on it must declare an ownership column so
+         * the permission can be converted into a row predicate.
+         */
+        if (isAccessGrantedOnlyByCurrentUser &&
+            type !== DatabaseRequestType.Create &&
+            !userColumn) {
+            throw new NotAuthorizedException(`Current user scope is not configured for ${model.singularName}.`);
+        }
+        const shouldScopeQueryByCurrentUser = isAccessGrantedOnlyByCurrentUser && Boolean(userColumn);
+        /*
+         * API keys and other non-user callers can carry the auto-granted
+         * CurrentUser permission without having a userId. Such a grant can never
+         * be converted into an ownership filter, so reject it instead of running
+         * the caller's query without a user scope.
+         */
+        if (shouldScopeQueryByCurrentUser && !props.userId) {
+            throw new NotAuthorizedException(`A user session is required to ${type} ${model.singularName}.`);
+        }
         // If this model has a tenantColumn, and request has tenantId, and is multiTenantQuery null then add tenantId to query.
         if (tenantColumn && props.tenantId && !props.isMultiTenantRequest) {
             query[tenantColumn] = props.tenantId;
@@ -44,18 +67,15 @@ export default class TenantPermission {
              * row in the project (CVE-class issue when CurrentUser appears in a
              * model's delete/update list alongside admin permissions).
              */
-            if (TenantPermission.shouldScopeQueryByCurrentUser(modelType, props, type)) {
-                const userColumn = model.getUserColumn();
-                if (userColumn) {
-                    query[userColumn] = props.userId;
-                }
+            if (shouldScopeQueryByCurrentUser) {
+                TenantPermission.addCurrentUserScopeToQuery(model, query, props.userId);
             }
         }
         // if model allows user query without tenant, and user column is present, and userId is present, then add userId to query.
         else if (model.isUserQueryWithoutTenantAllowed() &&
             model.getUserColumn() &&
             props.userId) {
-            query[model.getUserColumn()] = props.userId;
+            TenantPermission.addCurrentUserScopeToQuery(model, query, props.userId);
         }
         else if (tenantColumn &&
             props.userGlobalAccessPermission &&
@@ -88,12 +108,13 @@ export default class TenantPermission {
                 delete query[tenantColumn];
             }
             let lastException = null;
+            const queryForEachProject = Object.assign({}, query);
             for (const projectId of projectIDs) {
                 if (!props.userId) {
                     continue;
                 }
                 try {
-                    const checkBasePermissions = await BasePermission.checkPermissions(modelType, query, select, Object.assign(Object.assign({}, props), { isMultiTenantRequest: false, tenantId: projectId, userTenantAccessPermission: props.userTenantAccessPermission }), type);
+                    const checkBasePermissions = await BasePermission.checkPermissions(modelType, Object.assign({}, queryForEachProject), select, Object.assign(Object.assign({}, props), { isMultiTenantRequest: false, tenantId: projectId, userTenantAccessPermission: props.userTenantAccessPermission }), type);
                     queries.push(Object.assign({}, checkBasePermissions.query));
                 }
                 catch (e) {
@@ -107,18 +128,53 @@ export default class TenantPermission {
             }
             return queries;
         }
+        /*
+         * A model that relies on CurrentUser must resolve that permission to the
+         * requester's exact ownership column. This catches missing decorators and
+         * prevents a future model misconfiguration from silently becoming an
+         * instance-wide query.
+         */
+        if (shouldScopeQueryByCurrentUser) {
+            const scopedUserId = query[userColumn];
+            if (!TenantPermission.isExactUserScope(scopedUserId) ||
+                scopedUserId.toString() !== props.userId.toString()) {
+                throw new NotAuthorizedException(`Current user scope could not be applied to ${model.singularName}.`);
+            }
+        }
         return query;
     }
+    /**
+     * Add the authenticated user's ownership predicate without redirecting an
+     * operation that explicitly targeted another user. Rejecting a conflict is
+     * important because service hooks run before the final permission check;
+     * silently replacing the target would let a hook inspect one row and the
+     * database operation mutate a different one.
+     */
+    static addCurrentUserScopeToQuery(model, query, userId) {
+        const userColumn = model.getUserColumn();
+        const existingUserScope = query[userColumn];
+        if (existingUserScope !== undefined &&
+            (!TenantPermission.isExactUserScope(existingUserScope) ||
+                existingUserScope.toString() !== userId.toString())) {
+            throw new NotAuthorizedException(`You do not have permission to access another user's ${model.singularName}.`);
+        }
+        query[userColumn] = userId;
+    }
+    /**
+     * Ownership filters must be exact scalar ids. Query operators such as
+     * NotEqual stringify to their wrapped id as well, so comparing only their
+     * string value would allow a broad hook query to masquerade as an exact
+     * current-user predicate.
+     */
+    static isExactUserScope(value) {
+        return typeof value === "string" || value instanceof ObjectID;
+    }
     /**
      * True if the only permission letting this user through the table-level
      * check for this op is Permission.CurrentUser. In that case the query must
      * be restricted to rows the user owns (via the model's user column).
      */
-    static shouldScopeQueryByCurrentUser(modelType, props, type) {
-        const model = new modelType();
-        if (!model.getUserColumn() || !props.userId) {
-            return false;
-        }
+    static isAccessGrantedOnlyByCurrentUser(modelType, props, type) {
         const modelPermissions = TablePermission.getTablePermission(modelType, type);
         if (!modelPermissions.includes(Permission.CurrentUser)) {
             return false;

package/build/dist/Server/Types/Database/Permissions/TenantPermission.js.map

@@ -1 +1 @@
-{"version":3,"file":"TenantPermission.js","sourceRoot":"","sources":["../../../../../../Server/Types/Database/Permissions/TenantPermission.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"TenantPermission.js","sourceRoot":"","sources":["../../../../../../Server/Types/Database/Permissions/TenantPermission.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,mBAAmB,MAAM,wCAAwC,CAAC;AAGzE,OAAO,cAAgD,MAAM,kBAAkB,CAAC;AAChF,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAEhD,OAAO,QAAQ,MAAM,yCAAyC,CAAC;AAE/D,OAAO,kCAAkC,EAAE,EACzC,cAAc,GACf,MAAM,mEAAmE,CAAC;AAC3E,OAAO,gBAAgB,MAAM,8CAA8C,CAAC;AAC5E,OAAO,sBAAsB,MAAM,oDAAoD,CAAC;AACxF,OAAO,QAAQ,MAAM,4BAA4B,CAAC;AAClD,OAAO,UAAU,MAAM,8BAA8B,CAAC;AACtD,OAAO,WAAW,MAAM,sCAAsC,CAAC;AAE/D;;;;GAIG;AACH,MAAM,+BAA+B,GAA8B;IACjE,UAAU,CAAC,WAAW;IACtB,UAAU,CAAC,MAAM;IACjB,UAAU,CAAC,mBAAmB;CAC/B,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,gBAAgB;IAEf,AAAb,MAAM,CAAC,KAAK,CAAC,qBAAqB,CACvC,SAAiC,EACjC,KAAwB,EACxB,MAAiC,EACjC,KAAqC,EACrC,IAAyB;;QAEzB,MAAM,KAAK,GAAc,IAAI,SAAS,EAAE,CAAC;QAEzC,MAAM,YAAY,GAAkB,KAAK,CAAC,eAAe,EAAE,CAAC;QAE5D,IAAI,KAAK,CAAC,oBAAoB,IAAI,CAAC,KAAK,CAAC,mBAAmB,EAAE,EAAE,CAAC;YAC/D,MAAM,IAAI,gBAAgB,CACxB,uCAAuC,KAAK,CAAC,YAAY,EAAE,CAC5D,CAAC;QACJ,CAAC;QAED,MAAM,gCAAgC,GACpC,gBAAgB,CAAC,gCAAgC,CAAC,SAAS,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;QAC5E,MAAM,UAAU,GAAkB,KAAK,CAAC,aAAa,EAAE,CAAC;QAExD;;;;WAIG;QACH,IACE,gCAAgC;YAChC,IAAI,KAAK,mBAAmB,CAAC,MAAM;YACnC,CAAC,UAAU,EACX,CAAC;YACD,MAAM,IAAI,sBAAsB,CAC9B,4CAA4C,KAAK,CAAC,YAAY,GAAG,CAClE,CAAC;QACJ,CAAC;QAED,MAAM,6BAA6B,GACjC,gCAAgC,IAAI,OAAO,CAAC,UAAU,CAAC,CAAC;QAE1D;;;;;WAKG;QACH,IAAI,6BAA6B,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;YACnD,MAAM,IAAI,sBAAsB,CAC9B,iCAAiC,IAAI,IAAI,KAAK,CAAC,YAAY,GAAG,CAC/D,CAAC;QACJ,CAAC;QAED,uHAAuH;QACvH,IAAI,YAAY,IAAI,KAAK,CAAC,QAAQ,IAAI,CAAC,KAAK,CAAC,oBAAoB,EAAE,CAAC;YACjE,KAAa,CAAC,YAAY,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC;YAE9C;;;;;;eAMG;YACH,IAAI,6BAA6B,EAAE,CAAC;gBAClC,gBAAgB,CAAC,0BAA0B,CACzC,KAAK,EACL,KAAK,EACL,KAAK,CAAC,MAAkB,CACzB,CAAC;YACJ,CAAC;QACH,CAAC;QACD,0HAA0H;aACrH,IACH,KAAK,CAAC,+BAA+B,EAAE;YACvC,KAAK,CAAC,aAAa,EAAE;YACrB,KAAK,CAAC,MAAM,EACZ,CAAC;YACD,gBAAgB,CAAC,0BAA0B,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;QAC1E,CAAC;aAAM,IACL,YAAY;YACZ,KAAK,CAAC,0BAA0B;YAChC,CAAC,CAAC,KAAK,CAAC,QAAQ,IAAI,KAAK,CAAC,oBAAoB,CAAC,EAC/C,CAAC;YACD;;;;eAIG;YAEH,MAAM,OAAO,GAA6B,EAAE,CAAC;YAE7C,IAAI,UAAU,GAAoB,EAAE,CAAC;YAErC,IACE,KAAK,CAAC,0BAA0B;gBAChC,KAAK,CAAC,0BAA0B,CAAC,UAAU,EAC3C,CAAC;gBACD,UAAU,GAAG,MAAA,KAAK,CAAC,0BAA0B,0CAAE,UAAU,CAAC;YAC5D,CAAC;YAED;;;eAGG;YACH,MAAM,oBAAoB,GAAa,KAAa,CAAC,YAAY,CAAC,CAAC;YACnE,IAAI,oBAAoB,IAAI,oBAAoB,YAAY,QAAQ,EAAE,CAAC;gBACrE,MAAM,YAAY,GAChB,oBACD,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAA6B,EAAE,EAAE;oBAC7C,OAAO,CAAC,CAAC,QAAQ,EAAE,CAAC;gBACtB,CAAC,CAAC,CAAC;gBACH,iEAAiE;gBACjE,UAAU,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,GAAa,EAAE,EAAE;oBAC/C,OAAO,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;gBAC/C,CAAC,CAAC,CAAC;gBACH,uFAAuF;gBACvF,OAAQ,KAAa,CAAC,YAAY,CAAC,CAAC;YACtC,CAAC;YAED,IAAI,aAAa,GAAiB,IAAI,CAAC;YACvC,MAAM,mBAAmB,qBAA2B,KAAK,CAAE,CAAC;YAE5D,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;gBACnC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;oBAClB,SAAS;gBACX,CAAC;gBAED,IAAI,CAAC;oBACH,MAAM,oBAAoB,GACxB,MAAM,cAAc,CAAC,gBAAgB,CACnC,SAAS,oBACJ,mBAAmB,GACxB,MAAM,kCAED,KAAK,KACR,oBAAoB,EAAE,KAAK,EAC3B,QAAQ,EAAE,SAAS,EACnB,0BAA0B,EAAE,KAAK,CAAC,0BAA0B,KAE9D,IAAI,CACL,CAAC;oBAEJ,OAAO,CAAC,IAAI,mBACP,oBAAoB,CAAC,KAAK,EAC7B,CAAC;gBACL,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACX,2BAA2B;oBAC3B,aAAa,GAAG,CAAU,CAAC;gBAC7B,CAAC;YACH,CAAC;YAED,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACzB,MAAM,IAAI,sBAAsB,CAC9B,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,OAAO;oBACpB,mCAAmC,GAAG,KAAK,CAAC,YAAY,CAC3D,CAAC;YACJ,CAAC;YAED,OAAO,OAAc,CAAC;QACxB,CAAC;QAED;;;;;WAKG;QACH,IAAI,6BAA6B,EAAE,CAAC;YAClC,MAAM,YAAY,GAAa,KAAa,CAAC,UAAoB,CAAC,CAAC;YAEnE,IACE,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,YAAY,CAAC;gBAChD,YAAY,CAAC,QAAQ,EAAE,KAAM,KAAK,CAAC,MAAmB,CAAC,QAAQ,EAAE,EACjE,CAAC;gBACD,MAAM,IAAI,sBAAsB,CAC9B,8CAA8C,KAAK,CAAC,YAAY,GAAG,CACpE,CAAC;YACJ,CAAC;QACH,CAAC;QAED,OAAO,KAAK,CAAC;IACf,CAAC;IAED;;;;;;OAMG;IACK,MAAM,CAAC,0BAA0B,CACvC,KAAgB,EAChB,KAAwB,EACxB,MAAgB;QAEhB,MAAM,UAAU,GAAW,KAAK,CAAC,aAAa,EAAY,CAAC;QAC3D,MAAM,iBAAiB,GAAa,KAAa,CAAC,UAAU,CAAC,CAAC;QAE9D,IACE,iBAAiB,KAAK,SAAS;YAC/B,CAAC,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,iBAAiB,CAAC;gBACpD,iBAAiB,CAAC,QAAQ,EAAE,KAAK,MAAM,CAAC,QAAQ,EAAE,CAAC,EACrD,CAAC;YACD,MAAM,IAAI,sBAAsB,CAC9B,uDAAuD,KAAK,CAAC,YAAY,GAAG,CAC7E,CAAC;QACJ,CAAC;QAEA,KAAa,CAAC,UAAU,CAAC,GAAG,MAAM,CAAC;IACtC,CAAC;IAED;;;;;OAKG;IACK,MAAM,CAAC,gBAAgB,CAAC,KAAc;QAC5C,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,YAAY,QAAQ,CAAC;IAChE,CAAC;IAED;;;;OAIG;IACK,MAAM,CAAC,gCAAgC,CAC7C,SAAiC,EACjC,KAAqC,EACrC,IAAyB;QAEzB,MAAM,gBAAgB,GACpB,eAAe,CAAC,kBAAkB,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;QAEtD,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;YACvD,OAAO,KAAK,CAAC;QACf,CAAC;QAED,MAAM,eAAe,GACnB,kCAAkC,CAAC,kBAAkB,CACnD,KAAK,EACL,cAAc,CAAC,KAAK,CACrB,CAAC,GAAG,CAAC,CAAC,EAA8B,EAAE,EAAE;YACvC,OAAO,EAAE,CAAC,UAAU,CAAC;QACvB,CAAC,CAAC,CAAC;QAEL,MAAM,YAAY,GAAsB,eAAe,CAAC,MAAM,CAC5D,CAAC,CAAa,EAAE,EAAE;YAChB,OAAO,gBAAgB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QACtC,CAAC,CACF,CAAC;QAEF,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;YACnD,OAAO,KAAK,CAAC;QACf,CAAC;QAED,MAAM,UAAU,GAAsB,YAAY,CAAC,MAAM,CACvD,CAAC,CAAa,EAAE,EAAE;YAChB,OAAO,CAAC,+BAA+B,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QACtD,CAAC,CACF,CAAC;QAEF,OAAO,UAAU,CAAC,MAAM,KAAK,CAAC,CAAC;IACjC,CAAC;CACF;AAvQqB;IADnB,WAAW,EAAE;;;;mDAqLb"}

package/build/dist/Server/Types/Domain.js

@@ -12,7 +12,38 @@ import DomainCommon from "../../Types/Domain";
 import dns from "dns";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 import BadDataException from "../../Types/Exception/BadDataException";
+import URL from "../../Types/API/URL";
+import API from "../../Utils/API";
+import DataSourceEgressGuard from "../Utils/DataSource/EgressGuard";
 export default class Domain extends DomainCommon {
+    /*
+     * GET a domain-verification URL built from a tenant-supplied domain.
+     *
+     * Both the status page and the dashboard build these URLs by interpolating
+     * a customer domain into a string, and the certificate cron re-fetches them
+     * unattended every 15 minutes — so the target has to be validated on every
+     * call, not just when the row was written. The address that was validated
+     * is pinned into the socket, and redirects are refused so a 3xx cannot
+     * bounce the request to a host that was never checked. (The callers try
+     * http first and https second, so the ordinary http→https redirect a
+     * customer proxy emits is still covered by the https attempt.)
+     *
+     * Private ranges stay reachable on self-hosted installs, where a status page
+     * domain legitimately resolves inside the corporate network.
+     */
+    static async getForDomainVerification(data) {
+        const { httpAgent, httpsAgent } = await DataSourceEgressGuard.assertUrlAllowedAndPin(data.url, {
+            targetLabel: data.targetLabel,
+        });
+        return API.get({
+            url: URL.fromString(data.url),
+            options: {
+                doNotFollowRedirects: true,
+                httpAgent,
+                httpsAgent,
+            },
+        });
+    }
     static getCnameRecords(data) {
         return new Promise((resolve, reject) => {
             dns.resolveCname(data.domain, (err, addresses) => {
@@ -93,6 +124,12 @@ export default class Domain extends DomainCommon {
         });
     }
 }
+__decorate([
+    CaptureSpan(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Promise)
+], Domain, "getForDomainVerification", null);
 __decorate([
     CaptureSpan(),
     __metadata("design:type", Function),

package/build/dist/Server/Types/Domain.js.map

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

package/build/dist/Server/Types/Workflow/Components/API/Delete.js

@@ -27,13 +27,14 @@ export default class ApiDelete extends ComponentCode {
         this.setMetadata(Component);
     }
     async run(args, options) {
-        const result = ApiComponentUtils.sanitizeArgs(this.getMetadata(), args, options);
+        const result = await ApiComponentUtils.sanitizeArgs(this.getMetadata(), args, options);
         let apiResult = null;
         try {
             apiResult = await API.delete({
                 url: args["url"],
                 data: args["request-body"],
                 headers: args["request-headers"],
+                options: ApiComponentUtils.requestOptions,
             });
             /*
              * On the server API resolves with an HTTPErrorResponse instead of

package/build/dist/Server/Types/Workflow/Components/API/Delete.js.map

@@ -1 +1 @@
-{"version":3,"file":"Delete.js","sourceRoot":"","sources":["../../../../../../../Server/Types/Workflow/Components/API/Delete.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,aAA4C,MAAM,qBAAqB,CAAC;AAC/E,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,iBAAiB,MAAM,4CAA4C,CAAC;AAI3E,OAAO,gBAAgB,MAAM,iDAAiD,CAAC;AAK/E,OAAO,WAAW,MAAM,2CAA2C,CAAC;AACpE,OAAO,aAAa,MAAM,8CAA8C,CAAC;AACzE,OAAO,GAAG,MAAM,0BAA0B,CAAC;AAC3C,OAAO,WAAW,MAAM,yCAAyC,CAAC;AAElE,MAAM,CAAC,OAAO,OAAO,SAAU,SAAQ,aAAa;IAClD;QACE,KAAK,EAAE,CAAC;QAER,MAAM,SAAS,GAAkC,aAAa,CAAC,IAAI,CACjE,CAAC,CAAoB,EAAE,EAAE;YACvB,OAAO,CAAC,CAAC,EAAE,KAAK,WAAW,CAAC,SAAS,CAAC;QACxC,CAAC,CACF,CAAC;QAEF,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,MAAM,IAAI,gBAAgB,CAAC,sBAAsB,CAAC,CAAC;QACrD,CAAC;QAED,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;IAC9B,CAAC;IAGqB,AAAN,KAAK,CAAC,GAAG,CACvB,IAAgB,EAChB,OAAmB;QAEnB,MAAM,MAAM,GACV,iBAAiB,CAAC,YAAY,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;QAEpE,IAAI,SAAS,GAAwD,IAAI,CAAC;QAE1E,IAAI,CAAC;YACH,SAAS,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC;gBAC3B,GAAG,EAAE,IAAI,CAAC,KAAK,CAAQ;gBACvB,IAAI,EAAE,IAAI,CAAC,cAAc,CAAe;gBACxC,OAAO,EAAE,IAAI,CAAC,iBAAiB,CAAuB;aACvD,CAAC,CAAC;YAEH;;;;eAIG;YACH,IAAI,SAAS,YAAY,iBAAiB,EAAE,CAAC;gBAC3C,OAAO,OAAO,CAAC,OAAO,CAAC;oBACrB,YAAY,EAAE,iBAAiB,CAAC,eAAe,CAAC,SAAS,CAAC;oBAC1D,WAAW,EAAE,MAAM,CAAC,SAAS;iBAC9B,CAAC,CAAC;YACL,CAAC;YAED,OAAO,OAAO,CAAC,OAAO,CAAC;gBACrB,YAAY,EAAE,iBAAiB,CAAC,eAAe,CAAC,SAAS,CAAC;gBAC1D,WAAW,EAAE,MAAM,CAAC,WAAW;aAChC,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,GAAG,YAAY,iBAAiB,EAAE,CAAC;gBACrC,OAAO,OAAO,CAAC,OAAO,CAAC;oBACrB,YAAY,EAAE,iBAAiB,CAAC,eAAe,CAAC,GAAG,CAAC;oBACpD,WAAW,EAAE,MAAM,CAAC,SAAS;iBAC9B,CAAC,CAAC;YACL,CAAC;YAED,IAAI,SAAS,EAAE,CAAC;gBACd,OAAO,OAAO,CAAC,OAAO,CAAC;oBACrB,YAAY,EAAE,iBAAiB,CAAC,eAAe,CAAC,SAAS,CAAC;oBAC1D,WAAW,EAAE,MAAM,CAAC,SAAS;iBAC9B,CAAC,CAAC;YACL,CAAC;YAED,OAAO,OAAO,CAAC,OAAO,CAAC;gBACrB,YAAY,EAAE;oBACZ,YAAY,EAAG,GAAa,CAAC,OAAO,IAAI,eAAe;iBACxD;gBACD,WAAW,EAAE,MAAM,CAAC,SAAS;aAC9B,CAAC,CAAC;QACL,CAAC;IACH,CAAC;CACF;AAvDuB;IADrB,WAAW,EAAE;;;;oCAuDb"}
+{"version":3,"file":"Delete.js","sourceRoot":"","sources":["../../../../../../../Server/Types/Workflow/Components/API/Delete.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,aAA4C,MAAM,qBAAqB,CAAC;AAC/E,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,iBAAiB,MAAM,4CAA4C,CAAC;AAI3E,OAAO,gBAAgB,MAAM,iDAAiD,CAAC;AAK/E,OAAO,WAAW,MAAM,2CAA2C,CAAC;AACpE,OAAO,aAAa,MAAM,8CAA8C,CAAC;AACzE,OAAO,GAAG,MAAM,0BAA0B,CAAC;AAC3C,OAAO,WAAW,MAAM,yCAAyC,CAAC;AAElE,MAAM,CAAC,OAAO,OAAO,SAAU,SAAQ,aAAa;IAClD;QACE,KAAK,EAAE,CAAC;QAER,MAAM,SAAS,GAAkC,aAAa,CAAC,IAAI,CACjE,CAAC,CAAoB,EAAE,EAAE;YACvB,OAAO,CAAC,CAAC,EAAE,KAAK,WAAW,CAAC,SAAS,CAAC;QACxC,CAAC,CACF,CAAC;QAEF,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,MAAM,IAAI,gBAAgB,CAAC,sBAAsB,CAAC,CAAC;QACrD,CAAC;QAED,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;IAC9B,CAAC;IAGqB,AAAN,KAAK,CAAC,GAAG,CACvB,IAAgB,EAChB,OAAmB;QAEnB,MAAM,MAAM,GACV,MAAM,iBAAiB,CAAC,YAAY,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;QAE1E,IAAI,SAAS,GAAwD,IAAI,CAAC;QAE1E,IAAI,CAAC;YACH,SAAS,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC;gBAC3B,GAAG,EAAE,IAAI,CAAC,KAAK,CAAQ;gBACvB,IAAI,EAAE,IAAI,CAAC,cAAc,CAAe;gBACxC,OAAO,EAAE,IAAI,CAAC,iBAAiB,CAAuB;gBACtD,OAAO,EAAE,iBAAiB,CAAC,cAAc;aAC1C,CAAC,CAAC;YAEH;;;;eAIG;YACH,IAAI,SAAS,YAAY,iBAAiB,EAAE,CAAC;gBAC3C,OAAO,OAAO,CAAC,OAAO,CAAC;oBACrB,YAAY,EAAE,iBAAiB,CAAC,eAAe,CAAC,SAAS,CAAC;oBAC1D,WAAW,EAAE,MAAM,CAAC,SAAS;iBAC9B,CAAC,CAAC;YACL,CAAC;YAED,OAAO,OAAO,CAAC,OAAO,CAAC;gBACrB,YAAY,EAAE,iBAAiB,CAAC,eAAe,CAAC,SAAS,CAAC;gBAC1D,WAAW,EAAE,MAAM,CAAC,WAAW;aAChC,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,GAAG,YAAY,iBAAiB,EAAE,CAAC;gBACrC,OAAO,OAAO,CAAC,OAAO,CAAC;oBACrB,YAAY,EAAE,iBAAiB,CAAC,eAAe,CAAC,GAAG,CAAC;oBACpD,WAAW,EAAE,MAAM,CAAC,SAAS;iBAC9B,CAAC,CAAC;YACL,CAAC;YAED,IAAI,SAAS,EAAE,CAAC;gBACd,OAAO,OAAO,CAAC,OAAO,CAAC;oBACrB,YAAY,EAAE,iBAAiB,CAAC,eAAe,CAAC,SAAS,CAAC;oBAC1D,WAAW,EAAE,MAAM,CAAC,SAAS;iBAC9B,CAAC,CAAC;YACL,CAAC;YAED,OAAO,OAAO,CAAC,OAAO,CAAC;gBACrB,YAAY,EAAE;oBACZ,YAAY,EAAG,GAAa,CAAC,OAAO,IAAI,eAAe;iBACxD;gBACD,WAAW,EAAE,MAAM,CAAC,SAAS;aAC9B,CAAC,CAAC;QACL,CAAC;IACH,CAAC;CACF;AAxDuB;IADrB,WAAW,EAAE;;;;oCAwDb"}

package/build/dist/Server/Types/Workflow/Components/API/Get.js

@@ -27,13 +27,14 @@ export default class ApiGet extends ComponentCode {
         this.setMetadata(Component);
     }
     async run(args, options) {
-        const result = ApiComponentUtils.sanitizeArgs(this.getMetadata(), args, options);
+        const result = await ApiComponentUtils.sanitizeArgs(this.getMetadata(), args, options);
         let apiResult = null;
         try {
             apiResult = await API.get({
                 url: args["url"],
                 data: args["request-body"],
                 headers: args["request-headers"],
+                options: ApiComponentUtils.requestOptions,
             });
             /*
              * On the server API resolves with an HTTPErrorResponse instead of

package/build/dist/Server/Types/Workflow/Components/API/Get.js.map

@@ -1 +1 @@
-{"version":3,"file":"Get.js","sourceRoot":"","sources":["../../../../../../../Server/Types/Workflow/Components/API/Get.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,aAA4C,MAAM,qBAAqB,CAAC;AAC/E,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,iBAAiB,MAAM,4CAA4C,CAAC;AAI3E,OAAO,gBAAgB,MAAM,iDAAiD,CAAC;AAK/E,OAAO,WAAW,MAAM,2CAA2C,CAAC;AACpE,OAAO,aAAa,MAAM,8CAA8C,CAAC;AACzE,OAAO,GAAG,MAAM,0BAA0B,CAAC;AAC3C,OAAO,WAAW,MAAM,yCAAyC,CAAC;AAElE,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,aAAa;IAC/C;QACE,KAAK,EAAE,CAAC;QAER,MAAM,SAAS,GAAkC,aAAa,CAAC,IAAI,CACjE,CAAC,CAAoB,EAAE,EAAE;YACvB,OAAO,CAAC,CAAC,EAAE,KAAK,WAAW,CAAC,MAAM,CAAC;QACrC,CAAC,CACF,CAAC;QAEF,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,MAAM,IAAI,gBAAgB,CAAC,sBAAsB,CAAC,CAAC;QACrD,CAAC;QAED,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;IAC9B,CAAC;IAGqB,AAAN,KAAK,CAAC,GAAG,CACvB,IAAgB,EAChB,OAAmB;QAEnB,MAAM,MAAM,GACV,iBAAiB,CAAC,YAAY,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;QAEpE,IAAI,SAAS,GAAwD,IAAI,CAAC;QAE1E,IAAI,CAAC;YACH,SAAS,GAAG,MAAM,GAAG,CAAC,GAAG,CAAC;gBACxB,GAAG,EAAE,IAAI,CAAC,KAAK,CAAQ;gBACvB,IAAI,EAAE,IAAI,CAAC,cAAc,CAAe;gBACxC,OAAO,EAAE,IAAI,CAAC,iBAAiB,CAAuB;aACvD,CAAC,CAAC;YAEH;;;;eAIG;YACH,IAAI,SAAS,YAAY,iBAAiB,EAAE,CAAC;gBAC3C,OAAO,OAAO,CAAC,OAAO,CAAC;oBACrB,YAAY,EAAE,iBAAiB,CAAC,eAAe,CAAC,SAAS,CAAC;oBAC1D,WAAW,EAAE,MAAM,CAAC,SAAS;iBAC9B,CAAC,CAAC;YACL,CAAC;YAED,OAAO,OAAO,CAAC,OAAO,CAAC;gBACrB,YAAY,EAAE,iBAAiB,CAAC,eAAe,CAAC,SAAS,CAAC;gBAC1D,WAAW,EAAE,MAAM,CAAC,WAAW;aAChC,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,GAAG,YAAY,iBAAiB,EAAE,CAAC;gBACrC,OAAO,OAAO,CAAC,OAAO,CAAC;oBACrB,YAAY,EAAE,iBAAiB,CAAC,eAAe,CAAC,GAAG,CAAC;oBACpD,WAAW,EAAE,MAAM,CAAC,SAAS;iBAC9B,CAAC,CAAC;YACL,CAAC;YAED,IAAI,SAAS,EAAE,CAAC;gBACd,OAAO,OAAO,CAAC,OAAO,CAAC;oBACrB,YAAY,EAAE,iBAAiB,CAAC,eAAe,CAAC,SAAS,CAAC;oBAC1D,WAAW,EAAE,MAAM,CAAC,SAAS;iBAC9B,CAAC,CAAC;YACL,CAAC;YAED,OAAO,OAAO,CAAC,OAAO,CAAC;gBACrB,YAAY,EAAE;oBACZ,YAAY,EAAG,GAAa,CAAC,OAAO,IAAI,eAAe;iBACxD;gBACD,WAAW,EAAE,MAAM,CAAC,SAAS;aAC9B,CAAC,CAAC;QACL,CAAC;IACH,CAAC;CACF;AAvDuB;IADrB,WAAW,EAAE;;;;iCAuDb"}
+{"version":3,"file":"Get.js","sourceRoot":"","sources":["../../../../../../../Server/Types/Workflow/Components/API/Get.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,aAA4C,MAAM,qBAAqB,CAAC;AAC/E,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,iBAAiB,MAAM,4CAA4C,CAAC;AAI3E,OAAO,gBAAgB,MAAM,iDAAiD,CAAC;AAK/E,OAAO,WAAW,MAAM,2CAA2C,CAAC;AACpE,OAAO,aAAa,MAAM,8CAA8C,CAAC;AACzE,OAAO,GAAG,MAAM,0BAA0B,CAAC;AAC3C,OAAO,WAAW,MAAM,yCAAyC,CAAC;AAElE,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,aAAa;IAC/C;QACE,KAAK,EAAE,CAAC;QAER,MAAM,SAAS,GAAkC,aAAa,CAAC,IAAI,CACjE,CAAC,CAAoB,EAAE,EAAE;YACvB,OAAO,CAAC,CAAC,EAAE,KAAK,WAAW,CAAC,MAAM,CAAC;QACrC,CAAC,CACF,CAAC;QAEF,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,MAAM,IAAI,gBAAgB,CAAC,sBAAsB,CAAC,CAAC;QACrD,CAAC;QAED,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;IAC9B,CAAC;IAGqB,AAAN,KAAK,CAAC,GAAG,CACvB,IAAgB,EAChB,OAAmB;QAEnB,MAAM,MAAM,GACV,MAAM,iBAAiB,CAAC,YAAY,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;QAE1E,IAAI,SAAS,GAAwD,IAAI,CAAC;QAE1E,IAAI,CAAC;YACH,SAAS,GAAG,MAAM,GAAG,CAAC,GAAG,CAAC;gBACxB,GAAG,EAAE,IAAI,CAAC,KAAK,CAAQ;gBACvB,IAAI,EAAE,IAAI,CAAC,cAAc,CAAe;gBACxC,OAAO,EAAE,IAAI,CAAC,iBAAiB,CAAuB;gBACtD,OAAO,EAAE,iBAAiB,CAAC,cAAc;aAC1C,CAAC,CAAC;YAEH;;;;eAIG;YACH,IAAI,SAAS,YAAY,iBAAiB,EAAE,CAAC;gBAC3C,OAAO,OAAO,CAAC,OAAO,CAAC;oBACrB,YAAY,EAAE,iBAAiB,CAAC,eAAe,CAAC,SAAS,CAAC;oBAC1D,WAAW,EAAE,MAAM,CAAC,SAAS;iBAC9B,CAAC,CAAC;YACL,CAAC;YAED,OAAO,OAAO,CAAC,OAAO,CAAC;gBACrB,YAAY,EAAE,iBAAiB,CAAC,eAAe,CAAC,SAAS,CAAC;gBAC1D,WAAW,EAAE,MAAM,CAAC,WAAW;aAChC,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,GAAG,YAAY,iBAAiB,EAAE,CAAC;gBACrC,OAAO,OAAO,CAAC,OAAO,CAAC;oBACrB,YAAY,EAAE,iBAAiB,CAAC,eAAe,CAAC,GAAG,CAAC;oBACpD,WAAW,EAAE,MAAM,CAAC,SAAS;iBAC9B,CAAC,CAAC;YACL,CAAC;YAED,IAAI,SAAS,EAAE,CAAC;gBACd,OAAO,OAAO,CAAC,OAAO,CAAC;oBACrB,YAAY,EAAE,iBAAiB,CAAC,eAAe,CAAC,SAAS,CAAC;oBAC1D,WAAW,EAAE,MAAM,CAAC,SAAS;iBAC9B,CAAC,CAAC;YACL,CAAC;YAED,OAAO,OAAO,CAAC,OAAO,CAAC;gBACrB,YAAY,EAAE;oBACZ,YAAY,EAAG,GAAa,CAAC,OAAO,IAAI,eAAe;iBACxD;gBACD,WAAW,EAAE,MAAM,CAAC,SAAS;aAC9B,CAAC,CAAC;QACL,CAAC;IACH,CAAC;CACF;AAxDuB;IADrB,WAAW,EAAE;;;;iCAwDb"}

package/build/dist/Server/Types/Workflow/Components/API/Patch.js

@@ -27,13 +27,14 @@ export default class ApiPut extends ComponentCode {
         this.setMetadata(Component);
     }
     async run(args, options) {
-        const result = ApiComponentUtils.sanitizeArgs(this.getMetadata(), args, options);
+        const result = await ApiComponentUtils.sanitizeArgs(this.getMetadata(), args, options);
         let apiResult = null;
         try {
             apiResult = await API.patch({
                 url: args["url"],
                 data: args["request-body"],
                 headers: args["request-headers"],
+                options: ApiComponentUtils.requestOptions,
             });
             /*
              * On the server API resolves with an HTTPErrorResponse instead of

package/build/dist/Server/Types/Workflow/Components/API/Patch.js.map

@@ -1 +1 @@
-{"version":3,"file":"Patch.js","sourceRoot":"","sources":["../../../../../../../Server/Types/Workflow/Components/API/Patch.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,aAA4C,MAAM,qBAAqB,CAAC;AAC/E,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,iBAAiB,MAAM,4CAA4C,CAAC;AAI3E,OAAO,gBAAgB,MAAM,iDAAiD,CAAC;AAK/E,OAAO,WAAW,MAAM,2CAA2C,CAAC;AACpE,OAAO,aAAa,MAAM,8CAA8C,CAAC;AACzE,OAAO,GAAG,MAAM,0BAA0B,CAAC;AAC3C,OAAO,WAAW,MAAM,yCAAyC,CAAC;AAElE,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,aAAa;IAC/C;QACE,KAAK,EAAE,CAAC;QAER,MAAM,SAAS,GAAkC,aAAa,CAAC,IAAI,CACjE,CAAC,CAAoB,EAAE,EAAE;YACvB,OAAO,CAAC,CAAC,EAAE,KAAK,WAAW,CAAC,QAAQ,CAAC;QACvC,CAAC,CACF,CAAC;QAEF,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,MAAM,IAAI,gBAAgB,CAAC,sBAAsB,CAAC,CAAC;QACrD,CAAC;QAED,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;IAC9B,CAAC;IAGqB,AAAN,KAAK,CAAC,GAAG,CACvB,IAAgB,EAChB,OAAmB;QAEnB,MAAM,MAAM,GACV,iBAAiB,CAAC,YAAY,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;QAEpE,IAAI,SAAS,GAAwD,IAAI,CAAC;QAE1E,IAAI,CAAC;YACH,SAAS,GAAG,MAAM,GAAG,CAAC,KAAK,CAAC;gBAC1B,GAAG,EAAE,IAAI,CAAC,KAAK,CAAQ;gBACvB,IAAI,EAAE,IAAI,CAAC,cAAc,CAAe;gBACxC,OAAO,EAAE,IAAI,CAAC,iBAAiB,CAAuB;aACvD,CAAC,CAAC;YAEH;;;;eAIG;YACH,IAAI,SAAS,YAAY,iBAAiB,EAAE,CAAC;gBAC3C,OAAO,OAAO,CAAC,OAAO,CAAC;oBACrB,YAAY,EAAE,iBAAiB,CAAC,eAAe,CAAC,SAAS,CAAC;oBAC1D,WAAW,EAAE,MAAM,CAAC,SAAS;iBAC9B,CAAC,CAAC;YACL,CAAC;YAED,OAAO,OAAO,CAAC,OAAO,CAAC;gBACrB,YAAY,EAAE,iBAAiB,CAAC,eAAe,CAAC,SAAS,CAAC;gBAC1D,WAAW,EAAE,MAAM,CAAC,WAAW;aAChC,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,GAAG,YAAY,iBAAiB,EAAE,CAAC;gBACrC,OAAO,OAAO,CAAC,OAAO,CAAC;oBACrB,YAAY,EAAE,iBAAiB,CAAC,eAAe,CAAC,GAAG,CAAC;oBACpD,WAAW,EAAE,MAAM,CAAC,SAAS;iBAC9B,CAAC,CAAC;YACL,CAAC;YAED,IAAI,SAAS,EAAE,CAAC;gBACd,OAAO,OAAO,CAAC,OAAO,CAAC;oBACrB,YAAY,EAAE,iBAAiB,CAAC,eAAe,CAAC,SAAS,CAAC;oBAC1D,WAAW,EAAE,MAAM,CAAC,SAAS;iBAC9B,CAAC,CAAC;YACL,CAAC;YAED,OAAO,OAAO,CAAC,OAAO,CAAC;gBACrB,YAAY,EAAE;oBACZ,YAAY,EAAG,GAAa,CAAC,OAAO,IAAI,eAAe;iBACxD;gBACD,WAAW,EAAE,MAAM,CAAC,SAAS;aAC9B,CAAC,CAAC;QACL,CAAC;IACH,CAAC;CACF;AAvDuB;IADrB,WAAW,EAAE;;;;iCAuDb"}
+{"version":3,"file":"Patch.js","sourceRoot":"","sources":["../../../../../../../Server/Types/Workflow/Components/API/Patch.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,aAA4C,MAAM,qBAAqB,CAAC;AAC/E,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,iBAAiB,MAAM,4CAA4C,CAAC;AAI3E,OAAO,gBAAgB,MAAM,iDAAiD,CAAC;AAK/E,OAAO,WAAW,MAAM,2CAA2C,CAAC;AACpE,OAAO,aAAa,MAAM,8CAA8C,CAAC;AACzE,OAAO,GAAG,MAAM,0BAA0B,CAAC;AAC3C,OAAO,WAAW,MAAM,yCAAyC,CAAC;AAElE,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,aAAa;IAC/C;QACE,KAAK,EAAE,CAAC;QAER,MAAM,SAAS,GAAkC,aAAa,CAAC,IAAI,CACjE,CAAC,CAAoB,EAAE,EAAE;YACvB,OAAO,CAAC,CAAC,EAAE,KAAK,WAAW,CAAC,QAAQ,CAAC;QACvC,CAAC,CACF,CAAC;QAEF,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,MAAM,IAAI,gBAAgB,CAAC,sBAAsB,CAAC,CAAC;QACrD,CAAC;QAED,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;IAC9B,CAAC;IAGqB,AAAN,KAAK,CAAC,GAAG,CACvB,IAAgB,EAChB,OAAmB;QAEnB,MAAM,MAAM,GACV,MAAM,iBAAiB,CAAC,YAAY,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;QAE1E,IAAI,SAAS,GAAwD,IAAI,CAAC;QAE1E,IAAI,CAAC;YACH,SAAS,GAAG,MAAM,GAAG,CAAC,KAAK,CAAC;gBAC1B,GAAG,EAAE,IAAI,CAAC,KAAK,CAAQ;gBACvB,IAAI,EAAE,IAAI,CAAC,cAAc,CAAe;gBACxC,OAAO,EAAE,IAAI,CAAC,iBAAiB,CAAuB;gBACtD,OAAO,EAAE,iBAAiB,CAAC,cAAc;aAC1C,CAAC,CAAC;YAEH;;;;eAIG;YACH,IAAI,SAAS,YAAY,iBAAiB,EAAE,CAAC;gBAC3C,OAAO,OAAO,CAAC,OAAO,CAAC;oBACrB,YAAY,EAAE,iBAAiB,CAAC,eAAe,CAAC,SAAS,CAAC;oBAC1D,WAAW,EAAE,MAAM,CAAC,SAAS;iBAC9B,CAAC,CAAC;YACL,CAAC;YAED,OAAO,OAAO,CAAC,OAAO,CAAC;gBACrB,YAAY,EAAE,iBAAiB,CAAC,eAAe,CAAC,SAAS,CAAC;gBAC1D,WAAW,EAAE,MAAM,CAAC,WAAW;aAChC,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,GAAG,YAAY,iBAAiB,EAAE,CAAC;gBACrC,OAAO,OAAO,CAAC,OAAO,CAAC;oBACrB,YAAY,EAAE,iBAAiB,CAAC,eAAe,CAAC,GAAG,CAAC;oBACpD,WAAW,EAAE,MAAM,CAAC,SAAS;iBAC9B,CAAC,CAAC;YACL,CAAC;YAED,IAAI,SAAS,EAAE,CAAC;gBACd,OAAO,OAAO,CAAC,OAAO,CAAC;oBACrB,YAAY,EAAE,iBAAiB,CAAC,eAAe,CAAC,SAAS,CAAC;oBAC1D,WAAW,EAAE,MAAM,CAAC,SAAS;iBAC9B,CAAC,CAAC;YACL,CAAC;YAED,OAAO,OAAO,CAAC,OAAO,CAAC;gBACrB,YAAY,EAAE;oBACZ,YAAY,EAAG,GAAa,CAAC,OAAO,IAAI,eAAe;iBACxD;gBACD,WAAW,EAAE,MAAM,CAAC,SAAS;aAC9B,CAAC,CAAC;QACL,CAAC;IACH,CAAC;CACF;AAxDuB;IADrB,WAAW,EAAE;;;;iCAwDb"}

package/build/dist/Server/Types/Workflow/Components/API/Post.js

@@ -28,7 +28,7 @@ export default class ApiPost extends ComponentCode {
         this.setMetadata(Component);
     }
     async run(args, options) {
-        const result = ApiComponentUtils.sanitizeArgs(this.getMetadata(), args, options);
+        const result = await ApiComponentUtils.sanitizeArgs(this.getMetadata(), args, options);
         let apiResult = null;
         const workflowLogAttributes = {
             projectId: options.projectId.toString(),
@@ -49,6 +49,7 @@ export default class ApiPost extends ComponentCode {
                 url: args["url"],
                 data: args["request-body"],
                 headers: args["request-headers"],
+                options: ApiComponentUtils.requestOptions,
             });
             logger.debug("API Post Component is done.", workflowLogAttributes);
             /*

package/build/dist/Server/Types/Workflow/Components/API/Post.js.map

@@ -1 +1 @@
-{"version":3,"file":"Post.js","sourceRoot":"","sources":["../../../../../../../Server/Types/Workflow/Components/API/Post.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Post.js","sourceRoot":"","sources":["../../../../../../../Server/Types/Workflow/Components/API/Post.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,aAA4C,MAAM,qBAAqB,CAAC;AAC/E,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,iBAAiB,MAAM,4CAA4C,CAAC;AAI3E,OAAO,gBAAgB,MAAM,iDAAiD,CAAC;AAK/E,OAAO,WAAW,MAAM,2CAA2C,CAAC;AACpE,OAAO,aAAa,MAAM,8CAA8C,CAAC;AACzE,OAAO,GAAG,MAAM,0BAA0B,CAAC;AAC3C,OAAO,MAAyB,MAAM,0BAA0B,CAAC;AACjE,OAAO,WAAW,MAAM,yCAAyC,CAAC;AAElE,MAAM,CAAC,OAAO,OAAO,OAAQ,SAAQ,aAAa;IAChD;QACE,KAAK,EAAE,CAAC;QAER,MAAM,SAAS,GAAkC,aAAa,CAAC,IAAI,CACjE,CAAC,CAAoB,EAAE,EAAE;YACvB,OAAO,CAAC,CAAC,EAAE,KAAK,WAAW,CAAC,OAAO,CAAC;QACtC,CAAC,CACF,CAAC;QAEF,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,MAAM,IAAI,gBAAgB,CAAC,sBAAsB,CAAC,CAAC;QACrD,CAAC;QAED,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;IAC9B,CAAC;IAGqB,AAAN,KAAK,CAAC,GAAG,CACvB,IAAgB,EAChB,OAAmB;QAEnB,MAAM,MAAM,GACV,MAAM,iBAAiB,CAAC,YAAY,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;QAE1E,IAAI,SAAS,GAAwD,IAAI,CAAC;QAE1E,MAAM,qBAAqB,GAAkB;YAC3C,SAAS,EAAE,OAAO,CAAC,SAAS,CAAC,QAAQ,EAAE;YACvC,UAAU,EAAE,OAAO,CAAC,UAAU,CAAC,QAAQ,EAAE;SAC1C,CAAC;QAEF,MAAM,CAAC,KAAK,CAAC,gCAAgC,EAAE,qBAAqB,CAAC,CAAC;QAEtE,MAAM,GAAG,GAAQ,IAAI,CAAC,KAAK,CAAQ,CAAC;QACpC,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,MAAM,OAAO,CAAC,OAAO,CAAC,IAAI,gBAAgB,CAAC,iBAAiB,CAAC,CAAC,CAAC;QACjE,CAAC;QAED,MAAM,CAAC,KAAK,CAAC,QAAQ,GAAG,EAAE,EAAE,qBAAqB,CAAC,CAAC;QAEnD,MAAM,WAAW,GAAe,IAAI,CAAC,cAAc,CAAe,CAAC;QAEnE,MAAM,CAAC,KAAK,CACV,iBAAiB,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE,EAC9C,qBAAqB,CACtB,CAAC;QAEF,MAAM,cAAc,GAAuB,IAAI,CAC7C,iBAAiB,CACI,CAAC;QAExB,MAAM,CAAC,KAAK,CACV,oBAAoB,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,EAAE,EACpD,qBAAqB,CACtB,CAAC;QAEF,IAAI,CAAC;YACH,SAAS,GAAG,MAAM,GAAG,CAAC,IAAI,CAAC;gBACzB,GAAG,EAAE,IAAI,CAAC,KAAK,CAAQ;gBACvB,IAAI,EAAE,IAAI,CAAC,cAAc,CAAe;gBACxC,OAAO,EAAE,IAAI,CAAC,iBAAiB,CAAuB;gBACtD,OAAO,EAAE,iBAAiB,CAAC,cAAc;aAC1C,CAAC,CAAC;YAEH,MAAM,CAAC,KAAK,CAAC,6BAA6B,EAAE,qBAAqB,CAAC,CAAC;YAEnE;;;;eAIG;YACH,IAAI,SAAS,YAAY,iBAAiB,EAAE,CAAC;gBAC3C,OAAO,OAAO,CAAC,OAAO,CAAC;oBACrB,YAAY,EAAE,iBAAiB,CAAC,eAAe,CAAC,SAAS,CAAC;oBAC1D,WAAW,EAAE,MAAM,CAAC,SAAS;iBAC9B,CAAC,CAAC;YACL,CAAC;YAED,OAAO,OAAO,CAAC,OAAO,CAAC;gBACrB,YAAY,EAAE,iBAAiB,CAAC,eAAe,CAAC,SAAS,CAAC;gBAC1D,WAAW,EAAE,MAAM,CAAC,WAAW;aAChC,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,GAAG,YAAY,iBAAiB,EAAE,CAAC;gBACrC,OAAO,OAAO,CAAC,OAAO,CAAC;oBACrB,YAAY,EAAE,iBAAiB,CAAC,eAAe,CAAC,GAAG,CAAC;oBACpD,WAAW,EAAE,MAAM,CAAC,SAAS;iBAC9B,CAAC,CAAC;YACL,CAAC;YAED,IAAI,SAAS,EAAE,CAAC;gBACd,OAAO,OAAO,CAAC,OAAO,CAAC;oBACrB,YAAY,EAAE,iBAAiB,CAAC,eAAe,CAAC,SAAS,CAAC;oBAC1D,WAAW,EAAE,MAAM,CAAC,SAAS;iBAC9B,CAAC,CAAC;YACL,CAAC;YAED,MAAM,CAAC,KAAK,CACV,wCAAwC,EACxC,qBAAqB,CACtB,CAAC;YACF,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,qBAAqB,CAAC,CAAC;YAEzC,OAAO,OAAO,CAAC,OAAO,CAAC;gBACrB,YAAY,EAAE;oBACZ,YAAY,EAAG,GAAa,CAAC,OAAO,IAAI,eAAe;iBACxD;gBACD,WAAW,EAAE,MAAM,CAAC,SAAS;aAC9B,CAAC,CAAC;QACL,CAAC;IACH,CAAC;CACF;AA9FuB;IADrB,WAAW,EAAE;;;;kCA8Fb"}

package/build/dist/Server/Types/Workflow/Components/API/Put.js

@@ -27,13 +27,14 @@ export default class ApiPut extends ComponentCode {
         this.setMetadata(Component);
     }
     async run(args, options) {
-        const result = ApiComponentUtils.sanitizeArgs(this.getMetadata(), args, options);
+        const result = await ApiComponentUtils.sanitizeArgs(this.getMetadata(), args, options);
         let apiResult = null;
         try {
             apiResult = await API.put({
                 url: args["url"],
                 data: args["request-body"],
                 headers: args["request-headers"],
+                options: ApiComponentUtils.requestOptions,
             });
             /*
              * On the server API resolves with an HTTPErrorResponse instead of

package/build/dist/Server/Types/Workflow/Components/API/Put.js.map

@@ -1 +1 @@
-{"version":3,"file":"Put.js","sourceRoot":"","sources":["../../../../../../../Server/Types/Workflow/Components/API/Put.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,aAA4C,MAAM,qBAAqB,CAAC;AAC/E,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,iBAAiB,MAAM,4CAA4C,CAAC;AAI3E,OAAO,gBAAgB,MAAM,iDAAiD,CAAC;AAK/E,OAAO,WAAW,MAAM,2CAA2C,CAAC;AACpE,OAAO,aAAa,MAAM,8CAA8C,CAAC;AACzE,OAAO,GAAG,MAAM,0BAA0B,CAAC;AAC3C,OAAO,WAAW,MAAM,yCAAyC,CAAC;AAElE,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,aAAa;IAC/C;QACE,KAAK,EAAE,CAAC;QAER,MAAM,SAAS,GAAkC,aAAa,CAAC,IAAI,CACjE,CAAC,CAAoB,EAAE,EAAE;YACvB,OAAO,CAAC,CAAC,EAAE,KAAK,WAAW,CAAC,MAAM,CAAC;QACrC,CAAC,CACF,CAAC;QAEF,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,MAAM,IAAI,gBAAgB,CAAC,sBAAsB,CAAC,CAAC;QACrD,CAAC;QAED,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;IAC9B,CAAC;IAGqB,AAAN,KAAK,CAAC,GAAG,CACvB,IAAgB,EAChB,OAAmB;QAEnB,MAAM,MAAM,GACV,iBAAiB,CAAC,YAAY,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;QAEpE,IAAI,SAAS,GAAwD,IAAI,CAAC;QAE1E,IAAI,CAAC;YACH,SAAS,GAAG,MAAM,GAAG,CAAC,GAAG,CAAC;gBACxB,GAAG,EAAE,IAAI,CAAC,KAAK,CAAQ;gBACvB,IAAI,EAAE,IAAI,CAAC,cAAc,CAAe;gBACxC,OAAO,EAAE,IAAI,CAAC,iBAAiB,CAAuB;aACvD,CAAC,CAAC;YAEH;;;;;eAKG;YACH,IAAI,SAAS,YAAY,iBAAiB,EAAE,CAAC;gBAC3C,OAAO,OAAO,CAAC,OAAO,CAAC;oBACrB,YAAY,EAAE,iBAAiB,CAAC,eAAe,CAAC,SAAS,CAAC;oBAC1D,WAAW,EAAE,MAAM,CAAC,SAAS;iBAC9B,CAAC,CAAC;YACL,CAAC;YAED,OAAO,OAAO,CAAC,OAAO,CAAC;gBACrB,YAAY,EAAE,iBAAiB,CAAC,eAAe,CAAC,SAAS,CAAC;gBAC1D,WAAW,EAAE,MAAM,CAAC,WAAW;aAChC,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,GAAG,YAAY,iBAAiB,EAAE,CAAC;gBACrC,OAAO,OAAO,CAAC,OAAO,CAAC;oBACrB,YAAY,EAAE,iBAAiB,CAAC,eAAe,CAAC,GAAG,CAAC;oBACpD,WAAW,EAAE,MAAM,CAAC,SAAS;iBAC9B,CAAC,CAAC;YACL,CAAC;YAED,IAAI,SAAS,EAAE,CAAC;gBACd,OAAO,OAAO,CAAC,OAAO,CAAC;oBACrB,YAAY,EAAE,iBAAiB,CAAC,eAAe,CAAC,SAAS,CAAC;oBAC1D,WAAW,EAAE,MAAM,CAAC,SAAS;iBAC9B,CAAC,CAAC;YACL,CAAC;YAED,OAAO,OAAO,CAAC,OAAO,CAAC;gBACrB,YAAY,EAAE;oBACZ,YAAY,EAAG,GAAa,CAAC,OAAO,IAAI,eAAe;iBACxD;gBACD,WAAW,EAAE,MAAM,CAAC,SAAS;aAC9B,CAAC,CAAC;QACL,CAAC;IACH,CAAC;CACF;AAxDuB;IADrB,WAAW,EAAE;;;;iCAwDb"}
+{"version":3,"file":"Put.js","sourceRoot":"","sources":["../../../../../../../Server/Types/Workflow/Components/API/Put.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,aAA4C,MAAM,qBAAqB,CAAC;AAC/E,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,iBAAiB,MAAM,4CAA4C,CAAC;AAI3E,OAAO,gBAAgB,MAAM,iDAAiD,CAAC;AAK/E,OAAO,WAAW,MAAM,2CAA2C,CAAC;AACpE,OAAO,aAAa,MAAM,8CAA8C,CAAC;AACzE,OAAO,GAAG,MAAM,0BAA0B,CAAC;AAC3C,OAAO,WAAW,MAAM,yCAAyC,CAAC;AAElE,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,aAAa;IAC/C;QACE,KAAK,EAAE,CAAC;QAER,MAAM,SAAS,GAAkC,aAAa,CAAC,IAAI,CACjE,CAAC,CAAoB,EAAE,EAAE;YACvB,OAAO,CAAC,CAAC,EAAE,KAAK,WAAW,CAAC,MAAM,CAAC;QACrC,CAAC,CACF,CAAC;QAEF,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,MAAM,IAAI,gBAAgB,CAAC,sBAAsB,CAAC,CAAC;QACrD,CAAC;QAED,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;IAC9B,CAAC;IAGqB,AAAN,KAAK,CAAC,GAAG,CACvB,IAAgB,EAChB,OAAmB;QAEnB,MAAM,MAAM,GACV,MAAM,iBAAiB,CAAC,YAAY,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;QAE1E,IAAI,SAAS,GAAwD,IAAI,CAAC;QAE1E,IAAI,CAAC;YACH,SAAS,GAAG,MAAM,GAAG,CAAC,GAAG,CAAC;gBACxB,GAAG,EAAE,IAAI,CAAC,KAAK,CAAQ;gBACvB,IAAI,EAAE,IAAI,CAAC,cAAc,CAAe;gBACxC,OAAO,EAAE,IAAI,CAAC,iBAAiB,CAAuB;gBACtD,OAAO,EAAE,iBAAiB,CAAC,cAAc;aAC1C,CAAC,CAAC;YAEH;;;;;eAKG;YACH,IAAI,SAAS,YAAY,iBAAiB,EAAE,CAAC;gBAC3C,OAAO,OAAO,CAAC,OAAO,CAAC;oBACrB,YAAY,EAAE,iBAAiB,CAAC,eAAe,CAAC,SAAS,CAAC;oBAC1D,WAAW,EAAE,MAAM,CAAC,SAAS;iBAC9B,CAAC,CAAC;YACL,CAAC;YAED,OAAO,OAAO,CAAC,OAAO,CAAC;gBACrB,YAAY,EAAE,iBAAiB,CAAC,eAAe,CAAC,SAAS,CAAC;gBAC1D,WAAW,EAAE,MAAM,CAAC,WAAW;aAChC,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,GAAG,YAAY,iBAAiB,EAAE,CAAC;gBACrC,OAAO,OAAO,CAAC,OAAO,CAAC;oBACrB,YAAY,EAAE,iBAAiB,CAAC,eAAe,CAAC,GAAG,CAAC;oBACpD,WAAW,EAAE,MAAM,CAAC,SAAS;iBAC9B,CAAC,CAAC;YACL,CAAC;YAED,IAAI,SAAS,EAAE,CAAC;gBACd,OAAO,OAAO,CAAC,OAAO,CAAC;oBACrB,YAAY,EAAE,iBAAiB,CAAC,eAAe,CAAC,SAAS,CAAC;oBAC1D,WAAW,EAAE,MAAM,CAAC,SAAS;iBAC9B,CAAC,CAAC;YACL,CAAC;YAED,OAAO,OAAO,CAAC,OAAO,CAAC;gBACrB,YAAY,EAAE;oBACZ,YAAY,EAAG,GAAa,CAAC,OAAO,IAAI,eAAe;iBACxD;gBACD,WAAW,EAAE,MAAM,CAAC,SAAS;aAC9B,CAAC,CAAC;QACL,CAAC;IACH,CAAC;CACF;AAzDuB;IADrB,WAAW,EAAE;;;;iCAyDb"}

package/build/dist/Server/Types/Workflow/Components/API/Utils.js

@@ -10,7 +10,9 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 import HTTPErrorResponse from "../../../../../Types/API/HTTPErrorResponse";
 import URL from "../../../../../Types/API/URL";
 import BadDataException from "../../../../../Types/Exception/BadDataException";
+import Exception from "../../../../../Types/Exception/Exception";
 import JSONFunctions from "../../../../../Types/JSONFunctions";
+import SSRFProtection from "../../../../Utils/SSRFProtection";
 import CaptureSpan from "../../../../Utils/Telemetry/CaptureSpan";
 export class ApiComponentUtils {
     static getReturnValues(response) {
@@ -29,7 +31,7 @@ export class ApiComponentUtils {
             error: null,
         };
     }
-    static sanitizeArgs(metadata, args, options) {
+    static async sanitizeArgs(metadata, args, options) {
         const successPort = metadata.outPorts.find((p) => {
             return p.id === "success";
         });
@@ -55,10 +57,41 @@ export class ApiComponentUtils {
         if (args["url"] && typeof args["url"] !== "string") {
             throw options.onError(new BadDataException("URL is not type of string"));
         }
+        /*
+         * The URL is authored by whoever built the workflow - i.e. any member of
+         * any project - and the request goes out from the server, which sits
+         * inside the cluster and next to the cloud metadata endpoint. Without this
+         * check the API components are an authenticated request proxy into the
+         * private network: GET http://169.254.169.254/latest/meta-data/iam/... and
+         * the credentials come back in the component's "response-body" return
+         * value, in plain sight in the workflow log. Resolve and blocklist the
+         * target the same way outbound webhooks already do.
+         *
+         * Validate the RAW string, before URL.fromString - that parser defaults an
+         * unrecognized scheme to https, so "file:///etc/passwd" would reach the
+         * check already rewritten as host "file".
+         */
+        try {
+            await SSRFProtection.validateWebhookTargetIsSafe(args["url"]);
+        }
+        catch (err) {
+            throw options.onError(new BadDataException(err instanceof Exception
+                ? err.message
+                : "URL points to an address that is not allowed."));
+        }
         args["url"] = URL.fromString(args["url"]);
         return { args, successPort, errorPort };
     }
 }
+/*
+ * Every API component sends its request with these. Redirects MUST stay off:
+ * sanitizeArgs validates the URL before the request is dispatched, and a
+ * validated public host that answers 302 -> http://169.254.169.254/ would
+ * otherwise walk the server straight past that check.
+ */
+ApiComponentUtils.requestOptions = {
+    doNotFollowRedirects: true,
+};
 __decorate([
     CaptureSpan(),
     __metadata("design:type", Function),
@@ -69,6 +102,6 @@ __decorate([
     CaptureSpan(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object, Object]),
-    __metadata("design:returntype", Object)
+    __metadata("design:returntype", Promise)
 ], ApiComponentUtils, "sanitizeArgs", null);
 //# sourceMappingURL=Utils.js.map