@oneuptime/common 11.7.3 → 12.0.0

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

@@ -1,6 +1,17 @@
+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/NetworkDeviceLabelRule";
 import { IsBillingEnabled } from "../EnvironmentConfig";
+import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
+import NetworkDeviceRulePatternValidator from "../Utils/NetworkDevice/RulePatternValidator";
 export class Service extends DatabaseService {
     constructor() {
         super(Model);
@@ -8,6 +19,38 @@ export class Service extends DatabaseService {
             this.hardDeleteItemsOlderThanInDays("createdAt", 3 * 365);
         }
     }
+    /*
+     * A pattern that is neither a valid regex nor a wildcard can only ever
+     * match nothing, and the rule engine has no way to say so - it just quietly
+     * stops labelling. Reject it while the user is still looking at the form.
+     * See Common/Utils/Rules/RulePatternMatchUtil for the accepted syntaxes.
+     */
+    async onBeforeCreate(createBy) {
+        NetworkDeviceRulePatternValidator.validate({
+            namePattern: createBy.data.networkDeviceNamePattern,
+            descriptionPattern: createBy.data.networkDeviceDescriptionPattern,
+        });
+        return { createBy, carryForward: null };
+    }
+    async onBeforeUpdate(updateBy) {
+        NetworkDeviceRulePatternValidator.validate({
+            namePattern: updateBy.data["networkDeviceNamePattern"],
+            descriptionPattern: updateBy.data["networkDeviceDescriptionPattern"],
+        });
+        return { updateBy, carryForward: null };
+    }
 }
+__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=NetworkDeviceLabelRuleService.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"NetworkDeviceLabelRuleService.js","sourceRoot":"","sources":["../../../../Server/Services/NetworkDeviceLabelRuleService.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,MAAM,oDAAoD,CAAC;AACvE,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAExD,MAAM,OAAO,OAAQ,SAAQ,eAAsB;IACjD;QACE,KAAK,CAAC,KAAK,CAAC,CAAC;QACb,IAAI,gBAAgB,EAAE,CAAC;YACrB,IAAI,CAAC,8BAA8B,CAAC,WAAW,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC;QAC5D,CAAC;IACH,CAAC;CACF;AAED,eAAe,IAAI,OAAO,EAAE,CAAC"}
+{"version":3,"file":"NetworkDeviceLabelRuleService.js","sourceRoot":"","sources":["../../../../Server/Services/NetworkDeviceLabelRuleService.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,MAAM,oDAAoD,CAAC;AACvE,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAIxD,OAAO,WAAW,MAAM,gCAAgC,CAAC;AACzD,OAAO,iCAAiC,MAAM,6CAA6C,CAAC;AAE5F,MAAM,OAAO,OAAQ,SAAQ,eAAsB;IACjD;QACE,KAAK,CAAC,KAAK,CAAC,CAAC;QACb,IAAI,gBAAgB,EAAE,CAAC;YACrB,IAAI,CAAC,8BAA8B,CAAC,WAAW,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC;QAC5D,CAAC;IACH,CAAC;IAED;;;;;OAKG;IAEsB,AAAN,KAAK,CAAC,cAAc,CACrC,QAAyB;QAEzB,iCAAiC,CAAC,QAAQ,CAAC;YACzC,WAAW,EAAE,QAAQ,CAAC,IAAI,CAAC,wBAAwB;YACnD,kBAAkB,EAAE,QAAQ,CAAC,IAAI,CAAC,+BAA+B;SAClE,CAAC,CAAC;QAEH,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC;IAC1C,CAAC;IAGwB,AAAN,KAAK,CAAC,cAAc,CACrC,QAAyB;QAEzB,iCAAiC,CAAC,QAAQ,CAAC;YACzC,WAAW,EAAG,QAAQ,CAAC,IAAY,CAAC,0BAA0B,CAEjD;YACb,kBAAkB,EAAG,QAAQ,CAAC,IAAY,CACxC,iCAAiC,CACZ;SACxB,CAAC,CAAC;QAEH,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC;IAC1C,CAAC;CACF;AA1B0B;IADxB,WAAW,EAAE;;;;6CAUb;AAGwB;IADxB,WAAW,EAAE;;;;6CAcb;AAGH,eAAe,IAAI,OAAO,EAAE,CAAC"}

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

@@ -15,6 +15,7 @@ import NetworkDeviceOwnerUserService from "./NetworkDeviceOwnerUserService";
 import NetworkDeviceOwnerTeamService from "./NetworkDeviceOwnerTeamService";
 import NetworkDeviceService from "./NetworkDeviceService";
 import ObjectID from "../../Types/ObjectID";
+import RulePatternMatchUtil from "../../Utils/Rules/RulePatternMatchUtil";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 import logger from "../Utils/Logger";
 class NetworkDeviceOwnerRuleEngineServiceClass {
@@ -154,26 +155,26 @@ class NetworkDeviceOwnerRuleEngineServiceClass {
             }
         }
         if (rule.networkDeviceNamePattern &&
-            (!networkDevice.name ||
-                !this.testRegex(rule.networkDeviceNamePattern, networkDevice.name, rule))) {
+            !this.testPattern(rule.networkDeviceNamePattern, networkDevice.name, rule)) {
             return false;
         }
         if (rule.networkDeviceDescriptionPattern &&
-            (!networkDevice.description ||
-                !this.testRegex(rule.networkDeviceDescriptionPattern, networkDevice.description, rule))) {
+            !this.testPattern(rule.networkDeviceDescriptionPattern, networkDevice.description, rule)) {
             return false;
         }
         return true;
     }
-    testRegex(pattern, value, rule) {
-        try {
-            const regex = new RegExp(pattern, "i");
-            return regex.test(value);
-        }
-        catch (_a) {
-            logger.warn(`Invalid regex in network device owner rule ${rule.id}: ${pattern}`);
+    /*
+     * Patterns are regexes, with a '*' wildcard fallback so the glob syntax the
+     * neighbouring site assignment rules use does not silently match nothing.
+     * See Common/Utils/Rules/RulePatternMatchUtil.
+     */
+    testPattern(pattern, value, rule) {
+        if (!RulePatternMatchUtil.isSupportedPattern(pattern)) {
+            logger.warn(`Invalid pattern in network device owner rule ${rule.id}: ${pattern}. It is neither a valid regular expression nor a wildcard pattern, so it will never match.`);
             return false;
         }
+        return RulePatternMatchUtil.matches(value, pattern);
     }
 }
 __decorate([

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

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

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

@@ -1,6 +1,17 @@
+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/NetworkDeviceOwnerRule";
 import { IsBillingEnabled } from "../EnvironmentConfig";
+import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
+import NetworkDeviceRulePatternValidator from "../Utils/NetworkDevice/RulePatternValidator";
 export class Service extends DatabaseService {
     constructor() {
         super(Model);
@@ -8,6 +19,36 @@ export class Service extends DatabaseService {
             this.hardDeleteItemsOlderThanInDays("createdAt", 3 * 365);
         }
     }
+    /*
+     * Same contract as NetworkDeviceLabelRuleService: a pattern that can never
+     * match is caught at write time rather than silently never adding owners.
+     */
+    async onBeforeCreate(createBy) {
+        NetworkDeviceRulePatternValidator.validate({
+            namePattern: createBy.data.networkDeviceNamePattern,
+            descriptionPattern: createBy.data.networkDeviceDescriptionPattern,
+        });
+        return { createBy, carryForward: null };
+    }
+    async onBeforeUpdate(updateBy) {
+        NetworkDeviceRulePatternValidator.validate({
+            namePattern: updateBy.data["networkDeviceNamePattern"],
+            descriptionPattern: updateBy.data["networkDeviceDescriptionPattern"],
+        });
+        return { updateBy, carryForward: null };
+    }
 }
+__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=NetworkDeviceOwnerRuleService.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"NetworkDeviceOwnerRuleService.js","sourceRoot":"","sources":["../../../../Server/Services/NetworkDeviceOwnerRuleService.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,MAAM,oDAAoD,CAAC;AACvE,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAExD,MAAM,OAAO,OAAQ,SAAQ,eAAsB;IACjD;QACE,KAAK,CAAC,KAAK,CAAC,CAAC;QACb,IAAI,gBAAgB,EAAE,CAAC;YACrB,IAAI,CAAC,8BAA8B,CAAC,WAAW,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC;QAC5D,CAAC;IACH,CAAC;CACF;AAED,eAAe,IAAI,OAAO,EAAE,CAAC"}
+{"version":3,"file":"NetworkDeviceOwnerRuleService.js","sourceRoot":"","sources":["../../../../Server/Services/NetworkDeviceOwnerRuleService.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,MAAM,oDAAoD,CAAC;AACvE,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAIxD,OAAO,WAAW,MAAM,gCAAgC,CAAC;AACzD,OAAO,iCAAiC,MAAM,6CAA6C,CAAC;AAE5F,MAAM,OAAO,OAAQ,SAAQ,eAAsB;IACjD;QACE,KAAK,CAAC,KAAK,CAAC,CAAC;QACb,IAAI,gBAAgB,EAAE,CAAC;YACrB,IAAI,CAAC,8BAA8B,CAAC,WAAW,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC;QAC5D,CAAC;IACH,CAAC;IAED;;;OAGG;IAEsB,AAAN,KAAK,CAAC,cAAc,CACrC,QAAyB;QAEzB,iCAAiC,CAAC,QAAQ,CAAC;YACzC,WAAW,EAAE,QAAQ,CAAC,IAAI,CAAC,wBAAwB;YACnD,kBAAkB,EAAE,QAAQ,CAAC,IAAI,CAAC,+BAA+B;SAClE,CAAC,CAAC;QAEH,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC;IAC1C,CAAC;IAGwB,AAAN,KAAK,CAAC,cAAc,CACrC,QAAyB;QAEzB,iCAAiC,CAAC,QAAQ,CAAC;YACzC,WAAW,EAAG,QAAQ,CAAC,IAAY,CAAC,0BAA0B,CAEjD;YACb,kBAAkB,EAAG,QAAQ,CAAC,IAAY,CACxC,iCAAiC,CACZ;SACxB,CAAC,CAAC;QAEH,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC;IAC1C,CAAC;CACF;AA1B0B;IADxB,WAAW,EAAE;;;;6CAUb;AAGwB;IADxB,WAAW,EAAE;;;;6CAcb;AAGH,eAAe,IAAI,OAAO,EAAE,CAAC"}

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

@@ -20,6 +20,48 @@ import BadDataException from "../../Types/Exception/BadDataException";
 import ObjectID from "../../Types/ObjectID";
 import OneUptimeDate from "../../Types/Date";
 import CidrMatchUtil from "../../Utils/NetworkSite/CidrMatchUtil";
+import RelationIdUtil from "../Utils/Database/RelationIdUtil";
+/*
+ * Columns a NetworkSiteAssignmentRule's hostname pattern is matched against.
+ * A write to any of them can change which rule wins for the device, so
+ * onUpdateSuccess re-evaluates the rules. `sysName` matters most in practice:
+ * a discovery import stores the responding IP in `hostname` and only the SNMP
+ * walk fills `sysName` in later, so a device's real identity usually lands
+ * AFTER creation.
+ */
+const SITE_RULE_IDENTITY_COLUMNS = [
+    "hostname",
+    "name",
+    "sysName",
+];
+/*
+ * Both spellings of "the device's site" in a write payload - see
+ * RelationIdUtil for why a hook has to watch for both.
+ */
+const SITE_KEYS = ["siteId", "site"];
+/*
+ * Null, undefined and "  Core-SW " all mean the same thing to a
+ * case-insensitive wildcard match, so compare identity values normalised -
+ * otherwise a no-op rewrite of sysName on every SNMP walk would look like a
+ * change and re-run the rules for the whole fleet every polling cycle.
+ */
+function normalizeIdentityValue(value) {
+    if (value === null || value === undefined) {
+        return "";
+    }
+    return String(value).trim().toLowerCase();
+}
+// True when the payload sets the device's site, under either spelling.
+function isSiteWrite(dataKeys) {
+    return RelationIdUtil.isWritten(dataKeys, SITE_KEYS);
+}
+/*
+ * The site a payload moves the device to, or null when it clears the site (or
+ * carries no resolvable id).
+ */
+function readSiteIdFromData(data) {
+    return RelationIdUtil.read(data, SITE_KEYS);
+}
 export class Service extends DatabaseService {
     constructor() {
         super(Model);
@@ -65,9 +107,15 @@ export class Service extends DatabaseService {
         return Object.assign(Object.assign({}, query), { projectId: props.tenantId });
     }
     async onBeforeCreate(createBy) {
-        if (createBy.data.siteId) {
+        /*
+         * Read both spellings: the dashboard posts the `site` relation, not the
+         * `siteId` column, so guarding only `siteId` let a UI-created device
+         * point at another project's site.
+         */
+        const siteId = readSiteIdFromData(createBy.data);
+        if (siteId) {
             await this.assertSiteBelongsToProject({
-                siteId: createBy.data.siteId,
+                siteId: siteId,
                 projectId: createBy.data.projectId,
             });
         }
@@ -91,8 +139,14 @@ export class Service extends DatabaseService {
                 await NetworkDeviceOwnerRuleEngineService.applyRulesToNetworkDevice(createdItem);
             })
                 .then(async () => {
-                if (createdItem.siteId) {
-                    await NetworkSiteService.recomputeRollupForSiteAndAncestors(createdItem.siteId);
+                var _a;
+                /*
+                 * `site` (relation) or `siteId` (column) - a device created from
+                 * the dashboard carries only the former.
+                 */
+                const createdSiteId = createdItem.siteId || ((_a = createdItem.site) === null || _a === void 0 ? void 0 : _a.id) || null;
+                if (createdSiteId) {
+                    await NetworkSiteService.recomputeRollupForSiteAndAncestors(createdSiteId);
                 }
                 else {
                     await this.applySiteAssignmentRulesToDevice(createdItem.id);
@@ -109,13 +163,19 @@ export class Service extends DatabaseService {
         return createdItem;
     }
     /*
-     * Capture the previous site of every matched device when an update
-     * touches siteId, so onUpdateSuccess can refresh the OLD site's rollup
-     * as well as the new one.
+     * Capture the previous state of every matched device when an update
+     * touches siteId (so onUpdateSuccess can refresh the OLD site's rollup as
+     * well as the new one) or touches one of the columns site assignment rules
+     * match on (so onUpdateSuccess can tell a real rename from the identical
+     * sysName the SNMP walk rewrites on every poll).
      */
     async onBeforeUpdate(updateBy) {
         const dataKeys = Object.keys(updateBy.data || {});
-        if (!dataKeys.includes("siteId")) {
+        const isSiteChange = isSiteWrite(dataKeys);
+        const isIdentityChange = SITE_RULE_IDENTITY_COLUMNS.some((column) => {
+            return dataKeys.includes(column);
+        });
+        if (!isSiteChange && !isIdentityChange) {
             return { updateBy, carryForward: null };
         }
         const previousDevices = await this.findBy({
@@ -124,6 +184,9 @@ export class Service extends DatabaseService {
                 _id: true,
                 projectId: true,
                 siteId: true,
+                hostname: true,
+                name: true,
+                sysName: true,
             },
             limit: LIMIT_MAX,
             skip: 0,
@@ -131,9 +194,8 @@ export class Service extends DatabaseService {
                 isRoot: true,
             },
         });
-        const newSiteIdValue = updateBy.data["siteId"];
-        if (newSiteIdValue) {
-            const newSiteId = new ObjectID(newSiteIdValue.toString());
+        const newSiteId = readSiteIdFromData(updateBy.data);
+        if (newSiteId) {
             const checkedProjectIds = new Set();
             for (const previousDevice of previousDevices) {
                 if (!previousDevice.projectId ||
@@ -159,10 +221,10 @@ export class Service extends DatabaseService {
      * or rule-engine failure must never fail the device update itself.
      */
     async onUpdateSuccess(onUpdate, updatedItemIds) {
-        var _a;
+        var _a, _b;
         try {
             const dataKeys = Object.keys(onUpdate.updateBy.data || {});
-            if (dataKeys.includes("siteId")) {
+            if (isSiteWrite(dataKeys)) {
                 // Manual or rule-driven site change: refresh old + new site chains.
                 const affectedSiteIds = new Map();
                 const previousDevices = ((_a = onUpdate.carryForward) === null || _a === void 0 ? void 0 : _a.previousDevices) || [];
@@ -183,21 +245,35 @@ export class Service extends DatabaseService {
                         affectedSiteIds.set(previousDevice.siteId.toString(), previousDevice.siteId);
                     }
                 }
-                const newSiteIdValue = onUpdate.updateBy.data["siteId"];
-                if (newSiteIdValue && updatedItemIds.length > 0) {
-                    const newSiteId = new ObjectID(newSiteIdValue.toString());
+                const newSiteId = readSiteIdFromData(onUpdate.updateBy.data);
+                if (newSiteId && updatedItemIds.length > 0) {
                     affectedSiteIds.set(newSiteId.toString(), newSiteId);
                 }
                 for (const siteId of affectedSiteIds.values()) {
                     await NetworkSiteService.recomputeRollupForSiteAndAncestors(siteId);
                 }
             }
-            else if (dataKeys.includes("hostname")) {
+            else if (SITE_RULE_IDENTITY_COLUMNS.some((column) => {
+                return dataKeys.includes(column);
+            })) {
                 /*
-                 * The device's address changed, so subnet/hostname rules may now
-                 * resolve differently — re-evaluate each updated device.
+                 * The device's address or name changed, so subnet/hostname rules may
+                 * now resolve differently — re-evaluate each updated device whose
+                 * identity actually moved (or that has no site yet).
                  */
+                const previousDevicesById = new Map();
+                const previousDevices = ((_b = onUpdate.carryForward) === null || _b === void 0 ? void 0 : _b.previousDevices) || [];
+                for (const previousDevice of previousDevices) {
+                    if (previousDevice.id) {
+                        previousDevicesById.set(previousDevice.id.toString(), previousDevice);
+                    }
+                }
                 for (const deviceId of updatedItemIds) {
+                    const previousDevice = previousDevicesById.get(deviceId.toString());
+                    if (previousDevice &&
+                        !this.shouldReapplySiteAssignmentRules(previousDevice, onUpdate.updateBy.data)) {
+                        continue;
+                    }
                     await this.applySiteAssignmentRulesToDevice(deviceId);
                 }
             }
@@ -207,6 +283,34 @@ export class Service extends DatabaseService {
         }
         return onUpdate;
     }
+    /*
+     * True when an update that touched an identity column is worth re-running
+     * the assignment rules for.
+     *
+     * A device with no site is always re-evaluated: rules are usually written
+     * (or corrected) after the devices were imported, and the SNMP walk is the
+     * only thing that ever touches such a device again — without this, a
+     * matching rule would never reach it. Assigning a site to a device that has
+     * none cannot undo a human's choice.
+     *
+     * A device that already sits in a site is only re-evaluated when its
+     * identity really changed, so the sysName the walk rewrites verbatim every
+     * polling cycle does not keep dragging a manually placed device back to
+     * whatever a rule prefers.
+     */
+    shouldReapplySiteAssignmentRules(previousDevice, data) {
+        if (!previousDevice.siteId) {
+            return true;
+        }
+        const dataKeys = Object.keys(data || {});
+        return SITE_RULE_IDENTITY_COLUMNS.some((column) => {
+            if (!dataKeys.includes(column)) {
+                return false;
+            }
+            return (normalizeIdentityValue(data[column]) !==
+                normalizeIdentityValue(previousDevice[column]));
+        });
+    }
     /*
      * Matches one device against the project's NetworkSiteAssignmentRules
      * (highest priority wins) and assigns the winning site. The assignment
@@ -222,6 +326,7 @@ export class Service extends DatabaseService {
                 siteId: true,
                 hostname: true,
                 sysName: true,
+                name: true,
             },
             props: {
                 isRoot: true,
@@ -253,12 +358,16 @@ export class Service extends DatabaseService {
         }
         /*
          * The device's hostname column stores an IP address or a DNS name; pass
-         * it as both — ipInCidr safely rejects non-IP strings.
+         * it as both — ipInCidr safely rejects non-IP strings. `name` is passed
+         * too because a discovery import puts the responding IP in `hostname`
+         * and the device's real identity in `name`, so a hostname pattern that
+         * only ever saw `hostname` could not match anything a user recognises.
          */
         const winner = CidrMatchUtil.pickRule(rules, {
             ip: device.hostname,
             hostname: device.hostname,
             sysName: device.sysName,
+            name: device.name,
         });
         if (!winner || !winner.siteId) {
             return;

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

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

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

@@ -8,15 +8,55 @@ 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 NetworkSiteService from "./NetworkSiteService";
 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";
+import RelationIdUtil from "../Utils/Database/RelationIdUtil";
+/*
+ * The dashboard posts the `site` relation while server-side callers write the
+ * `siteId` column; read whichever is present. See RelationIdUtil.
+ */
+const SITE_KEYS = ["siteId", "site"];
+function readSiteId(data) {
+    return RelationIdUtil.read(data, SITE_KEYS);
+}
 export class Service extends DatabaseService {
     constructor() {
         super(Model);
     }
+    /*
+     * The FK behind siteId only requires the NetworkSite row to exist, not that
+     * it belongs to the rule's project. A rule pointing at a foreign site is
+     * both a cross-tenant read (the rules table renders `site.name`) and a rule
+     * that can never assign anything - NetworkDeviceService's own tenancy guard
+     * rejects the resulting device update. Fail at write time instead, where
+     * the user can see it.
+     */
+    async assertSiteBelongsToProject(data) {
+        if (!data.projectId) {
+            return;
+        }
+        const site = await NetworkSiteService.findOneById({
+            id: data.siteId,
+            select: {
+                _id: true,
+                projectId: true,
+            },
+            props: {
+                isRoot: true,
+            },
+        });
+        if (!site) {
+            throw new BadDataException("Network site not found.");
+        }
+        if (site.projectId &&
+            site.projectId.toString() !== data.projectId.toString()) {
+            throw new BadDataException("Network site must belong to the same project.");
+        }
+    }
     /*
      * A rule with neither criterion would match nothing (or, worse, read as
      * "match everything" to a future maintainer) - reject it at write time.
@@ -26,12 +66,20 @@ export class Service extends DatabaseService {
             subnetCidr: createBy.data.subnetCidr,
             hostnamePattern: createBy.data.hostnamePattern,
         });
+        const siteId = readSiteId(createBy.data);
+        if (siteId) {
+            await this.assertSiteBelongsToProject({
+                siteId: siteId,
+                projectId: createBy.data.projectId,
+            });
+        }
         return { createBy, carryForward: null };
     }
     async onBeforeUpdate(updateBy) {
         const dataKeys = Object.keys(updateBy.data || {});
-        if (!dataKeys.includes("subnetCidr") &&
-            !dataKeys.includes("hostnamePattern")) {
+        const isCriteriaChange = dataKeys.includes("subnetCidr") || dataKeys.includes("hostnamePattern");
+        const newSiteId = readSiteId(updateBy.data);
+        if (!isCriteriaChange && !newSiteId) {
             return { updateBy, carryForward: null };
         }
         /*
@@ -42,6 +90,7 @@ export class Service extends DatabaseService {
             query: updateBy.query,
             select: {
                 _id: true,
+                projectId: true,
                 subnetCidr: true,
                 hostnamePattern: true,
             },
@@ -52,14 +101,22 @@ export class Service extends DatabaseService {
             },
         });
         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,
-            });
+            if (isCriteriaChange) {
+                this.validateCriteria({
+                    subnetCidr: dataKeys.includes("subnetCidr")
+                        ? updateBy.data["subnetCidr"]
+                        : existingRule.subnetCidr,
+                    hostnamePattern: dataKeys.includes("hostnamePattern")
+                        ? updateBy.data["hostnamePattern"]
+                        : existingRule.hostnamePattern,
+                });
+            }
+            if (newSiteId) {
+                await this.assertSiteBelongsToProject({
+                    siteId: newSiteId,
+                    projectId: existingRule.projectId,
+                });
+            }
         }
         return { updateBy, carryForward: null };
     }

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

@@ -1 +1 @@
-{"version":3,"file":"NetworkSiteAssignmentRuleService.js","sourceRoot":"","sources":["../../../../Server/Services/NetworkSiteAssignmentRuleService.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,MAAM,uDAAuD,CAAC;AAI1E,OAAO,WAAW,MAAM,gCAAgC,CAAC;AACzD,OAAO,SAAS,MAAM,+BAA+B,CAAC;AACtD,OAAO,gBAAgB,MAAM,wCAAwC,CAAC;AACtE,OAAO,aAAa,MAAM,uCAAuC,CAAC;AAElE,MAAM,OAAO,OAAQ,SAAQ,eAAsB;IACjD;QACE,KAAK,CAAC,KAAK,CAAC,CAAC;IACf,CAAC;IAED;;;OAGG;IAEsB,AAAN,KAAK,CAAC,cAAc,CACrC,QAAyB;QAEzB,IAAI,CAAC,gBAAgB,CAAC;YACpB,UAAU,EAAE,QAAQ,CAAC,IAAI,CAAC,UAAU;YACpC,eAAe,EAAE,QAAQ,CAAC,IAAI,CAAC,eAAe;SAC/C,CAAC,CAAC;QAEH,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC;IAC1C,CAAC;IAGwB,AAAN,KAAK,CAAC,cAAc,CACrC,QAAyB;QAEzB,MAAM,QAAQ,GAAkB,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;QAEjE,IACE,CAAC,QAAQ,CAAC,QAAQ,CAAC,YAAY,CAAC;YAChC,CAAC,QAAQ,CAAC,QAAQ,CAAC,iBAAiB,CAAC,EACrC,CAAC;YACD,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC;QAC1C,CAAC;QAED;;;WAGG;QACH,MAAM,aAAa,GAAiB,MAAM,IAAI,CAAC,MAAM,CAAC;YACpD,KAAK,EAAE,QAAQ,CAAC,KAAK;YACrB,MAAM,EAAE;gBACN,GAAG,EAAE,IAAI;gBACT,UAAU,EAAE,IAAI;gBAChB,eAAe,EAAE,IAAI;aACtB;YACD,KAAK,EAAE,SAAS;YAChB,IAAI,EAAE,CAAC;YACP,KAAK,EAAE;gBACL,MAAM,EAAE,IAAI;aACb;SACF,CAAC,CAAC;QAEH,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE,CAAC;YACzC,IAAI,CAAC,gBAAgB,CAAC;gBACpB,UAAU,EAAE,QAAQ,CAAC,QAAQ,CAAC,YAAY,CAAC;oBACzC,CAAC,CAAG,QAAQ,CAAC,IAAY,CAAC,YAAY,CAAmB;oBACzD,CAAC,CAAC,YAAY,CAAC,UAAU;gBAC3B,eAAe,EAAE,QAAQ,CAAC,QAAQ,CAAC,iBAAiB,CAAC;oBACnD,CAAC,CAAG,QAAQ,CAAC,IAAY,CAAC,iBAAiB,CAAmB;oBAC9D,CAAC,CAAC,YAAY,CAAC,eAAe;aACjC,CAAC,CAAC;QACL,CAAC;QAED,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC;IAC1C,CAAC;IAEO,gBAAgB,CAAC,IAGxB;QACC,MAAM,UAAU,GAAW,CAAC,IAAI,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QAC1D,MAAM,eAAe,GAAW,CAAC,IAAI,CAAC,eAAe,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QAEpE,IAAI,CAAC,UAAU,IAAI,CAAC,eAAe,EAAE,CAAC;YACpC,MAAM,IAAI,gBAAgB,CACxB,8DAA8D,CAC/D,CAAC;QACJ,CAAC;QAED,IAAI,UAAU,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,UAAU,CAAC,EAAE,CAAC;YACzD,MAAM,IAAI,gBAAgB,CACxB,GAAG,UAAU,wDAAwD,CACtE,CAAC;QACJ,CAAC;IACH,CAAC;CACF;AA3E0B;IADxB,WAAW,EAAE;;;;6CAUb;AAGwB;IADxB,WAAW,EAAE;;;;6CA2Cb;AAuBH,eAAe,IAAI,OAAO,EAAE,CAAC"}
+{"version":3,"file":"NetworkSiteAssignmentRuleService.js","sourceRoot":"","sources":["../../../../Server/Services/NetworkSiteAssignmentRuleService.ts"],"names":[],"mappings":"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"}