@oneuptime/common 11.6.0 → 11.6.2

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

@@ -0,0 +1,319 @@
+import DatabaseService from "./DatabaseService";
+import Model from "../../Models/DatabaseModels/NetworkEndpoint";
+import ColumnLength from "../../Types/Database/ColumnLength";
+import LIMIT_MAX from "../../Types/Database/LimitMax";
+import EndpointAttachmentUtil from "../../Utils/Monitor/EndpointAttachmentUtil";
+import OuiLookupUtil from "../Utils/Monitor/OuiLookupUtil";
+import QueryHelper from "../Types/Database/QueryHelper";
+import logger from "../Utils/Logger";
+/*
+ * Rows written per statement. Endpoint rows are narrow (12 params each),
+ * so 500 keeps a chunk well under Postgres' parameter ceiling while
+ * turning a 4096-MAC switch into 9 round trips instead of 4096.
+ */
+const UPSERT_BATCH_SIZE = 500;
+/*
+ * Hard ceiling on how many MACs one device walk may write. This is the
+ * findBy limit too — reading more than we can look up would silently
+ * treat known endpoints as new. A switch under a MAC-flood attack (or a
+ * misconfigured trunk dumping a whole campus into one FDB) is capped
+ * here and logged rather than allowed to monopolise the ingest thread.
+ */
+const MAX_ENDPOINTS_PER_WALK = LIMIT_MAX;
+/*
+ * Column order used by the INSERT in upsertDiscoveredEndpoints. Keep
+ * this and the generated parameter tuples in perfect sync.
+ */
+const INSERT_COLUMNS = [
+    "projectId",
+    "macAddress",
+    "ipAddress",
+    "vendor",
+    "attachedNetworkDeviceId",
+    "attachedInterfaceIndex",
+    "attachedPortName",
+    "vlanId",
+    "siteId",
+    "firstSeenAt",
+    "lastSeenAt",
+    "version",
+];
+/*
+ * ShortText columns are 100 chars. Truncating BEFORE the decision is
+ * made (rather than at write time) matters twice over: one over-long
+ * value can never fail the whole chunk it rides in, and the
+ * unchanged-since-last-poll comparison compares what we would store
+ * against what is stored, not against the untruncated observation.
+ */
+function truncateShortText(value) {
+    if (!value) {
+        return undefined;
+    }
+    return value.length > ColumnLength.ShortText
+        ? value.substring(0, ColumnLength.ShortText)
+        : value;
+}
+export class Service extends DatabaseService {
+    constructor() {
+        super(Model);
+    }
+    /*
+     * Applies one device walk's endpoint observations to the per-project
+     * endpoint inventory. Precedence between switch-FDB attachments and
+     * router-ARP sightings lives in EndpointAttachmentUtil.decideUpsert (pure,
+     * exhaustively tested); this method only batches the reads and applies
+     * the decisions:
+     *
+     *  - one findBy for every observed MAC, then ONE INSERT per 500 new
+     *    MACs and ONE UPDATE per 500 changed MACs — this runs inline on
+     *    the probe-ingest request path, so per-MAC round trips are not an
+     *    option at restaurant-chain scale (thousands of sites x thousands
+     *    of L2 endpoints),
+     *  - endpoints that have not moved since the last poll produce no
+     *    write at all (see ENDPOINT_LAST_SEEN_REFRESH_MS), so a stable
+     *    switch costs one SELECT and nothing else,
+     *  - vendor is stamped from the MAC OUI on create only (user-correctable),
+     *  - siteId follows the attaching device's site whenever an attachment is
+     *    (re)written and the caller knows the site,
+     *  - firstSeenAt is set on create, lastSeenAt on every touch that writes.
+     */
+    async upsertDiscoveredEndpoints(data) {
+        var _a, _b, _c;
+        // Merge both observation kinds per MAC — an L3 switch yields both.
+        const incomingByMac = new Map();
+        for (const attachment of data.attachments) {
+            incomingByMac.set(attachment.macAddress, {
+                macAddress: attachment.macAddress,
+                deviceId: data.deviceId.toString(),
+                attachment: {
+                    interfaceIndex: attachment.attachedInterfaceIndex,
+                    portName: truncateShortText(attachment.attachedPortName),
+                    vlanId: attachment.vlanId,
+                },
+            });
+        }
+        for (const binding of data.ipBindings) {
+            const existing = incomingByMac.get(binding.macAddress);
+            const ipAddress = truncateShortText(binding.ipAddress);
+            if (!ipAddress) {
+                continue;
+            }
+            if (existing) {
+                existing.ipBinding = {
+                    ipAddress: ipAddress,
+                    routerInterfaceIndex: binding.routerInterfaceIndex,
+                };
+            }
+            else {
+                incomingByMac.set(binding.macAddress, {
+                    macAddress: binding.macAddress,
+                    deviceId: data.deviceId.toString(),
+                    ipBinding: {
+                        ipAddress: ipAddress,
+                        routerInterfaceIndex: binding.routerInterfaceIndex,
+                    },
+                });
+            }
+        }
+        /*
+         * Deterministic order, capped so a pathological FDB dump (or a MAC
+         * flood attack on a customer switch) cannot write unbounded rows or
+         * exceed the findBy limit.
+         */
+        const allMacs = Array.from(incomingByMac.keys()).sort();
+        const macs = allMacs.slice(0, MAX_ENDPOINTS_PER_WALK);
+        if (macs.length === 0) {
+            return;
+        }
+        if (allMacs.length > macs.length) {
+            logger.warn(`NetworkEndpointService: device ${data.deviceId.toString()} reported ${allMacs.length} endpoint MACs; capping this walk at ${MAX_ENDPOINTS_PER_WALK}.`);
+        }
+        const existingRows = await this.findBy({
+            query: {
+                projectId: data.projectId,
+                macAddress: QueryHelper.any(macs),
+            },
+            select: {
+                _id: true,
+                macAddress: true,
+                attachedNetworkDeviceId: true,
+                attachedInterfaceIndex: true,
+                attachedPortName: true,
+                vlanId: true,
+                ipAddress: true,
+                siteId: true,
+                firstSeenAt: true,
+                lastSeenAt: true,
+            },
+            limit: LIMIT_MAX,
+            skip: 0,
+            props: {
+                isRoot: true,
+            },
+        });
+        const existingByMac = new Map();
+        for (const row of existingRows) {
+            if (row.macAddress) {
+                existingByMac.set(row.macAddress, row);
+            }
+        }
+        const context = {
+            now: data.now,
+            siteId: (_a = data.deviceSiteId) === null || _a === void 0 ? void 0 : _a.toString(),
+        };
+        const creates = [];
+        const updates = [];
+        for (const mac of macs) {
+            const incoming = incomingByMac.get(mac);
+            const existing = existingByMac.get(mac);
+            const decision = EndpointAttachmentUtil.decideUpsert(existing
+                ? {
+                    attachedNetworkDeviceId: (_b = existing.attachedNetworkDeviceId) === null || _b === void 0 ? void 0 : _b.toString(),
+                    attachedInterfaceIndex: existing.attachedInterfaceIndex,
+                    attachedPortName: existing.attachedPortName,
+                    vlanId: existing.vlanId,
+                    ipAddress: existing.ipAddress,
+                    siteId: (_c = existing.siteId) === null || _c === void 0 ? void 0 : _c.toString(),
+                    firstSeenAt: existing.firstSeenAt,
+                    lastSeenAt: existing.lastSeenAt,
+                }
+                : null, incoming, context);
+            if (decision.action === "create") {
+                creates.push({ mac, decision });
+            }
+            else if (decision.action === "update") {
+                updates.push({ mac, decision });
+            }
+        }
+        await this.bulkInsertEndpoints({
+            projectId: data.projectId,
+            deviceId: data.deviceId,
+            deviceSiteId: data.deviceSiteId,
+            now: data.now,
+            rows: creates,
+        });
+        await this.bulkUpdateEndpoints({
+            projectId: data.projectId,
+            deviceId: data.deviceId,
+            deviceSiteId: data.deviceSiteId,
+            now: data.now,
+            rows: updates,
+        });
+    }
+    /*
+     * New MACs. Every create-path decision has setAttachment === true (a
+     * row with no stored attachment can never be "attached elsewhere"), so
+     * the conflict branch can write the attachment unconditionally.
+     *
+     * ON CONFLICT names the partial unique index on
+     * (projectId, macAddress) WHERE "deletedAt" IS NULL — the predicate is
+     * required for index inference, and it is what keeps a soft-deleted
+     * row from colliding with a rediscovered MAC. The DO UPDATE branch
+     * only fires when a concurrent walk created the row between our findBy
+     * and this INSERT; it then applies the same semantics the UPDATE path
+     * would have, so the observation is never silently dropped.
+     *
+     * `vendor` is deliberately absent from DO UPDATE SET: it is stamped
+     * from the OUI on create and is user-correctable thereafter.
+     */
+    async bulkInsertEndpoints(data) {
+        var _a, _b, _c, _d, _e, _f;
+        if (data.rows.length === 0) {
+            return;
+        }
+        for (let i = 0; i < data.rows.length; i += UPSERT_BATCH_SIZE) {
+            const chunk = data.rows.slice(i, i + UPSERT_BATCH_SIZE);
+            const valueFragments = [];
+            const params = [];
+            let paramIndex = 1;
+            for (const row of chunk) {
+                const placeholders = [];
+                for (let c = 0; c < INSERT_COLUMNS.length; c++) {
+                    placeholders.push(`$${paramIndex++}`);
+                }
+                valueFragments.push(`(${placeholders.join(", ")})`);
+                params.push(data.projectId.toString(), row.mac, row.decision.setIpAddress && row.decision.ipAddress
+                    ? row.decision.ipAddress
+                    : null, (_a = truncateShortText(OuiLookupUtil.lookupVendor(row.mac))) !== null && _a !== void 0 ? _a : null, data.deviceId.toString(), (_b = row.decision.attachedInterfaceIndex) !== null && _b !== void 0 ? _b : null, (_c = row.decision.attachedPortName) !== null && _c !== void 0 ? _c : null, (_d = row.decision.vlanId) !== null && _d !== void 0 ? _d : null, (_f = (_e = data.deviceSiteId) === null || _e === void 0 ? void 0 : _e.toString()) !== null && _f !== void 0 ? _f : null, data.now, data.now, 0);
+            }
+            const sql = `
+        INSERT INTO "NetworkEndpoint" (
+          "projectId", "macAddress", "ipAddress", "vendor",
+          "attachedNetworkDeviceId", "attachedInterfaceIndex",
+          "attachedPortName", "vlanId", "siteId",
+          "firstSeenAt", "lastSeenAt", "version"
+        )
+        VALUES ${valueFragments.join(", ")}
+        ON CONFLICT ("projectId", "macAddress") WHERE "deletedAt" IS NULL
+        DO UPDATE SET
+          "attachedNetworkDeviceId" = EXCLUDED."attachedNetworkDeviceId",
+          "attachedInterfaceIndex" = COALESCE(EXCLUDED."attachedInterfaceIndex", "NetworkEndpoint"."attachedInterfaceIndex"),
+          "attachedPortName" = COALESCE(EXCLUDED."attachedPortName", "NetworkEndpoint"."attachedPortName"),
+          "vlanId" = COALESCE(EXCLUDED."vlanId", "NetworkEndpoint"."vlanId"),
+          "siteId" = COALESCE(EXCLUDED."siteId", "NetworkEndpoint"."siteId"),
+          "ipAddress" = COALESCE(EXCLUDED."ipAddress", "NetworkEndpoint"."ipAddress"),
+          "firstSeenAt" = COALESCE("NetworkEndpoint"."firstSeenAt", EXCLUDED."firstSeenAt"),
+          "lastSeenAt" = EXCLUDED."lastSeenAt",
+          "updatedAt" = now()
+      `;
+            await this.getRepository().manager.query(sql, params);
+        }
+    }
+    /*
+     * Known MACs whose observation actually changed something. One
+     * UPDATE ... FROM (VALUES ...) per chunk, joined on the same
+     * (projectId, macAddress) key the unique index covers, with
+     * "deletedAt" IS NULL so a soft-deleted row is never resurrected.
+     *
+     * Per-row conditionality rides in the VALUES tuple: `setAttachment`
+     * gates the whole attachment group, and NULL means "the walk did not
+     * report one" — COALESCE keeps whatever is stored, which is the
+     * "undefined never clears a stored value" rule from decideUpsert.
+     */
+    async bulkUpdateEndpoints(data) {
+        var _a, _b, _c, _d, _e;
+        if (data.rows.length === 0) {
+            return;
+        }
+        for (let i = 0; i < data.rows.length; i += UPSERT_BATCH_SIZE) {
+            const chunk = data.rows.slice(i, i + UPSERT_BATCH_SIZE);
+            const valueFragments = [];
+            const params = [data.projectId.toString()];
+            let paramIndex = 2;
+            for (const row of chunk) {
+                valueFragments.push(`($${paramIndex++}::character varying, $${paramIndex++}::boolean, $${paramIndex++}::uuid, $${paramIndex++}::integer, $${paramIndex++}::character varying, $${paramIndex++}::integer, $${paramIndex++}::uuid, $${paramIndex++}::character varying, $${paramIndex++}::timestamptz)`);
+                params.push(row.mac, row.decision.setAttachment, row.decision.setAttachment ? data.deviceId.toString() : null, row.decision.setAttachment
+                    ? (_a = row.decision.attachedInterfaceIndex) !== null && _a !== void 0 ? _a : null
+                    : null, row.decision.setAttachment
+                    ? (_b = row.decision.attachedPortName) !== null && _b !== void 0 ? _b : null
+                    : null, row.decision.setAttachment ? (_c = row.decision.vlanId) !== null && _c !== void 0 ? _c : null : null, row.decision.setAttachment
+                    ? (_e = (_d = data.deviceSiteId) === null || _d === void 0 ? void 0 : _d.toString()) !== null && _e !== void 0 ? _e : null
+                    : null, row.decision.setIpAddress && row.decision.ipAddress
+                    ? row.decision.ipAddress
+                    : null, data.now);
+            }
+            const sql = `
+        UPDATE "NetworkEndpoint" AS e
+        SET
+          "attachedNetworkDeviceId" = CASE WHEN v."setAttachment" THEN v."deviceId" ELSE e."attachedNetworkDeviceId" END,
+          "attachedInterfaceIndex" = CASE WHEN v."setAttachment" THEN COALESCE(v."attachedInterfaceIndex", e."attachedInterfaceIndex") ELSE e."attachedInterfaceIndex" END,
+          "attachedPortName" = CASE WHEN v."setAttachment" THEN COALESCE(v."attachedPortName", e."attachedPortName") ELSE e."attachedPortName" END,
+          "vlanId" = CASE WHEN v."setAttachment" THEN COALESCE(v."vlanId", e."vlanId") ELSE e."vlanId" END,
+          "siteId" = CASE WHEN v."setAttachment" THEN COALESCE(v."siteId", e."siteId") ELSE e."siteId" END,
+          "ipAddress" = COALESCE(v."ipAddress", e."ipAddress"),
+          "firstSeenAt" = COALESCE(e."firstSeenAt", v."lastSeenAt"),
+          "lastSeenAt" = v."lastSeenAt",
+          "updatedAt" = now()
+        FROM (VALUES ${valueFragments.join(", ")})
+          AS v("macAddress", "setAttachment", "deviceId", "attachedInterfaceIndex", "attachedPortName", "vlanId", "siteId", "ipAddress", "lastSeenAt")
+        WHERE
+          e."projectId" = $1
+          AND e."macAddress" = v."macAddress"
+          AND e."deletedAt" IS NULL
+      `;
+            await this.getRepository().manager.query(sql, params);
+        }
+    }
+}
+export default new Service();
+//# sourceMappingURL=NetworkEndpointService.js.map

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

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

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

@@ -0,0 +1,90 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+import DatabaseService from "./DatabaseService";
+import Model from "../../Models/DatabaseModels/NetworkSiteAssignmentRule";
+import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
+import LIMIT_MAX from "../../Types/Database/LimitMax";
+import BadDataException from "../../Types/Exception/BadDataException";
+import CidrMatchUtil from "../../Utils/NetworkSite/CidrMatchUtil";
+export class Service extends DatabaseService {
+    constructor() {
+        super(Model);
+    }
+    /*
+     * A rule with neither criterion would match nothing (or, worse, read as
+     * "match everything" to a future maintainer) - reject it at write time.
+     */
+    async onBeforeCreate(createBy) {
+        this.validateCriteria({
+            subnetCidr: createBy.data.subnetCidr,
+            hostnamePattern: createBy.data.hostnamePattern,
+        });
+        return { createBy, carryForward: null };
+    }
+    async onBeforeUpdate(updateBy) {
+        const dataKeys = Object.keys(updateBy.data || {});
+        if (!dataKeys.includes("subnetCidr") &&
+            !dataKeys.includes("hostnamePattern")) {
+            return { updateBy, carryForward: null };
+        }
+        /*
+         * The update may clear one criterion while the other only exists on the
+         * stored row, so validate the RESULTING state of every matched row.
+         */
+        const existingRules = await this.findBy({
+            query: updateBy.query,
+            select: {
+                _id: true,
+                subnetCidr: true,
+                hostnamePattern: true,
+            },
+            limit: LIMIT_MAX,
+            skip: 0,
+            props: {
+                isRoot: true,
+            },
+        });
+        for (const existingRule of existingRules) {
+            this.validateCriteria({
+                subnetCidr: dataKeys.includes("subnetCidr")
+                    ? updateBy.data["subnetCidr"]
+                    : existingRule.subnetCidr,
+                hostnamePattern: dataKeys.includes("hostnamePattern")
+                    ? updateBy.data["hostnamePattern"]
+                    : existingRule.hostnamePattern,
+            });
+        }
+        return { updateBy, carryForward: null };
+    }
+    validateCriteria(data) {
+        const subnetCidr = (data.subnetCidr || "").trim();
+        const hostnamePattern = (data.hostnamePattern || "").trim();
+        if (!subnetCidr && !hostnamePattern) {
+            throw new BadDataException("At least one of Subnet CIDR or Hostname Pattern is required.");
+        }
+        if (subnetCidr && !CidrMatchUtil.isValidCidr(subnetCidr)) {
+            throw new BadDataException(`${subnetCidr} is not a valid IPv4 CIDR (expected e.g. 10.0.0.0/24).`);
+        }
+    }
+}
+__decorate([
+    CaptureSpan(),
+    __metadata("design:type", Function),
+    __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);
+export default new Service();
+//# sourceMappingURL=NetworkSiteAssignmentRuleService.js.map

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

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

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

@@ -0,0 +1,9 @@
+import DatabaseService from "./DatabaseService";
+import Model from "../../Models/DatabaseModels/NetworkSiteLink";
+export class Service extends DatabaseService {
+    constructor() {
+        super(Model);
+    }
+}
+export default new Service();
+//# sourceMappingURL=NetworkSiteLinkService.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"NetworkSiteLinkService.js","sourceRoot":"","sources":["../../../../Server/Services/NetworkSiteLinkService.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,MAAM,6CAA6C,CAAC;AAEhE,MAAM,OAAO,OAAQ,SAAQ,eAAsB;IACjD;QACE,KAAK,CAAC,KAAK,CAAC,CAAC;IACf,CAAC;CACF;AAED,eAAe,IAAI,OAAO,EAAE,CAAC"}