npm - @oneuptime/common - Versions diffs - 12.0.6 → 12.0.8 - Mend

@oneuptime/common 12.0.6 → 12.0.8

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 (594) hide show

package/build/dist/Server/Services/TeamMemberService.js CHANGED Viewed

@@ -93,9 +93,33 @@ export class TeamMemberService extends DatabaseService {
                 throw new BadDataException(Errors.TeamMemberService.LIMIT_REACHED_FOR_FREE_PLAN);
             }
         }
-        if (!createBy.props.isRoot) {
+        /*
+         * Only internal writes (isRoot) and a master admin acting from the Admin
+         * Dashboard may create a membership that is already accepted - that is the
+         * "accept the invitation automatically" checkbox on the admin invite forms.
+         *
+         * Everyone else invites, and the invited person accepts for themselves. A
+         * project admin who could accept on someone's behalf would be able to pull
+         * an account into their project - and into whatever the team's permissions
+         * grant - without that person ever agreeing to it.
+         */
+        const canCreateAcceptedInvitation = Boolean(createBy.props.isRoot || createBy.props.isMasterAdmin);
+        if (!canCreateAcceptedInvitation) {
             createBy.data.hasAcceptedInvitation = false;
         }
+        const isInvitationAcceptedOnCreate = Boolean(createBy.data.hasAcceptedInvitation);
+        /*
+         * The acceptance timestamp is stamped here rather than taken from the
+         * request, so it can never disagree with hasAcceptedInvitation - a row that
+         * says "Member" with no accepted-at date, or an accepted-at date on a row
+         * that is still only invited.
+         */
+        if (isInvitationAcceptedOnCreate) {
+            createBy.data.invitationAcceptedAt = OneUptimeDate.getCurrentDate();
+        }
+        else {
+            delete createBy.data.invitationAcceptedAt;
+        }
         if (createBy.miscDataProps && createBy.miscDataProps["email"]) {
             const email = new Email(createBy.miscDataProps["email"]);
             /*
@@ -171,10 +195,18 @@ export class TeamMemberService extends DatabaseService {
                             .addQueryParam("email", email.toString(), true)
                             .toString(),
                         isNewUser: isNewUser.toString(),
+                        /*
+                         * An auto-accepted member has nothing left to accept, so the
+                         * template drops the "sign in to accept your invitation" framing
+                         * and tells them they are already in.
+                         */
+                        isInvitationAccepted: isInvitationAcceptedOnCreate.toString(),
                         projectName: project.name,
                         homeUrl: new URL(httpProtocol, host).toString(),
                     },
-                    subject: "You have been invited to " + project.name,
+                    subject: isInvitationAcceptedOnCreate
+                        ? "You have been added to " + project.name
+                        : "You have been invited to " + project.name,
                 }, {
                     projectId: createBy.data.projectId,
                     userId: user.id,
@@ -215,10 +247,61 @@ export class TeamMemberService extends DatabaseService {
         await AccessTokenService.refreshUserGlobalAccessPermission(userId);
         await AccessTokenService.refreshUserTenantAccessPermission(userId, projectId);
     }
+    /*
+     * The per-project notification defaults a member gets the moment their
+     * membership becomes accepted, whether that happened by them accepting the
+     * invitation or by a master admin accepting it for them on create. Without
+     * these, an auto-accepted member is a member who is never notified about
+     * anything.
+     *
+     * Skipped for an unverified email: UserService adds the defaults for every
+     * accepted membership once the address is verified.
+     *
+     * Best effort. Both helpers below are idempotent, and by the time either
+     * caller runs, the membership row is already committed - failing the write
+     * that created it would report "invite failed" for a member who exists.
+     */
+    async addDefaultNotificationSettingsAndRules(data) {
+        try {
+            const user = data.user ||
+                (await UserService.findOneById({
+                    id: data.userId,
+                    select: {
+                        email: true,
+                        isEmailVerified: true,
+                    },
+                    props: {
+                        isRoot: true,
+                    },
+                }));
+            if (!user || !user.isEmailVerified || !user.email) {
+                return;
+            }
+            await UserNotificationSettingService.addDefaultNotificationSettingsForUser(data.userId, data.projectId);
+            await UserNotificationRuleService.addDefaultNotificationRuleForUser(data.projectId, data.userId, user.email);
+        }
+        catch (err) {
+            logger.error(err, {
+                projectId: data.projectId.toString(),
+                userId: data.userId.toString(),
+            });
+        }
+    }
     async onCreateSuccess(onCreate, createdItem) {
         var _a;
         await this.refreshTokens(onCreate.createBy.data.userId, onCreate.createBy.data.projectId);
         await this.updateSubscriptionSeatsByUniqueTeamMembersInProject(onCreate.createBy.data.projectId);
+        /*
+         * A membership created already accepted never goes through the
+         * accept-invitation update, so it would otherwise miss the defaults that
+         * hook adds.
+         */
+        if (createdItem.hasAcceptedInvitation) {
+            await this.addDefaultNotificationSettingsAndRules({
+                userId: onCreate.createBy.data.userId,
+                projectId: onCreate.createBy.data.projectId,
+            });
+        }
         // Activation event for marketing funnels, attributed to the inviter.
         ProductAnalytics.captureForUser({
             userId: onCreate.createBy.props.userId,
@@ -231,7 +314,6 @@ export class TeamMemberService extends DatabaseService {
         return createdItem;
     }
     async onUpdateSuccess(onUpdate, updatedItemIds) {
-        var _a, _b;
         const updateBy = onUpdate.updateBy;
         const items = await this.findBy({
             query: {
@@ -253,9 +335,12 @@ export class TeamMemberService extends DatabaseService {
         });
         for (const item of items) {
             await this.refreshTokens(item.userId, item.projectId);
-            if (updateBy.data.hasAcceptedInvitation && ((_a = item.user) === null || _a === void 0 ? void 0 : _a.isEmailVerified)) {
-                await UserNotificationSettingService.addDefaultNotificationSettingsForUser(item.userId, item.projectId);
-                await UserNotificationRuleService.addDefaultNotificationRuleForUser(item.projectId, item.userId, (_b = item.user) === null || _b === void 0 ? void 0 : _b.email);
+            if (updateBy.data.hasAcceptedInvitation) {
+                await this.addDefaultNotificationSettingsAndRules({
+                    userId: item.userId,
+                    projectId: item.projectId,
+                    user: item.user,
+                });
             }
         }
         return { updateBy, carryForward: onUpdate.carryForward };
@@ -520,6 +605,12 @@ __decorate([
         ObjectID]),
     __metadata("design:returntype", Promise)
 ], TeamMemberService.prototype, "refreshTokens", null);
+__decorate([
+    CaptureSpan(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Promise)
+], TeamMemberService.prototype, "addDefaultNotificationSettingsAndRules", null);
 __decorate([
     CaptureSpan(),
     __metadata("design:type", Function),

package/build/dist/Server/Services/TeamMemberService.js.map CHANGED Viewed

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

package/build/dist/Server/Services/TelemetryEntityRelationshipService.js CHANGED Viewed

@@ -12,6 +12,7 @@ import Model from "../../Models/DatabaseModels/TelemetryEntityRelationship";
 import OneUptimeDate from "../../Types/Date";
 import logger from "../Utils/Logger";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
+import EntitySource from "../../Types/Telemetry/EntitySource";
 import { reconcileByNaturalKey } from "../Utils/Telemetry/EntityRegistry";
 export class TelemetryEntityRelationshipService extends DatabaseService {
     constructor() {
@@ -56,6 +57,8 @@ export class TelemetryEntityRelationshipService extends DatabaseService {
                 model.fromEntityKey = edge.fromEntityKey;
                 model.toEntityKey = edge.toEntityKey;
                 model.relationshipType = edge.relationshipType;
+                // Explicit: this is what makes the edge eligible for stale pruning.
+                model.source = EntitySource.Discovered;
                 model.firstSeenAt = now;
                 model.lastSeenAt = now;
                 if (edge.metrics) {

package/build/dist/Server/Services/TelemetryEntityRelationshipService.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"TelemetryEntityRelationshipService.js","sourceRoot":"","sources":["../../../../Server/Services/TelemetryEntityRelationshipService.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,MAAM,yDAAyD,CAAC;AAE5E,OAAO,aAAa,MAAM,kBAAkB,CAAC;AAC7C,OAAO,MAAM,MAAM,iBAAiB,CAAC;AACrC,OAAO,WAAW,MAAM,gCAAgC,CAAC;AAEzD,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAG1E,MAAM,OAAO,kCAAmC,SAAQ,eAAsB;IAC5E;QACE,KAAK,CAAC,KAAK,CAAC,CAAC;IACf,CAAC;IAED;;;;;;;OAOG;IAEU,AAAN,KAAK,CAAC,sBAAsB,CAAC,IAGnC;QACC,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YAC9B,IAAI,CAAC;gBACH,MAAM,IAAI,CAAC,kBAAkB,CAAC,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YACrE,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,MAAM,CAAC,KAAK,CACV,6DAA6D,IAAI,CAAC,aAAa,KAAK,IAAI,CAAC,gBAAgB,MAAM,IAAI,CAAC,WAAW,GAAG,CACnI,CAAC;gBACF,MAAM,CAAC,KAAK,CAAC,GAAY,CAAC,CAAC;YAC7B,CAAC;QACH,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,kBAAkB,CAAC,IAGhC;QACC,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;QACjC,MAAM,GAAG,GAAS,aAAa,CAAC,cAAc,EAAE,CAAC;QAEjD,MAAM,qBAAqB,CAAC;YAC1B,OAAO,EAAE,IAAI;YACb,KAAK,EAAE;gBACL,SAAS;gBACT,aAAa,EAAE,IAAI,CAAC,aAAa;gBACjC,WAAW,EAAE,IAAI,CAAC,WAAW;gBAC7B,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;aACxC;YACD,UAAU,EAAE,GAAG;YACf,QAAQ,EAAE,QAAQ,IAAI,CAAC,aAAa,KAAK,IAAI,CAAC,gBAAgB,MAAM,IAAI,CAAC,WAAW,EAAE;YACtF,UAAU,EAAE,GAAG,SAAS,CAAC,QAAQ,EAAE,IAAI,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,gBAAgB,EAAE;YACxG,UAAU,EAAE,GAAG,EAAE;gBACf,MAAM,KAAK,GAAU,IAAI,KAAK,EAAE,CAAC;gBACjC,KAAK,CAAC,SAAS,GAAG,SAAS,CAAC;gBAC5B,KAAK,CAAC,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC;gBACzC,KAAK,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;gBACrC,KAAK,CAAC,gBAAgB,GAAG,IAAI,CAAC,gBAAgB,CAAC;gBAC/C,KAAK,CAAC,WAAW,GAAG,GAAG,CAAC;gBACxB,KAAK,CAAC,UAAU,GAAG,GAAG,CAAC;gBACvB,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;oBACjB,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC;oBACzC,KAAK,CAAC,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC;oBAC3C,KAAK,CAAC,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC;gBACnD,CAAC;gBACD,OAAO,KAAK,CAAC;YACf,CAAC;YACD;;;;;;eAMG;YACH,WAAW,EAAE,GAAkC,EAAE;gBAC/C,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;oBAClB,OAAO,EAAmC,CAAC;gBAC7C,CAAC;gBACD,OAAO;oBACL,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS;oBACjC,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU;oBACnC,aAAa,EAAE,IAAI,CAAC,OAAO,CAAC,aAAa;iBACE,CAAC;YAChD,CAAC;SACF,CAAC,CAAC;IACL,CAAC;CACF;~~AApEc~~;IADZ,WAAW,EAAE;;;;gFAeb;~~AAwDH~~,eAAe,IAAI,kCAAkC,EAAE,CAAC"}
1	+ {"version":3,"file":"TelemetryEntityRelationshipService.js","sourceRoot":"","sources":["../../../../Server/Services/TelemetryEntityRelationshipService.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/Services/TelemetryEntityService.js CHANGED Viewed

@@ -15,7 +15,11 @@ import SortOrder from "../../Types/BaseDatabase/SortOrder";
 import ObjectID from "../../Types/ObjectID";
 import OneUptimeDate from "../../Types/Date";
 import ColumnLength from "../../Types/Database/ColumnLength";
+import BadDataException from "../../Types/Exception/BadDataException";
+import EntitySource from "../../Types/Telemetry/EntitySource";
 import EntityType from "../../Types/Telemetry/EntityType";
+import { MANUAL_ENTITY_TYPES } from "../../Types/Telemetry/EntityTypeGroups";
+import { canonicalizeEntityValue, computeEntityKey, MANUAL_ENTITY_IDENTITY_ATTRIBUTE, } from "../../Utils/Telemetry/EntityKey";
 import logger from "../Utils/Logger";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 import { getEntityBudget, reconcileByNaturalKey, REGISTRY_PROMOTED_TYPES, shouldWarnEntityBudgetOnce, } from "../Utils/Telemetry/EntityRegistry";
@@ -23,6 +27,69 @@ export class TelemetryEntityService extends DatabaseService {
     constructor() {
         super(Model);
     }
+    /**
+     * Completes a manually created CI.
+     *
+     * Every machine writer — the ingest reconciler and the inventory mirror —
+     * computes `entityKey` itself and passes an explicit `source`, because
+     * both derive identity from something the user never sees (a canonicalized
+     * semconv attribute set, or the owning row's id). A create arriving
+     * WITHOUT a key is therefore a user create by construction, and this hook
+     * is what turns the two fields a human can reasonably supply (type and
+     * name) into the identity the registry needs.
+     *
+     * Deriving the key here rather than in the dashboard keeps it enforced for
+     * API clients too, and keeps the one identity rule — canonicalize, then
+     * hash — in the module that owns it.
+     */
+    async onBeforeCreate(createBy) {
+        const data = createBy.data;
+        if (!data.entityKey) {
+            data.source = EntitySource.Manual;
+        }
+        if (data.source !== EntitySource.Manual) {
+            return { createBy, carryForward: null };
+        }
+        if (!data.projectId) {
+            throw new BadDataException("Project ID is required.");
+        }
+        if (!data.entityType) {
+            throw new BadDataException("Entity Type is required.");
+        }
+        /*
+         * Confined to the manual-only vocabulary. A hand-made row of an
+         * observable type would key off the manual identity attribute and so
+         * could never converge with the row ingest derives for the same thing —
+         * it would just sit beside it forever. See MANUAL_ENTITY_TYPES.
+         */
+        if (!MANUAL_ENTITY_TYPES.has(data.entityType)) {
+            throw new BadDataException(`Entities of type ${data.entityType} are discovered automatically and cannot be created manually. Manually creatable types are: ${Array.from(MANUAL_ENTITY_TYPES).join(", ")}.`);
+        }
+        const displayName = (data.displayName || "").trim();
+        if (!displayName) {
+            throw new BadDataException("Name is required for a manually created entity.");
+        }
+        data.displayName = displayName.substring(0, ColumnLength.ShortText);
+        const identifyingAttributes = {
+            [MANUAL_ENTITY_IDENTITY_ATTRIBUTE]: canonicalizeEntityValue(displayName),
+        };
+        data.identifyingAttributes = identifyingAttributes;
+        data.entityKey = computeEntityKey({
+            projectId: data.projectId.toString(),
+            entityType: data.entityType,
+            identifyingAttributes,
+        });
+        /*
+         * Stamped so the explorer can sort manual CIs alongside discovered ones
+         * on the same columns. `lastSeenAt` never moves again for these rows —
+         * it means "created", not "observed" — which is exactly why the prune
+         * sweep excludes them.
+         */
+        const now = OneUptimeDate.getCurrentDate();
+        data.firstSeenAt = data.firstSeenAt || now;
+        data.lastSeenAt = data.lastSeenAt || now;
+        return { createBy, carryForward: null };
+    }
     /**
      * Forward-only registry reconciliation: upsert a catalog row per
      * discovered entity, bump `lastSeenAt`, merge descriptive attributes
@@ -144,7 +211,18 @@ export class TelemetryEntityService extends DatabaseService {
                 let count = countByType.get(entity.entityType);
                 if (count === undefined) {
                     count = (await this.countBy({
-                        query: { projectId, entityType: entity.entityType },
+                        query: {
+                            projectId,
+                            entityType: entity.entityType,
+                            /*
+                             * The budget exists to bound rows minted by ingest, so it
+                             * counts only those. Manual CIs and inventory mirrors are
+                             * bounded by their own creators and must not consume it —
+                             * otherwise registering enough devices could stop new
+                             * telemetry entities being recorded at all.
+                             */
+                            source: EntitySource.Discovered,
+                        },
                         props: { isRoot: true },
                     })).toNumber();
                     countByType.set(entity.entityType, count);
@@ -166,6 +244,12 @@ export class TelemetryEntityService extends DatabaseService {
                 model.projectId = projectId;
                 model.entityType = entity.entityType;
                 model.entityKey = entity.entityKey;
+                /*
+                 * Explicit rather than leaning on the column default: this is the
+                 * flag that makes the row eligible for stale-entity pruning, and a
+                 * silently-defaulted value is a poor way to carry that.
+                 */
+                model.source = EntitySource.Discovered;
                 model.identifyingAttributes = entity.identifyingAttributes;
                 if (entity.descriptiveAttributes &&
                     Object.keys(entity.descriptiveAttributes).length > 0) {
@@ -254,6 +338,12 @@ export class TelemetryEntityService extends DatabaseService {
         return entity.entityKey;
     }
 }
+__decorate([
+    CaptureSpan(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Promise)
+], TelemetryEntityService.prototype, "onBeforeCreate", null);
 __decorate([
     CaptureSpan(),
     __metadata("design:type", Function),

package/build/dist/Server/Services/TelemetryEntityService.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"TelemetryEntityService.js","sourceRoot":"","sources":["../../../../Server/Services/TelemetryEntityService.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,MAAM,6CAA6C,CAAC;AAEhE,OAAO,cAAc,MAAM,kBAAkB,CAAC;AAC9C,OAAO,WAAW,MAAM,+BAA+B,CAAC;AACxD,OAAO,SAAS,MAAM,oCAAoC,CAAC;AAC3D,OAAO,QAAQ,MAAM,sBAAsB,CAAC;AAC5C,OAAO,aAAa,MAAM,kBAAkB,CAAC;AAC7C,OAAO,YAAY,MAAM,mCAAmC,CAAC;~~AAG7D~~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~~EAAE,~~SAAS,~~EAAE,~~UAAU,EAAE,MAAM,CAAC,UAAU,EAAE;~~wBACnD~~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~~AAhRc~~;IADZ,WAAW,EAAE;;;;+DA+Bb;~~AAoPH~~,eAAe,IAAI,sBAAsB,EAAE,CAAC"}
1	+ {"version":3,"file":"TelemetryEntityService.js","sourceRoot":"","sources":["../../../../Server/Services/TelemetryEntityService.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/Services/TelemetryIngestionKeyService.js CHANGED Viewed

@@ -67,6 +67,7 @@ export class Service extends DatabaseService {
         }
         let secretKeyObjectId;
         try {
+            ObjectID.validateUUID(secretKey);
             secretKeyObjectId = new ObjectID(secretKey);
         }
         catch (_a) {

package/build/dist/Server/Services/TelemetryIngestionKeyService.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"TelemetryIngestionKeyService.js","sourceRoot":"","sources":["../../../../Server/Services/TelemetryIngestionKeyService.ts"],"names":[],"mappings":"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~~AA/E0B~~;IADxB,WAAW,EAAE;;;;6CASb;AAGwB;IADxB,WAAW,EAAE;;;;6CAUb;AAGwB;IADxB,WAAW,EAAE;;;;6CAUb;AASY;IADZ,WAAW,EAAE;;;;~~wDAsCb~~;AAGH,eAAe,IAAI,OAAO,EAAE,CAAC"}
1	+ {"version":3,"file":"TelemetryIngestionKeyService.js","sourceRoot":"","sources":["../../../../Server/Services/TelemetryIngestionKeyService.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/Services/UserWebhookService.js CHANGED Viewed

@@ -14,7 +14,17 @@ import BadDataException from "../../Types/Exception/BadDataException";
 import Model from "../../Models/DatabaseModels/UserWebhook";
 import URL from "../../Types/API/URL";
 import logger from "../Utils/Logger";
+import SSRFProtection from "../Utils/SSRFProtection";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
+/*
+ * URL validation here used to be a hand-rolled copy of the SSRF blocklist that
+ * had drifted weaker than the original (it compared the host with the port
+ * still attached, and never resolved DNS). Everything that actually sends one
+ * of these webhooks goes through WebhookService, which calls
+ * SSRFProtection.validateWebhookTargetIsSafe — so the copy bought nothing and
+ * would have been read as "this is checked". Both hooks now call the same
+ * guard the sender does, which fails the write early instead of at delivery.
+ */
 export class Service extends DatabaseService {
     constructor() {
         super(Model);
@@ -26,12 +36,26 @@ export class Service extends DatabaseService {
         if (!createBy.data.name) {
             throw new BadDataException("Webhook name is required");
         }
-        this.validateWebhookUrl(createBy.data.webhookUrl);
+        await SSRFProtection.validateWebhookTargetIsSafe(createBy.data.webhookUrl);
         return {
             createBy,
             carryForward: null,
         };
     }
+    async onBeforeUpdate(updateBy) {
+        /*
+         * Create-time validation on its own is not a control: the URL is
+         * editable afterwards.
+         */
+        const webhookUrl = updateBy.data.webhookUrl;
+        if (typeof webhookUrl === "string" || webhookUrl instanceof URL) {
+            await SSRFProtection.validateWebhookTargetIsSafe(webhookUrl);
+        }
+        return {
+            updateBy,
+            carryForward: null,
+        };
+    }
     async onCreateSuccess(_onCreate, createdItem) {
         /* Webhooks skip verification, so default on-call rules are seeded at create time. */
         if (createdItem.projectId && createdItem.userId && createdItem.id) {
@@ -81,26 +105,6 @@ export class Service extends DatabaseService {
             carryForward: null,
         };
     }
-    validateWebhookUrl(rawUrl) {
-        let parsed;
-        try {
-            parsed = URL.fromString(rawUrl);
-        }
-        catch (_a) {
-            throw new BadDataException("Webhook URL is not a valid URL");
-        }
-        const protocolValue = parsed.protocol.toString().toLowerCase();
-        if (protocolValue !== "http://" && protocolValue !== "https://") {
-            throw new BadDataException("Webhook URL must use http or https protocol.");
-        }
-        const hostname = parsed.hostname.hostname.toLowerCase();
-        if (!hostname) {
-            throw new BadDataException("Webhook URL must include a host.");
-        }
-        if (isBlockedHostnameLiteral(hostname)) {
-            throw new BadDataException("Webhook URL points to a private, loopback, or link-local address and is not allowed.");
-        }
-    }
 }
 __decorate([
     CaptureSpan(),
@@ -108,6 +112,12 @@ __decorate([
     __metadata("design:paramtypes", [Object]),
     __metadata("design:returntype", Promise)
 ], Service.prototype, "onBeforeCreate", null);
+__decorate([
+    CaptureSpan(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Promise)
+], Service.prototype, "onBeforeUpdate", null);
 __decorate([
     CaptureSpan(),
     __metadata("design:type", Function),
@@ -120,71 +130,5 @@ __decorate([
     __metadata("design:paramtypes", [Object]),
     __metadata("design:returntype", Promise)
 ], Service.prototype, "onBeforeDelete", null);
-function isBlockedHostnameLiteral(hostname) {
-    if (hostname === "localhost" ||
-        hostname.endsWith(".localhost") ||
-        hostname === "metadata.google.internal") {
-        return true;
-    }
-    // IPv4 literal check
-    const ipv4Match = hostname.match(/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/);
-    if (ipv4Match) {
-        const octets = [
-            Number(ipv4Match[1]),
-            Number(ipv4Match[2]),
-            Number(ipv4Match[3]),
-            Number(ipv4Match[4]),
-        ];
-        if (octets.some((o) => {
-            return o < 0 || o > 255;
-        })) {
-            return true;
-        }
-        // 0.0.0.0/8
-        if (octets[0] === 0) {
-            return true;
-        }
-        // 127.0.0.0/8 loopback
-        if (octets[0] === 127) {
-            return true;
-        }
-        // 10.0.0.0/8
-        if (octets[0] === 10) {
-            return true;
-        }
-        // 172.16.0.0/12
-        if (octets[0] === 172 && (octets[1] & 0xf0) === 16) {
-            return true;
-        }
-        // 192.168.0.0/16
-        if (octets[0] === 192 && octets[1] === 168) {
-            return true;
-        }
-        // 169.254.0.0/16 link-local (incl. cloud metadata)
-        if (octets[0] === 169 && octets[1] === 254) {
-            return true;
-        }
-        // 100.64.0.0/10 carrier-grade NAT
-        if (octets[0] === 100 && (octets[1] & 0xc0) === 64) {
-            return true;
-        }
-        return false;
-    }
-    // IPv6 literal — block loopback, link-local, unique-local
-    if (hostname.includes(":")) {
-        const stripped = hostname.replace(/^\[|\]$/g, "");
-        if (stripped === "::1" || stripped === "::") {
-            return true;
-        }
-        if (stripped.startsWith("fe80:") || stripped.startsWith("fe80::")) {
-            return true;
-        }
-        if (IPV6_UNIQUE_LOCAL_REGEX.test(stripped)) {
-            return true;
-        }
-    }
-    return false;
-}
-const IPV6_UNIQUE_LOCAL_REGEX = /^f[cd][0-9a-f]{2}:/;
 export default new Service();
 //# sourceMappingURL=UserWebhookService.js.map

package/build/dist/Server/Services/UserWebhookService.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"UserWebhookService.js","sourceRoot":"","sources":["../../../../Server/Services/UserWebhookService.ts"],"names":[],"mappings":";;;;;;;;;~~AAGA~~,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,2BAA2B,MAAM,+BAA+B,CAAC;AACxE,OAAO,SAAS,MAAM,+BAA+B,CAAC;AACtD,OAAO,gBAAgB,MAAM,wCAAwC,CAAC;AACtE,OAAO,KAAK,MAAM,yCAAyC,CAAC;AAC5D,OAAO,GAAG,MAAM,qBAAqB,CAAC;AACtC,OAAO,MAAM,MAAM,iBAAiB,CAAC;AACrC,OAAO,WAAW,MAAM,gCAAgC,CAAC;AAEzD,MAAM,OAAO,OAAQ,SAAQ,eAAsB;IACjD;QACE,KAAK,CAAC,KAAK,CAAC,CAAC;IACf,CAAC;IAGwB,AAAN,KAAK,CAAC,cAAc,CACrC,QAAyB;QAEzB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YAC9B,MAAM,IAAI,gBAAgB,CAAC,yBAAyB,CAAC,CAAC;QACxD,CAAC;QAED,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;YACxB,MAAM,IAAI,gBAAgB,CAAC,0BAA0B,CAAC,CAAC;QACzD,CAAC;QAED,IAAI,CAAC,~~kBAAkB~~,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;~~QAElD~~,OAAO;YACL,QAAQ;YACR,YAAY,EAAE,IAAI;SACnB,CAAC;IACJ,CAAC;IAGwB,AAAN,KAAK,CAAC,eAAe,CACtC,SAA0B,EAC1B,WAAkB;QAElB,qFAAqF;QACrF,IAAI,WAAW,CAAC,SAAS,IAAI,WAAW,CAAC,MAAM,IAAI,WAAW,CAAC,EAAE,EAAE,CAAC;YAClE,IAAI,CAAC;gBACH,MAAM,2BAA2B,CAAC,4CAA4C,CAC5E;oBACE,SAAS,EAAE,WAAW,CAAC,SAAS;oBAChC,MAAM,EAAE,WAAW,CAAC,MAAM;oBAC1B,kBAAkB,EAAE;wBAClB,aAAa,EAAE,WAAW,CAAC,EAAE;qBAC9B;iBACF,CACF,CAAC;YACJ,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACpB,CAAC;QACH,CAAC;QAED,OAAO,WAAW,CAAC;IACrB,CAAC;IAGwB,AAAN,KAAK,CAAC,cAAc,CACrC,QAAyB;QAEzB,MAAM,aAAa,GAAiB,MAAM,IAAI,CAAC,MAAM,CAAC;YACpD,KAAK,EAAE,QAAQ,CAAC,KAAK;YACrB,MAAM,EAAE;gBACN,GAAG,EAAE,IAAI;gBACT,SAAS,EAAE,IAAI;aAChB;YACD,IAAI,EAAE,CAAC;YACP,KAAK,EAAE,SAAS;YAChB,KAAK,EAAE;gBACL,MAAM,EAAE,IAAI;aACb;SACF,CAAC,CAAC;QAEH,KAAK,MAAM,IAAI,IAAI,aAAa,EAAE,CAAC;YACjC,MAAM,2BAA2B,CAAC,QAAQ,CAAC;gBACzC,KAAK,EAAE;oBACL,aAAa,EAAE,IAAI,CAAC,EAAG;oBACvB,SAAS,EAAE,IAAI,CAAC,SAAU;iBAC3B;gBACD,KAAK,EAAE,SAAS;gBAChB,IAAI,EAAE,CAAC;gBACP,KAAK,EAAE;oBACL,MAAM,EAAE,IAAI;iBACb;aACF,CAAC,CAAC;QACL,CAAC;QAED,OAAO;YACL,QAAQ;YACR,YAAY,EAAE,IAAI;SACnB,CAAC;IACJ,CAAC;~~IAEO,kBAAkB,CAAC,MAAc~~;~~QACvC,IAAI,MAAW,CAAC~~;~~QAChB~~,~~IAAI,CAAC;YACH,MAAM,GAAG,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QAClC,CAAC;QAAC,WAAM,CAAC;YACP,MAAM,IAAI,gBAAgB,CAAC,gCAAgC,CAAC,CAAC;QAC/D,CAAC;QAED,MAAM,aAAa,GAAW,MAAM,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,~~WAAW,EAAE~~,CAAC~~;~~QACvE,IAAI,aAAa,KAAK,SAAS,IAAI,aAAa,KAAK,UAAU,EAAE,CAAC~~;YAChE,MAAM,IAAI,gBAAgB,CACxB,8CAA8C,CAC/C,CAAC;QACJ,CAAC;QAED,MAAM,QAAQ,GAAW,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC;QAEhE,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,MAAM,IAAI,gBAAgB,CAAC,kCAAkC,CAAC,CAAC;QACjE,CAAC;QAED,IAAI,wBAAwB,CAAC,QAAQ,CAAC,EAAE,CAAC;YACvC,MAAM,IAAI,gBAAgB,CACxB,sFAAsF,CACvF,CAAC;QACJ,CAAC;IACH,CAAC;CACF;AA5G0B;IADxB,WAAW,EAAE;;;;6CAkBb;AAGwB;IADxB,WAAW,EAAE;;6CAGC,KAAK;;8CAoBnB;AAGwB;IADxB,WAAW,EAAE;;;;6CAmCb;~~AA+BH~~,SAAS,wBAAwB,CAAC,QAAgB;IAChD,IACE,QAAQ,KAAK,WAAW;QACxB,QAAQ,CAAC,QAAQ,CAAC,YAAY,CAAC;QAC/B,QAAQ,KAAK,0BAA0B,EACvC,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,qBAAqB;IACrB,MAAM,SAAS,GAA4B,QAAQ,CAAC,KAAK,CACvD,8CAA8C,CAC/C,CAAC;IACF,IAAI,SAAS,EAAE,CAAC;QACd,MAAM,MAAM,GAAkB;YAC5B,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;YACpB,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;YACpB,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;YACpB,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;SACrB,CAAC;QAEF,IACE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAS,EAAE,EAAE;YACxB,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC;QAC1B,CAAC,CAAC,EACF,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC;QAED,YAAY;QACZ,IAAI,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC;YACpB,OAAO,IAAI,CAAC;QACd,CAAC;QACD,uBAAuB;QACvB,IAAI,MAAM,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE,CAAC;YACtB,OAAO,IAAI,CAAC;QACd,CAAC;QACD,aAAa;QACb,IAAI,MAAM,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC;YACrB,OAAO,IAAI,CAAC;QACd,CAAC;QACD,gBAAgB;QAChB,IAAI,MAAM,CAAC,CAAC,CAAC,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAE,GAAG,IAAI,CAAC,KAAK,EAAE,EAAE,CAAC;YACpD,OAAO,IAAI,CAAC;QACd,CAAC;QACD,iBAAiB;QACjB,IAAI,MAAM,CAAC,CAAC,CAAC,KAAK,GAAG,IAAI,MAAM,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE,CAAC;YAC3C,OAAO,IAAI,CAAC;QACd,CAAC;QACD,mDAAmD;QACnD,IAAI,MAAM,CAAC,CAAC,CAAC,KAAK,GAAG,IAAI,MAAM,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE,CAAC;YAC3C,OAAO,IAAI,CAAC;QACd,CAAC;QACD,kCAAkC;QAClC,IAAI,MAAM,CAAC,CAAC,CAAC,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAE,GAAG,IAAI,CAAC,KAAK,EAAE,EAAE,CAAC;YACpD,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,0DAA0D;IAC1D,IAAI,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QAC3B,MAAM,QAAQ,GAAW,QAAQ,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;QAC1D,IAAI,QAAQ,KAAK,KAAK,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;YAC5C,OAAO,IAAI,CAAC;QACd,CAAC;QACD,IAAI,QAAQ,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,QAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YAClE,OAAO,IAAI,CAAC;QACd,CAAC;QACD,IAAI,uBAAuB,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC3C,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAED,MAAM,uBAAuB,GAAW,oBAAoB,CAAC;AAE7D,eAAe,IAAI,OAAO,EAAE,CAAC"}
1	+ {"version":3,"file":"UserWebhookService.js","sourceRoot":"","sources":["../../../../Server/Services/UserWebhookService.ts"],"names":[],"mappings":";;;;;;;;;AAIA,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,2BAA2B,MAAM,+BAA+B,CAAC;AACxE,OAAO,SAAS,MAAM,+BAA+B,CAAC;AACtD,OAAO,gBAAgB,MAAM,wCAAwC,CAAC;AACtE,OAAO,KAAK,MAAM,yCAAyC,CAAC;AAC5D,OAAO,GAAG,MAAM,qBAAqB,CAAC;AACtC,OAAO,MAAM,MAAM,iBAAiB,CAAC;AACrC,OAAO,cAAc,MAAM,yBAAyB,CAAC;AACrD,OAAO,WAAW,MAAM,gCAAgC,CAAC;AAEzD;;;;;;;;GAQG;AAEH,MAAM,OAAO,OAAQ,SAAQ,eAAsB;IACjD;QACE,KAAK,CAAC,KAAK,CAAC,CAAC;IACf,CAAC;IAGwB,AAAN,KAAK,CAAC,cAAc,CACrC,QAAyB;QAEzB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YAC9B,MAAM,IAAI,gBAAgB,CAAC,yBAAyB,CAAC,CAAC;QACxD,CAAC;QAED,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;YACxB,MAAM,IAAI,gBAAgB,CAAC,0BAA0B,CAAC,CAAC;QACzD,CAAC;QAED,MAAM,cAAc,CAAC,2BAA2B,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAE3E,OAAO;YACL,QAAQ;YACR,YAAY,EAAE,IAAI;SACnB,CAAC;IACJ,CAAC;IAGwB,AAAN,KAAK,CAAC,cAAc,CACrC,QAAyB;QAEzB;;;WAGG;QACH,MAAM,UAAU,GAAY,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC;QAErD,IAAI,OAAO,UAAU,KAAK,QAAQ,IAAI,UAAU,YAAY,GAAG,EAAE,CAAC;YAChE,MAAM,cAAc,CAAC,2BAA2B,CAAC,UAAU,CAAC,CAAC;QAC/D,CAAC;QAED,OAAO;YACL,QAAQ;YACR,YAAY,EAAE,IAAI;SACnB,CAAC;IACJ,CAAC;IAGwB,AAAN,KAAK,CAAC,eAAe,CACtC,SAA0B,EAC1B,WAAkB;QAElB,qFAAqF;QACrF,IAAI,WAAW,CAAC,SAAS,IAAI,WAAW,CAAC,MAAM,IAAI,WAAW,CAAC,EAAE,EAAE,CAAC;YAClE,IAAI,CAAC;gBACH,MAAM,2BAA2B,CAAC,4CAA4C,CAC5E;oBACE,SAAS,EAAE,WAAW,CAAC,SAAS;oBAChC,MAAM,EAAE,WAAW,CAAC,MAAM;oBAC1B,kBAAkB,EAAE;wBAClB,aAAa,EAAE,WAAW,CAAC,EAAE;qBAC9B;iBACF,CACF,CAAC;YACJ,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACpB,CAAC;QACH,CAAC;QAED,OAAO,WAAW,CAAC;IACrB,CAAC;IAGwB,AAAN,KAAK,CAAC,cAAc,CACrC,QAAyB;QAEzB,MAAM,aAAa,GAAiB,MAAM,IAAI,CAAC,MAAM,CAAC;YACpD,KAAK,EAAE,QAAQ,CAAC,KAAK;YACrB,MAAM,EAAE;gBACN,GAAG,EAAE,IAAI;gBACT,SAAS,EAAE,IAAI;aAChB;YACD,IAAI,EAAE,CAAC;YACP,KAAK,EAAE,SAAS;YAChB,KAAK,EAAE;gBACL,MAAM,EAAE,IAAI;aACb;SACF,CAAC,CAAC;QAEH,KAAK,MAAM,IAAI,IAAI,aAAa,EAAE,CAAC;YACjC,MAAM,2BAA2B,CAAC,QAAQ,CAAC;gBACzC,KAAK,EAAE;oBACL,aAAa,EAAE,IAAI,CAAC,EAAG;oBACvB,SAAS,EAAE,IAAI,CAAC,SAAU;iBAC3B;gBACD,KAAK,EAAE,SAAS;gBAChB,IAAI,EAAE,CAAC;gBACP,KAAK,EAAE;oBACL,MAAM,EAAE,IAAI;iBACb;aACF,CAAC,CAAC;QACL,CAAC;QAED,OAAO;YACL,QAAQ;YACR,YAAY,EAAE,IAAI;SACnB,CAAC;IACJ,CAAC;CACF;AApG0B;IADxB,WAAW,EAAE;;;;6CAkBb;AAGwB;IADxB,WAAW,EAAE;;;;6CAkBb;AAGwB;IADxB,WAAW,EAAE;;6CAGC,KAAK;;8CAoBnB;AAGwB;IADxB,WAAW,EAAE;;;;6CAmCb;AAGH,eAAe,IAAI,OAAO,EAAE,CAAC"}