@oneuptime/common 12.0.30 → 12.0.31

package/build/dist/Utils/EnterpriseLicense/EnterpriseLicenseSeats.js

@@ -0,0 +1,153 @@
+export default class EnterpriseLicenseSeatsUtil {
+    /*
+     * How many seats are in use, and whether one more user fits.
+     *
+     * The awkward part is that a license is shared by every instance the
+     * customer runs, and only oneuptime.com can deduplicate users across them —
+     * the same person on staging and production is one seat. So this instance
+     * has two numbers and neither one is the answer on its own:
+     *
+     *   localUserCount      live, but blind to the customer's other instances.
+     *   aggregatedUserCount complete, but up to a day old, so it does not know
+     *                       about anyone added since the last daily report —
+     *                       including the user being added right now.
+     *
+     * Combining them needs to know how much of the aggregate is NOT ours, which
+     * is what the per-instance breakdown is for: subtract our own last reported
+     * count from the aggregate and what is left is other instances. Add the live
+     * local count back and the result is current on this instance and complete
+     * on the others.
+     *
+     * When the breakdown does not say — an older license server that sends no
+     * instance list, an instance that has never registered — there is nothing to
+     * subtract, and the fallback is the larger of the two numbers on their own.
+     * That is the only case where the stale aggregate decides anything: with a
+     * usable breakdown it is deliberately NOT maxed in, because it would then
+     * outvote the live count in the one direction that hurts. Free twenty seats
+     * by deleting twenty users and a stale aggregate would go on refusing new
+     * ones until the next daily report.
+     *
+     * Which way it is allowed to be wrong: under-enforcing is recoverable (the
+     * next daily report corrects the count, and the breach emails already go
+     * out), over-enforcing locks a paying customer out of their own instance.
+     * So every "I cannot tell" branch below resolves towards under-enforcing.
+     */
+    static getSeatUsage(input) {
+        var _a;
+        const userLimit = this.parseUserLimit(input.userLimit);
+        const localUserCount = (_a = this.parseCount(input.localUserCount)) !== null && _a !== void 0 ? _a : 0;
+        const aggregatedUserCount = this.parseCount(input.aggregatedUserCount);
+        /*
+         * Null means the report is not complete enough to attribute seats to
+         * anybody, which is a different thing from attributing zero to them.
+         */
+        const otherInstanceSeats = this.getSeatsUsedByOtherInstances({
+            aggregatedUserCount: aggregatedUserCount,
+            instances: input.instances,
+            thisInstanceId: input.thisInstanceId,
+        });
+        const seatsUsedByOtherInstances = otherInstanceSeats !== null && otherInstanceSeats !== void 0 ? otherInstanceSeats : 0;
+        const seatsInUse = otherInstanceSeats === null
+            ? Math.max(localUserCount, aggregatedUserCount !== null && aggregatedUserCount !== void 0 ? aggregatedUserCount : 0)
+            : otherInstanceSeats + localUserCount;
+        if (userLimit === null) {
+            return {
+                isEnforced: false,
+                userLimit: null,
+                seatsInUse: seatsInUse,
+                seatsRemaining: null,
+                hasSeatForNewUser: true,
+                seatsUsedByOtherInstances: seatsUsedByOtherInstances,
+            };
+        }
+        return {
+            isEnforced: true,
+            userLimit: userLimit,
+            seatsInUse: seatsInUse,
+            seatsRemaining: Math.max(0, userLimit - seatsInUse),
+            hasSeatForNewUser: seatsInUse < userLimit,
+            seatsUsedByOtherInstances: seatsUsedByOtherInstances,
+        };
+    }
+    /*
+     * The message an administrator reads when a seat could not be taken. Built
+     * here rather than at each throw site so the invite form, the signup form
+     * and SSO/SCIM provisioning all explain the same thing the same way, and so
+     * the tests can assert on it without copying the wording.
+     */
+    static getSeatLimitReachedMessage(data) {
+        return (`This OneUptime installation has reached the ${data.userLimit.toLocaleString()}-user ` +
+            `limit of its enterprise license (${data.seatsInUse.toLocaleString()} in use). New users ` +
+            `cannot be invited, signed up or provisioned until a seat is freed up or the license is ` +
+            `expanded. Contact sales@oneuptime.com to add seats, then use "Refresh license" in the ` +
+            `edition dialog to apply the new limit.`);
+    }
+    /*
+     * The part of the aggregate that belongs to instances other than this one,
+     * or null when the report does not say.
+     *
+     * Null rather than zero, because the two lead somewhere different: zero means
+     * "this installation is the only one holding seats", and null means "the
+     * report cannot be decomposed, fall back to comparing the two totals". Every
+     * missing or unusable field lands on null.
+     *
+     * In particular, an instance list that does not contain us is NOT treated as
+     * "then all of the aggregate is somebody else's". That reading is right for a
+     * genuinely unregistered instance, and catastrophic for an instance whose id
+     * changed after its users were already counted under the old one: it would
+     * count this installation's users twice and lock it out.
+     */
+    static getSeatsUsedByOtherInstances(data) {
+        const aggregatedUserCount = data.aggregatedUserCount;
+        if (aggregatedUserCount === null) {
+            return null;
+        }
+        if (!Array.isArray(data.instances) || data.instances.length === 0) {
+            return null;
+        }
+        const thisInstanceId = typeof data.thisInstanceId === "string" ? data.thisInstanceId.trim() : "";
+        if (!thisInstanceId) {
+            return null;
+        }
+        const thisInstance = data.instances.find((instance) => {
+            return Boolean(instance) && instance.instanceId === thisInstanceId;
+        });
+        if (!thisInstance) {
+            return null;
+        }
+        const ownReportedCount = this.parseCount(thisInstance.userCount);
+        if (ownReportedCount === null) {
+            return null;
+        }
+        return Math.max(0, aggregatedUserCount - ownReportedCount);
+    }
+    /*
+     * A limit is only a limit when it is a positive whole number.
+     *
+     * Zero is deliberately read as "no limit" rather than "no seats at all",
+     * matching every other place in the product that measures seat usage
+     * (the license modal, the breach notification job). A license that really
+     * grants nobody an account is not a thing OneUptime issues, and reading a
+     * stray zero the other way would leave an installation unable to create even
+     * its first user.
+     */
+    static parseUserLimit(value) {
+        if (typeof value !== "number" ||
+            !Number.isFinite(value) ||
+            !Number.isInteger(value) ||
+            value <= 0) {
+            return null;
+        }
+        return value;
+    }
+    static parseCount(value) {
+        if (typeof value !== "number" ||
+            !Number.isFinite(value) ||
+            !Number.isInteger(value) ||
+            value < 0) {
+            return null;
+        }
+        return value;
+    }
+}
+//# sourceMappingURL=EnterpriseLicenseSeats.js.map

package/build/dist/Utils/EnterpriseLicense/EnterpriseLicenseSeats.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"EnterpriseLicenseSeats.js","sourceRoot":"","sources":["../../../../Utils/EnterpriseLicense/EnterpriseLicenseSeats.ts"],"names":[],"mappings":"AA4EA,MAAM,CAAC,OAAO,OAAO,0BAA0B;IAC7C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAgCG;IACI,MAAM,CAAC,YAAY,CAAC,KAAqB;;QAC9C,MAAM,SAAS,GAAkB,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACtE,MAAM,cAAc,GAAW,MAAA,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,cAAc,CAAC,mCAAI,CAAC,CAAC;QAC1E,MAAM,mBAAmB,GAAkB,IAAI,CAAC,UAAU,CACxD,KAAK,CAAC,mBAAmB,CAC1B,CAAC;QAEF;;;WAGG;QACH,MAAM,kBAAkB,GAAkB,IAAI,CAAC,4BAA4B,CACzE;YACE,mBAAmB,EAAE,mBAAmB;YACxC,SAAS,EAAE,KAAK,CAAC,SAAS;YAC1B,cAAc,EAAE,KAAK,CAAC,cAAc;SACrC,CACF,CAAC;QAEF,MAAM,yBAAyB,GAAW,kBAAkB,aAAlB,kBAAkB,cAAlB,kBAAkB,GAAI,CAAC,CAAC;QAElE,MAAM,UAAU,GACd,kBAAkB,KAAK,IAAI;YACzB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,cAAc,EAAE,mBAAmB,aAAnB,mBAAmB,cAAnB,mBAAmB,GAAI,CAAC,CAAC;YACpD,CAAC,CAAC,kBAAkB,GAAG,cAAc,CAAC;QAE1C,IAAI,SAAS,KAAK,IAAI,EAAE,CAAC;YACvB,OAAO;gBACL,UAAU,EAAE,KAAK;gBACjB,SAAS,EAAE,IAAI;gBACf,UAAU,EAAE,UAAU;gBACtB,cAAc,EAAE,IAAI;gBACpB,iBAAiB,EAAE,IAAI;gBACvB,yBAAyB,EAAE,yBAAyB;aACrD,CAAC;QACJ,CAAC;QAED,OAAO;YACL,UAAU,EAAE,IAAI;YAChB,SAAS,EAAE,SAAS;YACpB,UAAU,EAAE,UAAU;YACtB,cAAc,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,SAAS,GAAG,UAAU,CAAC;YACnD,iBAAiB,EAAE,UAAU,GAAG,SAAS;YACzC,yBAAyB,EAAE,yBAAyB;SACrD,CAAC;IACJ,CAAC;IAED;;;;;OAKG;IACI,MAAM,CAAC,0BAA0B,CAAC,IAGxC;QACC,OAAO,CACL,+CAA+C,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,QAAQ;YACtF,oCAAoC,IAAI,CAAC,UAAU,CAAC,cAAc,EAAE,sBAAsB;YAC1F,yFAAyF;YACzF,wFAAwF;YACxF,wCAAwC,CACzC,CAAC;IACJ,CAAC;IAED;;;;;;;;;;;;;;OAcG;IACK,MAAM,CAAC,4BAA4B,CAAC,IAI3C;QACC,MAAM,mBAAmB,GAAkB,IAAI,CAAC,mBAAmB,CAAC;QAEpE,IAAI,mBAAmB,KAAK,IAAI,EAAE,CAAC;YACjC,OAAO,IAAI,CAAC;QACd,CAAC;QAED,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAClE,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,cAAc,GAClB,OAAO,IAAI,CAAC,cAAc,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAE5E,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,YAAY,GAChB,IAAI,CAAC,SAAS,CAAC,IAAI,CACjB,CAAC,QAA0C,EAAW,EAAE;YACtD,OAAO,OAAO,CAAC,QAAQ,CAAC,IAAI,QAAQ,CAAC,UAAU,KAAK,cAAc,CAAC;QACrE,CAAC,CACF,CAAC;QAEJ,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,gBAAgB,GAAkB,IAAI,CAAC,UAAU,CACrD,YAAY,CAAC,SAAS,CACvB,CAAC;QAEF,IAAI,gBAAgB,KAAK,IAAI,EAAE,CAAC;YAC9B,OAAO,IAAI,CAAC;QACd,CAAC;QAED,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,mBAAmB,GAAG,gBAAgB,CAAC,CAAC;IAC7D,CAAC;IAED;;;;;;;;;OASG;IACK,MAAM,CAAC,cAAc,CAAC,KAAc;QAC1C,IACE,OAAO,KAAK,KAAK,QAAQ;YACzB,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC;YACvB,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC;YACxB,KAAK,IAAI,CAAC,EACV,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC;QAED,OAAO,KAAK,CAAC;IACf,CAAC;IAEO,MAAM,CAAC,UAAU,CAAC,KAAc;QACtC,IACE,OAAO,KAAK,KAAK,QAAQ;YACzB,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC;YACvB,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC;YACxB,KAAK,GAAG,CAAC,EACT,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC;QAED,OAAO,KAAK,CAAC;IACf,CAAC;CACF"}

package/build/dist/Utils/NetworkDiscovery/AutoImportRuleMatcher.js.map

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

package/build/dist/Utils/NetworkDiscovery/DiscoveredDeviceBuilder.js

@@ -3,6 +3,7 @@ import NetworkDeviceMonitoringMethod from "../../Types/NetworkDevice/NetworkDevi
 import ObjectID from "../../Types/ObjectID";
 import SnmpScanConfigUtil from "./SnmpScanConfigUtil";
 import { monitoringMethodForDiscoveredHost } from "./DiscoveryImportEligibility";
+import { normalizeReverseDnsName } from "./ReverseDnsNameUtil";
 /*
  * One discovered host -> one NetworkDevice, the same way everywhere.
  *
@@ -30,9 +31,76 @@ export const MAX_DEVICE_DESCRIPTION_LENGTH = 500;
 function truncate(value, maxLength) {
     return value.length > maxLength ? value.substring(0, maxLength) : value;
 }
-/** The name a discovered host imports under: its sysName, or its address. */
+/**
+ * What a discovered host is CALLED — in the Review dialog, and (clamped by
+ * `buildDeviceName`) on the device it imports as.
+ *
+ * Three sources, in this order, first non-empty wins:
+ *
+ *   1. `sysName`, the name the device gives for itself over SNMP. It stays
+ *      first because it always has been, and because it is the one name the
+ *      device itself asserts: demoting it would silently rename devices that
+ *      import correctly today, which nobody asked for.
+ *   2. `dnsHostname`, its reverse-DNS (PTR) name (OneUptime issue #3529).
+ *      This is the whole point of the addition, and it lands exactly where
+ *      the complaint was: a host with no readable SNMP has no sysName, so
+ *      before this it fell straight through to its address. On an estate that
+ *      keeps DNS records — the reporter's does — that turns a review list of
+ *      "10.18.166.51, 10.18.166.53, ..." into names an operator recognises.
+ *   3. The address, unchanged, when neither name exists.
+ *
+ * Split out of `buildDeviceName` so the dashboard row and the device it
+ * creates cannot disagree: the operator ticks a box next to a name, and that
+ * is the name the device gets. Returned UNTRUNCATED, so a caller that wants
+ * the full name can have it; the Review dialog and the import both go through
+ * `buildDeviceName`, which clamps, so that what is shown is what is created.
+ *
+ * TWO CONSEQUENCES OF NAMING A DEVICE BY DNS, both accepted deliberately:
+ *
+ *   - Anything that matches on `NetworkDevice.name` now sees a name the
+ *     SCANNED NETWORK chose. NetworkSiteAssignmentRule and the label/owner
+ *     rule engines are the live examples: a rule written against a naming
+ *     convention will match differently for a host that used to be called
+ *     "10.18.166.51" and is now called "core-gw.corp.example.com". That is
+ *     inherent to the feature — the alternative is not naming devices by DNS —
+ *     and it is why the name is put through ReverseDnsNameUtil rather than
+ *     trusted. Rules keyed on `hostname` are unaffected: that stays the IP.
+ *   - Names stop being unique per host. Addresses were; PTR names are not, and
+ *     a wildcard reverse zone over a DHCP range gives every host in it the
+ *     same answer. `buildFallbackDeviceName` is the answer to that, and BOTH
+ *     import paths must use it — the rule engine does, and the dashboard's
+ *     Review-dialog import does since the same wildcard case made collisions
+ *     ordinary rather than rare.
+ */
+export function getDiscoveredHostDisplayName(host) {
+    var _a;
+    /*
+     * The PTR name is re-normalised here rather than trusted from the column.
+     * `discoveredDevices` is jsonb stored verbatim from the probe's payload, so
+     * "the probe already checked it" holds only for the probe version that
+     * wrote the row — not for a result from an older or a modified probe, and
+     * not for a row written straight through the API. This function is the last
+     * point before the value becomes a rendered line and a slugified device
+     * name, so it is the right place to be sure. See ReverseDnsNameUtil.
+     */
+    /*
+     * `sysName` is read through a typeof guard rather than trusted, for the
+     * same reason `dnsHostname` is normalised: both come out of the same
+     * verbatim jsonb blob, where the declared TypeScript type is a description
+     * of what the probe SHOULD send rather than a guarantee about what is
+     * stored. `(42).trim()` is a TypeError, and since this function became the
+     * dashboard's name line that TypeError would be thrown during render —
+     * taking out the whole Review dialog rather than one row, which is
+     * precisely the failure normalizeDiscoveredHosts was written to end.
+     */
+    const sysName = typeof host.sysName === "string" ? host.sysName.trim() : "";
+    return (sysName ||
+        normalizeReverseDnsName(host.dnsHostname) ||
+        String((_a = host.ipAddress) !== null && _a !== void 0 ? _a : ""));
+}
+/** The name a discovered host imports under, clamped to the slug's ceiling. */
 export function buildDeviceName(host) {
-    return truncate((host.sysName || "").trim() || host.ipAddress, MAX_DEVICE_NAME_LENGTH);
+    return truncate(getDiscoveredHostDisplayName(host), MAX_DEVICE_NAME_LENGTH);
 }
 /**
  * The fallback name when `buildDeviceName`'s answer is already taken.
@@ -44,10 +112,38 @@ export function buildDeviceName(host) {
  * ceiling.
  */
 export function buildFallbackDeviceName(host) {
-    const suffix = ` (${host.ipAddress})`;
+    var _a;
+    /*
+     * The address is read through the SAME coercion the display path uses, not
+     * straight out of the jsonb.
+     *
+     * A raw template read turned a missing address into the literal
+     * " (undefined)" and an object one into " ([object Object])" — and those
+     * tokens are IDENTICAL for every such host, so the fallback produced the
+     * same name again and the retry failed on the very duplicate it was
+     * retrying. This function exists to break a name collision; a suffix that
+     * collides is worse than useless.
+     */
+    const address = String((_a = host.ipAddress) !== null && _a !== void 0 ? _a : "").trim();
+    /*
+     * An address-less host gets no suffix at all rather than an empty pair of
+     * brackets. There is nothing to tell it apart BY, so the honest outcome is
+     * the base name unchanged — the caller's create then fails on the duplicate,
+     * which is the truth, instead of succeeding under a name that pretends to
+     * carry an address.
+     */
+    const suffix = address ? ` (${address})` : "";
     const baseName = buildDeviceName(host);
-    return (truncate(baseName, Math.max(1, MAX_DEVICE_NAME_LENGTH - suffix.length)) +
-        suffix);
+    /*
+     * Clamped as a whole, not just the base. `Math.max(1, ...)` keeps a
+     * character of the base name however long the suffix is, so an absurd
+     * address — the field is never validated on this path, it is whatever the
+     * probe wrote — could compose a name past the ceiling and fail the create on
+     * the slug's own length, which is the exact overflow the ceiling exists to
+     * prevent.
+     */
+    return truncate(truncate(baseName, Math.max(1, MAX_DEVICE_NAME_LENGTH - suffix.length)) +
+        suffix, MAX_DEVICE_NAME_LENGTH);
 }
 /**
  * The NetworkDevice a discovered host imports as.
@@ -63,12 +159,33 @@ export function buildFallbackDeviceName(host) {
  * `buildFallbackDeviceName(host)` without re-deciding anything else.
  */
 export function buildNetworkDeviceFromDiscoveredHost(data) {
+    var _a;
     const host = data.host;
     const device = new NetworkDevice();
     device.projectId = data.projectId;
     device.name = data.name || buildDeviceName(host);
-    // The address is the device's hostname AND the registered-host dedup key.
-    device.hostname = host.ipAddress;
+    /*
+     * The address is the device's hostname AND the registered-host dedup key.
+     *
+     * It stays the ADDRESS even when the host resolved a PTR name, which is
+     * what issue #3529 asked for in as many words ("retain the IP address as
+     * the address/IP field"), and what the rest of the system needs: this
+     * column is what the ingest path matches a scan's results against
+     * (NetworkDeviceService.getRegisteredHostnames), what the SNMP poller
+     * dials, and what a trap's source IP is correlated to. Storing a name here
+     * would make a device stop polling the day its reverse zone changed, and
+     * would make the same host import twice — once by address, once by name.
+     * The PTR record names the device; it does not address it.
+     *
+     * COERCED, because the dedup key has to be a string. The value comes out of
+     * jsonb, and `getRegisteredHostnames` matches it with `Set.has()` against
+     * hostnames read back from the database — and `Set.has` does not coerce, so
+     * a numeric address stored raw would never match its own registered device
+     * and the host would import again on every review. The dashboard path is
+     * already covered by normalizeDiscoveredHosts; this makes the builder safe
+     * for the rule engine and for any future caller that holds a raw row.
+     */
+    device.hostname = String((_a = host.ipAddress) !== null && _a !== void 0 ? _a : "").trim();
     if (host.sysDescr) {
         device.description = truncate(host.sysDescr, MAX_DEVICE_DESCRIPTION_LENGTH);
     }
@@ -82,6 +199,9 @@ export function buildNetworkDeviceFromDiscoveredHost(data) {
         device.isPollingEnabled = false;
         return device;
     }
+    if (data.oidTemplateId) {
+        device.oidTemplateId = data.oidTemplateId;
+    }
     if (data.autoApplyVendorHealthTemplate) {
         device.autoApplyVendorHealthTemplate = true;
     }

package/build/dist/Utils/NetworkDiscovery/DiscoveredDeviceBuilder.js.map

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

package/build/dist/Utils/NetworkDiscovery/DiscoveredHostUtil.js

@@ -1,3 +1,4 @@
+import { normalizeReverseDnsName } from "./ReverseDnsNameUtil";
 /*
  * Normalisation for a scan's stored results, shared by every reader of the
  * `discoveredDevices` jsonb column: the dashboard's Review dialog and the
@@ -34,7 +35,12 @@ function isDiscoveredHostObject(host) {
  *     import, so whether a device already in the inventory got created a
  *     second time depended on which order the probe happened to list them in.
  *
- * All three are fixed here rather than at each call site, so the row the
+ * A fourth was added with reverse DNS (issue #3529) and is not a probe bug at
+ * all — `dnsHostname` is a value the SCANNED NETWORK chooses, so it is
+ * untrusted by construction rather than by accident, and it is normalised
+ * here for the same reason: one reading of the payload for every reader.
+ *
+ * All of them are fixed here rather than at each call site, so the row the
  * operator sees, the badge above it, the list Import walks, and the hosts an
  * auto-import rule evaluates can never be working from different readings of
  * the same payload.
@@ -50,9 +56,50 @@ export function normalizeDiscoveredHosts(hosts) {
          * truthy, so it used to pass selectability and import as a Network Device
          * whose hostname was a single space.
          */
-        cleaned.push(Object.assign(Object.assign({}, host), { ipAddress: host.ipAddress === undefined || host.ipAddress === null
+        const normalized = Object.assign(Object.assign({}, host), { ipAddress: host.ipAddress === undefined || host.ipAddress === null
                 ? ""
-                : String(host.ipAddress).trim() }));
+                : String(host.ipAddress).trim() });
+        /*
+         * `sysName` is read straight out of the jsonb, its declared type is not
+         * enforced by anything, and every reader calls a string method on it. A
+         * numeric sysName reached getDiscoveredHostDisplayName and threw inside
+         * the Review dialog's render, taking out the whole modal rather than one
+         * row — the same failure the null-row case above is about.
+         *
+         * A non-string is blanked rather than STRINGIFIED, which is where this
+         * differs from the address above. `String(null)` is "null" and
+         * `String({})` is "[object Object]", and both are truthy — so stringifying
+         * would not merely fail to name the host, it would win the naming contest
+         * outright and create a device called "null", beating a perfectly good PTR
+         * record on the very same row. An empty string is falsy, so naming falls
+         * through to `dnsHostname` and then to the address, which is exactly what
+         * a host with no readable system name deserves.
+         *
+         * Only rewritten when it is NOT already a string, so a host that never had
+         * the key does not gain an empty one — `sysName` is optional and
+         * `"sysName" in host` is a question other code is entitled to ask.
+         */
+        if (host.sysName !== undefined && typeof host.sysName !== "string") {
+            normalized.sysName = "";
+        }
+        /*
+         * The PTR name gets the same treatment, for a sharper version of the same
+         * reason (OneUptime issue #3529): unlike every other field here, its
+         * value was chosen by whoever runs DNS for the scanned subnet — routinely
+         * not this project — and it is stored verbatim in jsonb. So the rules
+         * about what a name may contain are applied on the way OUT of the column
+         * as well as on the way in, and anything that fails them is DELETED
+         * rather than blanked, so a reader that checks `if (host.dnsHostname)`
+         * and a reader that checks `"dnsHostname" in host` cannot disagree.
+         */
+        const dnsHostname = normalizeReverseDnsName(host.dnsHostname);
+        if (dnsHostname) {
+            normalized.dnsHostname = dnsHostname;
+        }
+        else {
+            delete normalized.dnsHostname;
+        }
+        cleaned.push(normalized);
     }
     // An address the scan reports as registered is registered on every row.
     const registeredIpAddresses = new Set();

package/build/dist/Utils/NetworkDiscovery/DiscoveredHostUtil.js.map

@@ -1 +1 @@
-{"version":3,"file":"DiscoveredHostUtil.js","sourceRoot":"","sources":["../../../../Utils/NetworkDiscovery/DiscoveredHostUtil.ts"],"names":[],"mappings":"AAEA;;;;;;;GAOG;AAEH;;;GAGG;AACH,SAAS,sBAAsB,CAC7B,IAAa;IAEb,OAAO,OAAO,CAAC,IAAI,CAAC,IAAI,OAAO,IAAI,KAAK,QAAQ,CAAC;AACnD,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,MAAM,UAAU,wBAAwB,CACtC,KAAqC;IAErC,MAAM,OAAO,GAAmC,EAAE,CAAC;IAEnD,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,EAAE,CAAC;YAClC,SAAS;QACX,CAAC;QAED;;;;WAIG;QACH,OAAO,CAAC,IAAI,iCACP,IAAI,KACP,SAAS,EACP,IAAI,CAAC,SAAS,KAAK,SAAS,IAAI,IAAI,CAAC,SAAS,KAAK,IAAI;gBACrD,CAAC,CAAC,EAAE;gBACJ,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,IACnC,CAAC;IACL,CAAC;IAED,wEAAwE;IACxE,MAAM,qBAAqB,GAAgB,IAAI,GAAG,EAAU,CAAC;IAE7D,KAAK,MAAM,IAAI,IAAI,OAAO,EAAE,CAAC;QAC3B,IAAI,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAC/C,qBAAqB,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC5C,CAAC;IACH,CAAC;IAED,IAAI,qBAAqB,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;QACrC,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,IAA6B,EAAE,EAAE;QACnD,IACE,IAAI,CAAC,mBAAmB;YACxB,CAAC,qBAAqB,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,EAC1C,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC;QAED,uCAAY,IAAI,KAAE,mBAAmB,EAAE,IAAI,IAAG;IAChD,CAAC,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"DiscoveredHostUtil.js","sourceRoot":"","sources":["../../../../Utils/NetworkDiscovery/DiscoveredHostUtil.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAE/D;;;;;;;GAOG;AAEH;;;GAGG;AACH,SAAS,sBAAsB,CAC7B,IAAa;IAEb,OAAO,OAAO,CAAC,IAAI,CAAC,IAAI,OAAO,IAAI,KAAK,QAAQ,CAAC;AACnD,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,MAAM,UAAU,wBAAwB,CACtC,KAAqC;IAErC,MAAM,OAAO,GAAmC,EAAE,CAAC;IAEnD,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,EAAE,CAAC;YAClC,SAAS;QACX,CAAC;QAED;;;;WAIG;QACH,MAAM,UAAU,mCACX,IAAI,KACP,SAAS,EACP,IAAI,CAAC,SAAS,KAAK,SAAS,IAAI,IAAI,CAAC,SAAS,KAAK,IAAI;gBACrD,CAAC,CAAC,EAAE;gBACJ,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,GACpC,CAAC;QAEF;;;;;;;;;;;;;;;;;;;WAmBG;QACH,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS,IAAI,OAAO,IAAI,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;YACnE,UAAU,CAAC,OAAO,GAAG,EAAE,CAAC;QAC1B,CAAC;QAED;;;;;;;;;WASG;QACH,MAAM,WAAW,GAAuB,uBAAuB,CAC7D,IAAI,CAAC,WAAW,CACjB,CAAC;QAEF,IAAI,WAAW,EAAE,CAAC;YAChB,UAAU,CAAC,WAAW,GAAG,WAAW,CAAC;QACvC,CAAC;aAAM,CAAC;YACN,OAAO,UAAU,CAAC,WAAW,CAAC;QAChC,CAAC;QAED,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC3B,CAAC;IAED,wEAAwE;IACxE,MAAM,qBAAqB,GAAgB,IAAI,GAAG,EAAU,CAAC;IAE7D,KAAK,MAAM,IAAI,IAAI,OAAO,EAAE,CAAC;QAC3B,IAAI,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAC/C,qBAAqB,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC5C,CAAC;IACH,CAAC;IAED,IAAI,qBAAqB,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;QACrC,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,IAA6B,EAAE,EAAE;QACnD,IACE,IAAI,CAAC,mBAAmB;YACxB,CAAC,qBAAqB,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,EAC1C,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC;QAED,uCAAY,IAAI,KAAE,mBAAmB,EAAE,IAAI,IAAG;IAChD,CAAC,CAAC,CAAC;AACL,CAAC"}

package/build/dist/Utils/NetworkDiscovery/ReverseDnsNameUtil.js

@@ -0,0 +1,132 @@
+/*
+ * What a PTR record is allowed to become, shared by the probe that performs
+ * the lookup and by every reader of the name it stored (OneUptime issue
+ * #3529).
+ *
+ * A discovered host's `dnsHostname` is the ONLY field in a scan result whose
+ * value is chosen by the scanned network rather than by OneUptime or by the
+ * operator: it is whatever a PTR record on some resolver says, and a
+ * discovery scan is routinely pointed at a subnet nobody in the project
+ * administers. That value then becomes a NetworkDevice's name, its slug, and
+ * a line in the Review dialog — so it is normalised HERE, once, by a pure
+ * function both sides call, rather than trusted anywhere.
+ *
+ * Normalising on the probe alone would not be enough. `discoveredDevices` is
+ * jsonb written verbatim from the probe's payload (ProbeIngest/
+ * DiscoveryScan.ts), so the server's own copy of these rules is what holds
+ * for results stored by a probe running a different version, and for rows
+ * hand-written through the API. Normalising on the server alone would not be
+ * enough either: the probe should not spend a scan's storage on names it
+ * knows will be discarded. Both call this.
+ */
+/*
+ * A DNS name is at most 255 octets on the wire; the presentation form tops
+ * out at 253 characters once the length prefixes and root label are removed.
+ * NetworkDevice.name is varchar(100) and DiscoveredDeviceBuilder clamps to 80
+ * for the slug's sake, so this ceiling never decides a device name on its own
+ * — it is here to reject a value that was never a DNS name to begin with.
+ */
+export const MAX_REVERSE_DNS_NAME_LENGTH = 253;
+// RFC 1035 section 2.3.4: labels are 63 octets or fewer.
+export const MAX_REVERSE_DNS_LABEL_LENGTH = 63;
+/*
+ * One label: letters, digits, hyphen — plus underscore, which is not legal in
+ * a hostname but IS common in the wild (Windows/DHCP-registered names, and
+ * plenty of hand-authored reverse zones), and rejecting it would throw away
+ * real names for a standards point nothing here depends on. A hyphen may not
+ * lead or trail.
+ *
+ * Everything else is refused, and the refusals are the point: a name is
+ * rendered in the dashboard, slugified into a URL, and written to a varchar.
+ * Whitespace, quotes, angle brackets, slashes, control characters and
+ * non-ASCII all mean the answer was not a hostname, and a scan of an
+ * untrusted subnet is exactly where that shows up.
+ */
+const LABEL_PATTERN = /^[A-Za-z0-9_](?:[A-Za-z0-9_-]*[A-Za-z0-9_])?$/;
+/*
+ * The reverse-lookup zones themselves. A resolver that echoes the query name
+ * back — some do, on certain failure modes — hands us
+ * "51.166.18.10.in-addr.arpa", which passes every other rule here and is a
+ * strictly worse device name than the address it was derived from.
+ */
+const REVERSE_LOOKUP_ZONES = ["in-addr.arpa", "ip6.arpa"];
+/*
+ * True when every label is digits — "10.18.166.51", but also "51" and "1.2".
+ *
+ * This is what keeps a PTR that merely restates the address out of the name
+ * field. It matters more than it looks: the whole point of the feature is
+ * that a name is more useful than an address, so a "name" that IS the address
+ * must fall through to the address rather than be presented as a resolved
+ * hostname the operator can trust. Checked as "all labels numeric" rather
+ * than as a dotted-quad regex so "51" and "10.18" are caught too.
+ */
+const NUMERIC_LABEL_PATTERN = /^[0-9]+$/;
+function isAllNumericLabels(labels) {
+    return labels.every((label) => {
+        return NUMERIC_LABEL_PATTERN.test(label);
+    });
+}
+/**
+ * The hostname a PTR answer may be stored and displayed as, or undefined when
+ * the answer is not usable as one.
+ *
+ * Accepts `unknown` rather than `string` on purpose: on the server side the
+ * input is a value read out of a jsonb column, and "the probe sent a number"
+ * is a case that has to return undefined rather than throw inside a render.
+ *
+ * Case is PRESERVED. It is whatever the reverse zone was authored with, which
+ * is as close to the operator's intent as this data gets, and DNS's own
+ * case-insensitivity is not a reason to discard it.
+ */
+export function normalizeReverseDnsName(value) {
+    if (typeof value !== "string") {
+        return undefined;
+    }
+    const trimmed = value.trim();
+    if (!trimmed) {
+        return undefined;
+    }
+    /*
+     * Exactly ONE trailing dot is dropped — the root label of a fully qualified
+     * name, which some resolvers include and some do not. A second one leaves
+     * an empty final label, which the per-label check below refuses; that is
+     * deliberate, because "foo.." is malformed rather than "foo." with a typo,
+     * and silently repairing it would be inventing a name.
+     */
+    const withoutRootLabel = trimmed.endsWith(".")
+        ? trimmed.substring(0, trimmed.length - 1)
+        : trimmed;
+    if (!withoutRootLabel) {
+        return undefined;
+    }
+    if (withoutRootLabel.length > MAX_REVERSE_DNS_NAME_LENGTH) {
+        return undefined;
+    }
+    const lowerCased = withoutRootLabel.toLowerCase();
+    for (const zone of REVERSE_LOOKUP_ZONES) {
+        /*
+         * The apex is checked as well as the suffix. `in-addr.arpa` on its own is
+         * a legal hostname string that passes every other rule here, and it is
+         * what a resolver echoing a truncated query name hands back — a strictly
+         * worse label for a device than the address it was derived from.
+         */
+        if (lowerCased === zone || lowerCased.endsWith(`.${zone}`)) {
+            return undefined;
+        }
+    }
+    const labels = withoutRootLabel.split(".");
+    for (const label of labels) {
+        if (!label || label.length > MAX_REVERSE_DNS_LABEL_LENGTH) {
+            return undefined;
+        }
+        if (!LABEL_PATTERN.test(label)) {
+            return undefined;
+        }
+    }
+    if (isAllNumericLabels(labels)) {
+        return undefined;
+    }
+    return withoutRootLabel;
+}
+export default normalizeReverseDnsName;
+//# sourceMappingURL=ReverseDnsNameUtil.js.map

package/build/dist/Utils/NetworkDiscovery/ReverseDnsNameUtil.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ReverseDnsNameUtil.js","sourceRoot":"","sources":["../../../../Utils/NetworkDiscovery/ReverseDnsNameUtil.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,2BAA2B,GAAW,GAAG,CAAC;AAEvD,yDAAyD;AACzD,MAAM,CAAC,MAAM,4BAA4B,GAAW,EAAE,CAAC;AAEvD;;;;;;;;;;;;GAYG;AACH,MAAM,aAAa,GAAW,+CAA+C,CAAC;AAE9E;;;;;GAKG;AACH,MAAM,oBAAoB,GAAkB,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;AAEzE;;;;;;;;;GASG;AACH,MAAM,qBAAqB,GAAW,UAAU,CAAC;AAEjD,SAAS,kBAAkB,CAAC,MAAqB;IAC/C,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC,KAAa,EAAE,EAAE;QACpC,OAAO,qBAAqB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;AACL,CAAC;AAED;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,uBAAuB,CAAC,KAAc;IACpD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,OAAO,GAAW,KAAK,CAAC,IAAI,EAAE,CAAC;IAErC,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,SAAS,CAAC;IACnB,CAAC;IAED;;;;;;OAMG;IACH,MAAM,gBAAgB,GAAW,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC;QACpD,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC;QAC1C,CAAC,CAAC,OAAO,CAAC;IAEZ,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACtB,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,IAAI,gBAAgB,CAAC,MAAM,GAAG,2BAA2B,EAAE,CAAC;QAC1D,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,UAAU,GAAW,gBAAgB,CAAC,WAAW,EAAE,CAAC;IAE1D,KAAK,MAAM,IAAI,IAAI,oBAAoB,EAAE,CAAC;QACxC;;;;;WAKG;QACH,IAAI,UAAU,KAAK,IAAI,IAAI,UAAU,CAAC,QAAQ,CAAC,IAAI,IAAI,EAAE,CAAC,EAAE,CAAC;YAC3D,OAAO,SAAS,CAAC;QACnB,CAAC;IACH,CAAC;IAED,MAAM,MAAM,GAAkB,gBAAgB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAE1D,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,MAAM,GAAG,4BAA4B,EAAE,CAAC;YAC1D,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;YAC/B,OAAO,SAAS,CAAC;QACnB,CAAC;IACH,CAAC;IAED,IAAI,kBAAkB,CAAC,MAAM,CAAC,EAAE,CAAC;QAC/B,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAED,eAAe,uBAAuB,CAAC"}

package/build/dist/Utils/Rules/RuleEngineLimits.js

@@ -0,0 +1,31 @@
+import { LIMIT_PER_PROJECT } from "../../Types/Database/LimitMax";
+/*
+ * How many of a project's automation rules one engine run reads.
+ *
+ * Every rule engine — label, owner, on-call, privacy, auto-remediation,
+ * runbook — answers the same question when a resource is created: "which of
+ * this project's enabled rules match it?". That read used to be written as
+ * `limit: 100, skip: 0`, which is not a page of a paged walk but the whole
+ * evaluation: rule 101 and beyond were fetched by nobody and therefore
+ * matched nothing, forever.
+ *
+ * Nothing surfaced it. The engines have no queue, no cursor and no counter;
+ * they run inline in the resource's onCreateSuccess and log only what they
+ * attached. A project with 1,243 monitor label rules imported 1,000+ monitors
+ * and watched ~50-100 of them get labelled while the rest stayed bare, which
+ * reads exactly like a backlog draining slowly and is in fact 92% of the
+ * rules never being consulted at all (OneUptime/oneuptime#3506).
+ *
+ * The default sort on these reads is createdAt DESC, so the 100 that DID run
+ * were the newest — which is why a rule written early, against a naming
+ * convention the estate was later built on, is precisely the kind of rule
+ * that went quiet.
+ *
+ * LIMIT_PER_PROJECT is the codebase's existing bound for "every row of this
+ * kind in one project". Rules are hand-authored configuration, so this is a
+ * ceiling rather than a page size: a project would need 10,000 enabled rules
+ * of a single kind to reach it.
+ */
+export const MAX_RULES_EVALUATED_PER_PROJECT = LIMIT_PER_PROJECT;
+export default MAX_RULES_EVALUATED_PER_PROJECT;
+//# sourceMappingURL=RuleEngineLimits.js.map

package/build/dist/Utils/Rules/RuleEngineLimits.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"RuleEngineLimits.js","sourceRoot":"","sources":["../../../../Utils/Rules/RuleEngineLimits.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAElE;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,MAAM,CAAC,MAAM,+BAA+B,GAAW,iBAAiB,CAAC;AAEzE,eAAe,+BAA+B,CAAC"}

package/jest.config.json

@@ -48,6 +48,7 @@
   "testEnvironment": "<rootDir>/Tests/Utils/TimezoneEnvironment.js",
   "setupFilesAfterEnv": ["<rootDir>/Tests/jest.setup.ts"],
   "collectCoverage": false,
+  "testTimeout": 60000,
   "coverageReporters": ["text", "lcov"],
   "testRegex": "./Tests/(.*)\\.test\\.(ts|tsx)$",
   "collectCoverageFrom": ["./**/*.{ts,tsx}"],