@oneuptime/common 13.0.5 → 13.0.7

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

@@ -0,0 +1 @@
+{"version":3,"file":"NetbiosNameUtil.js","sourceRoot":"","sources":["../../../../Utils/NetworkDiscovery/NetbiosNameUtil.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAE/D;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAEH;;;;GAIG;AACH,MAAM,CAAC,MAAM,uBAAuB,GAAW,EAAE,CAAC;AAElD;;;;;;;GAOG;AACH,MAAM,4BAA4B,GAAW,cAAc,CAAC;AAE5D,uEAAuE;AACvE,MAAM,cAAc,GAAW,UAAU,CAAC;AAE1C;;;;;;;;GAQG;AACH,SAAS,iBAAiB,CAAC,SAAiB;IAC1C,OAAO,SAAS,KAAK,QAAQ,IAAI,SAAS,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC;AAC3D,CAAC;AAED;;;;;GAKG;AACH,SAAS,oBAAoB,CAAC,KAAa;IACzC,IAAI,GAAG,GAAW,KAAK,CAAC,MAAM,CAAC;IAE/B,OAAO,GAAG,GAAG,CAAC,IAAI,iBAAiB,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QAC3D,GAAG,EAAE,CAAC;IACR,CAAC;IAED,OAAO,KAAK,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;AACjC,CAAC;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,MAAM,UAAU,oBAAoB,CAAC,KAAc;IACjD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,SAAS,GAAW,oBAAoB,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC;IAE7D,IAAI,CAAC,SAAS,IAAI,SAAS,CAAC,MAAM,GAAG,uBAAuB,EAAE,CAAC;QAC7D,OAAO,SAAS,CAAC;IACnB,CAAC;IAED;;;;OAIG;IACH,IAAI,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QAC5B,OAAO,SAAS,CAAC;IACnB,CAAC;IAED;;;;;OAKG;IACH,IAAI,uBAAuB,CAAC,SAAS,CAAC,KAAK,SAAS,EAAE,CAAC;QACrD,OAAO,SAAS,CAAC;IACnB,CAAC;IAED;;;;;OAKG;IACH,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;QACpC,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,UAAU,GAAW,SAAS,CAAC,WAAW,EAAE,CAAC;IAEnD,IAAI,UAAU,KAAK,4BAA4B,EAAE,CAAC;QAChD,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,eAAe,oBAAoB,CAAC"}

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

@@ -0,0 +1,255 @@
+import { MAX_DEVICE_DNS_NAME_LENGTH, buildDeviceName, buildFallbackDeviceName, } from "./DiscoveredDeviceBuilder";
+import { normalizeDiscoveredHosts } from "./DiscoveredHostUtil";
+import { normalizeReverseDnsName } from "./ReverseDnsNameUtil";
+/*
+ * Naming the devices a discovery run imported BEFORE it knew their names
+ * (part of OneUptime issue #3677, "hosts show up only as raw IP").
+ *
+ * WHY THIS EXISTS. A discovery sweep reports incrementally: the probe uploads
+ * what it has found every 30 seconds while it is still sweeping, and the
+ * auto-import worker imports from those partial snapshots within a minute of
+ * them landing (issue #3599). But reverse DNS runs ONCE, after the sweep —
+ * so a partial snapshot never carries a `dnsHostname`, and a host with no
+ * SNMP sysName (a ping-only host, or one whose community string was wrong) is
+ * imported from it named by its bare address. The Review dialog has the same
+ * gap: an operator who imports while the scan is still running gets the same
+ * address-named devices.
+ *
+ * When the run's final, Completed result arrives, it DOES carry the PTR names.
+ * Nothing used them: the import engine skips every host whose address is
+ * already registered, by design, so the device that was imported ten minutes
+ * earlier as "10.18.166.51" stayed "10.18.166.51" forever, while the Review
+ * dialog showed "kds01.wbhq.com" beside it.
+ *
+ * This module decides which devices to rename after that final result, and
+ * to what. It is pure so every condition below is tested without a database;
+ * the rule engine (NetworkDeviceAutoImportRuleEngineService) does the reads,
+ * the server-side collision checks and the writes.
+ *
+ * A device is renamed only when ALL of these hold, and each one guards a way
+ * of renaming something nobody asked to have renamed:
+ *
+ *   (a) It belongs to the scan's project. The engine's query already says so;
+ *       it is checked again here because a rename across a tenant boundary is
+ *       the one mistake this must never make, whatever a future caller passes.
+ *   (b) Its hostname is an address this result reports. The address is the
+ *       device's identity (see DiscoveredDeviceBuilder on `hostname`), so this
+ *       is what ties the device to the host whose name is being applied.
+ *   (c) It is still named by that bare address — its name, trimmed and without
+ *       case, IS its hostname. A device an operator renamed, or one that was
+ *       imported with a sysName or PTR name, is not touched.
+ *   (d) It was created during THIS run: `startedAt <= createdAt <= completedAt`.
+ *       This is what keeps the fix from mass-renaming an estate on upgrade.
+ *       Plenty of long-standing devices are named by their address on
+ *       purpose, or were imported before reverse DNS existed at all, and a
+ *       project that had lived with those names for a year would otherwise
+ *       find them all renamed by the first scan after the upgrade — silently,
+ *       on the one path nobody reviews. Only a device the run itself could
+ *       have created mid-sweep is fair game. No `startedAt`, no renames.
+ *
+ *       The upper bound matters as much as the lower one. The same Completed
+ *       result can be processed more than once — saving an auto-import rule
+ *       re-arms recent scans, and a capped import resumes on later ticks — and
+ *       a device created AFTER the run finished (added by hand as its address,
+ *       or deleted and re-added) was never this run's partial import. Without
+ *       the bound, a re-armed result would rename it. No `completedAt`, no
+ *       renames either.
+ *   (e) The host now HAS a name: the name the builder gives it under the
+ *       scan's naming choice is something other than the address. A result
+ *       with no sysName and no usable PTR record names the host by its address
+ *       again, and "renaming" a device to its own name is nothing to do. The
+ *       name is whatever buildDeviceName decides, never a source list of this
+ *       module's own, so any name the builder learns to read — one the probe
+ *       also resolves only after the sweep included — is applied here too.
+ *
+ * What is left over is, precisely, a device this run imported by address
+ * because the name had not been resolved yet — which is the device the
+ * operator would have got had the import waited for the final result.
+ */
+/*
+ * The longest address worth looking up. The address becomes the device's
+ * varchar(100) hostname, so a longer "address" can never match a device and
+ * is junk — the same ceiling the import engine refuses such rows at.
+ */
+export const MAX_DISCOVERED_HOST_ADDRESS_LENGTH = 100;
+/*
+ * A Date, or a date string out of a row, as epoch milliseconds — or undefined
+ * when it is neither. Undefined never compares as "after the run started", so
+ * a junk timestamp leaves the device alone.
+ */
+export function toEpochMilliseconds(value) {
+    if (value instanceof Date) {
+        const time = value.getTime();
+        return Number.isNaN(time) ? undefined : time;
+    }
+    if (typeof value === "string" && value.trim()) {
+        const time = new Date(value.trim()).getTime();
+        return Number.isNaN(time) ? undefined : time;
+    }
+    return undefined;
+}
+function trimmedString(value) {
+    return typeof value === "string" ? value.trim() : "";
+}
+/**
+ * The hosts in a scan result that have a NAME, keyed by address.
+ *
+ * Read through normalizeDiscoveredHosts — the same reading of the jsonb the
+ * Review dialog and the import engine use — so null rows, numeric addresses,
+ * non-string sysNames and unusable PTR names are dealt with once, the same
+ * way. Accepts `unknown` because the value is the jsonb column as stored, and
+ * "not an array" has to mean "no hosts" rather than a throw inside a worker.
+ *
+ * When an address is listed on more than one row, the FIRST row that names it
+ * wins. Duplicate rows are normal (see the import engine), and a row without
+ * a name must not shadow a later row with one.
+ */
+export function getNamedHostsByAddress(hosts, scan) {
+    const namedHosts = new Map();
+    if (!Array.isArray(hosts)) {
+        return namedHosts;
+    }
+    const normalized = normalizeDiscoveredHosts(hosts);
+    for (const host of normalized) {
+        const address = host.ipAddress;
+        if (!address || address.length > MAX_DISCOVERED_HOST_ADDRESS_LENGTH) {
+            continue;
+        }
+        if (namedHosts.has(address)) {
+            continue;
+        }
+        // Condition (e): the host is called something other than its address.
+        const name = buildDeviceName(host, scan).trim();
+        if (!name || name.toLowerCase() === address.toLowerCase()) {
+            continue;
+        }
+        namedHosts.set(address, host);
+    }
+    return namedHosts;
+}
+/**
+ * The renames one Completed result calls for, in a deterministic order:
+ * oldest device first (then by address, then by id), so when two devices
+ * would take the same name, the one imported first keeps the plain name and
+ * the outcome does not depend on the order the database returned rows in.
+ *
+ * Plans only — no collision checks against the rest of the project, which
+ * need the database. See RunImportedDeviceRename.candidateNames.
+ */
+export function planRunImportedDeviceRenames(data) {
+    // Condition (d) needs both ends of the run; without them, nothing.
+    const runStartedAt = toEpochMilliseconds(data.runStartedAt);
+    const runCompletedAt = toEpochMilliseconds(data.runCompletedAt);
+    const projectId = trimmedString(data.projectId);
+    if (runStartedAt === undefined ||
+        runCompletedAt === undefined ||
+        !projectId) {
+        return [];
+    }
+    const namedHosts = getNamedHostsByAddress(data.hosts, data.scan);
+    if (namedHosts.size === 0) {
+        return [];
+    }
+    const eligible = [];
+    const seenDeviceIds = new Set();
+    for (const row of data.devices) {
+        if (!row || typeof row !== "object") {
+            continue;
+        }
+        const deviceId = trimmedString(row.deviceId);
+        // One plan per device, however many times a caller's reads returned it.
+        if (!deviceId || seenDeviceIds.has(deviceId)) {
+            continue;
+        }
+        // (a) The scan's project, and only the scan's project.
+        if (trimmedString(row.projectId) !== projectId) {
+            continue;
+        }
+        // (b) An address this result reports — and reports a name for, see (e).
+        const hostname = trimmedString(row.hostname);
+        const host = hostname
+            ? namedHosts.get(hostname)
+            : undefined;
+        if (!host) {
+            continue;
+        }
+        // (c) Still named by that bare address.
+        const name = trimmedString(row.name);
+        if (!name || name.toLowerCase() !== hostname.toLowerCase()) {
+            continue;
+        }
+        /*
+         * (d) Created during this run. Equal counts at both ends: the claim stamps
+         * startedAt and the final upload stamps completedAt, and a device created
+         * in the same millisecond as either is still this run's.
+         */
+        const createdAt = toEpochMilliseconds(row.createdAt);
+        if (createdAt === undefined ||
+            createdAt < runStartedAt ||
+            createdAt > runCompletedAt) {
+            continue;
+        }
+        seenDeviceIds.add(deviceId);
+        eligible.push({
+            row: row,
+            host: host,
+            hostname: hostname,
+            name: name,
+            createdAt: createdAt,
+        });
+    }
+    eligible.sort((left, right) => {
+        if (left.createdAt !== right.createdAt) {
+            return left.createdAt - right.createdAt;
+        }
+        if (left.hostname !== right.hostname) {
+            return left.hostname < right.hostname ? -1 : 1;
+        }
+        return left.row.deviceId < right.row.deviceId ? -1 : 1;
+    });
+    return eligible.map((entry) => {
+        /*
+         * The same two names, from the same builder, that the import itself
+         * would have tried — so a renamed device is indistinguishable from one
+         * imported after the name was known, short-name choice included.
+         */
+        const candidateNames = [];
+        for (const candidate of [
+            buildDeviceName(entry.host, data.scan),
+            buildFallbackDeviceName(entry.host, data.scan),
+        ]) {
+            const trimmed = candidate.trim();
+            if (!trimmed || trimmed.toLowerCase() === entry.name.toLowerCase()) {
+                continue;
+            }
+            const alreadyListed = candidateNames.some((listed) => {
+                return listed.toLowerCase() === trimmed.toLowerCase();
+            });
+            if (!alreadyListed) {
+                candidateNames.push(trimmed);
+            }
+        }
+        const plan = {
+            deviceId: trimmedString(entry.row.deviceId),
+            hostname: entry.hostname,
+            fromName: entry.name,
+            candidateNames: candidateNames,
+        };
+        /*
+         * Filled only, never overwritten: a device that already has a DNS name
+         * got it from a PTR record (or from an operator), and a later answer is
+         * not a reason to replace it. The rename happens either way.
+         */
+        if (!trimmedString(entry.row.dnsName)) {
+            const dnsName = normalizeReverseDnsName(entry.host.dnsHostname);
+            if (dnsName) {
+                plan.dnsName =
+                    dnsName.length > MAX_DEVICE_DNS_NAME_LENGTH
+                        ? dnsName.substring(0, MAX_DEVICE_DNS_NAME_LENGTH)
+                        : dnsName;
+            }
+        }
+        return plan;
+    });
+}
+//# sourceMappingURL=RunImportedDeviceNaming.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"RunImportedDeviceNaming.js","sourceRoot":"","sources":["../../../../Utils/NetworkDiscovery/RunImportedDeviceNaming.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,0BAA0B,EAC1B,eAAe,EACf,uBAAuB,GACxB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AAChE,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAE/D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgEG;AAEH;;;;GAIG;AACH,MAAM,CAAC,MAAM,kCAAkC,GAAW,GAAG,CAAC;AAuC9D;;;;GAIG;AACH,MAAM,UAAU,mBAAmB,CAAC,KAAc;IAChD,IAAI,KAAK,YAAY,IAAI,EAAE,CAAC;QAC1B,MAAM,IAAI,GAAW,KAAK,CAAC,OAAO,EAAE,CAAC;QACrC,OAAO,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC;IAC/C,CAAC;IAED,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC;QAC9C,MAAM,IAAI,GAAW,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC;QACtD,OAAO,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC;IAC/C,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,aAAa,CAAC,KAAc;IACnC,OAAO,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;AACvD,CAAC;AAED;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,sBAAsB,CACpC,KAAc,EACd,IAA0B;IAE1B,MAAM,UAAU,GAAyC,IAAI,GAAG,EAG7D,CAAC;IAEJ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QAC1B,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,MAAM,UAAU,GAAmC,wBAAwB,CACzE,KAAuC,CACxC,CAAC;IAEF,KAAK,MAAM,IAAI,IAAI,UAAU,EAAE,CAAC;QAC9B,MAAM,OAAO,GAAW,IAAI,CAAC,SAAS,CAAC;QAEvC,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,MAAM,GAAG,kCAAkC,EAAE,CAAC;YACpE,SAAS;QACX,CAAC;QAED,IAAI,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;YAC5B,SAAS;QACX,CAAC;QAED,sEAAsE;QACtE,MAAM,IAAI,GAAW,eAAe,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC;QAExD,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,WAAW,EAAE,KAAK,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC;YAC1D,SAAS;QACX,CAAC;QAED,UAAU,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAChC,CAAC;IAED,OAAO,UAAU,CAAC;AACpB,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,4BAA4B,CAAC,IAO5C;IACC,mEAAmE;IACnE,MAAM,YAAY,GAAuB,mBAAmB,CAC1D,IAAI,CAAC,YAAY,CAClB,CAAC;IAEF,MAAM,cAAc,GAAuB,mBAAmB,CAC5D,IAAI,CAAC,cAAc,CACpB,CAAC;IAEF,MAAM,SAAS,GAAW,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAExD,IACE,YAAY,KAAK,SAAS;QAC1B,cAAc,KAAK,SAAS;QAC5B,CAAC,SAAS,EACV,CAAC;QACD,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM,UAAU,GACd,sBAAsB,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;IAEhD,IAAI,UAAU,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;QAC1B,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM,QAAQ,GAMT,EAAE,CAAC;IAER,MAAM,aAAa,GAAgB,IAAI,GAAG,EAAU,CAAC;IAErD,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;QAC/B,IAAI,CAAC,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;YACpC,SAAS;QACX,CAAC;QAED,MAAM,QAAQ,GAAW,aAAa,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAErD,wEAAwE;QACxE,IAAI,CAAC,QAAQ,IAAI,aAAa,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC7C,SAAS;QACX,CAAC;QAED,uDAAuD;QACvD,IAAI,aAAa,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,SAAS,EAAE,CAAC;YAC/C,SAAS;QACX,CAAC;QAED,wEAAwE;QACxE,MAAM,QAAQ,GAAW,aAAa,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACrD,MAAM,IAAI,GAAwC,QAAQ;YACxD,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC;YAC1B,CAAC,CAAC,SAAS,CAAC;QAEd,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,SAAS;QACX,CAAC;QAED,wCAAwC;QACxC,MAAM,IAAI,GAAW,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAE7C,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,WAAW,EAAE,KAAK,QAAQ,CAAC,WAAW,EAAE,EAAE,CAAC;YAC3D,SAAS;QACX,CAAC;QAED;;;;WAIG;QACH,MAAM,SAAS,GAAuB,mBAAmB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAEzE,IACE,SAAS,KAAK,SAAS;YACvB,SAAS,GAAG,YAAY;YACxB,SAAS,GAAG,cAAc,EAC1B,CAAC;YACD,SAAS;QACX,CAAC;QAED,aAAa,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC5B,QAAQ,CAAC,IAAI,CAAC;YACZ,GAAG,EAAE,GAAG;YACR,IAAI,EAAE,IAAI;YACV,QAAQ,EAAE,QAAQ;YAClB,IAAI,EAAE,IAAI;YACV,SAAS,EAAE,SAAS;SACrB,CAAC,CAAC;IACL,CAAC;IAED,QAAQ,CAAC,IAAI,CACX,CACE,IAAwE,EACxE,KAAyE,EACjE,EAAE;QACV,IAAI,IAAI,CAAC,SAAS,KAAK,KAAK,CAAC,SAAS,EAAE,CAAC;YACvC,OAAO,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC,SAAS,CAAC;QAC1C,CAAC;QAED,IAAI,IAAI,CAAC,QAAQ,KAAK,KAAK,CAAC,QAAQ,EAAE,CAAC;YACrC,OAAO,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACjD,CAAC;QAED,OAAO,IAAI,CAAC,GAAG,CAAC,QAAQ,GAAG,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACzD,CAAC,CACF,CAAC;IAEF,OAAO,QAAQ,CAAC,GAAG,CACjB,CAAC,KAKA,EAA2B,EAAE;QAC5B;;;;WAIG;QACH,MAAM,cAAc,GAAkB,EAAE,CAAC;QAEzC,KAAK,MAAM,SAAS,IAAI;YACtB,eAAe,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC;YACtC,uBAAuB,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC;SAC/C,EAAE,CAAC;YACF,MAAM,OAAO,GAAW,SAAS,CAAC,IAAI,EAAE,CAAC;YAEzC,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,WAAW,EAAE,KAAK,KAAK,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;gBACnE,SAAS;YACX,CAAC;YAED,MAAM,aAAa,GAAY,cAAc,CAAC,IAAI,CAChD,CAAC,MAAc,EAAW,EAAE;gBAC1B,OAAO,MAAM,CAAC,WAAW,EAAE,KAAK,OAAO,CAAC,WAAW,EAAE,CAAC;YACxD,CAAC,CACF,CAAC;YAEF,IAAI,CAAC,aAAa,EAAE,CAAC;gBACnB,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC/B,CAAC;QACH,CAAC;QAED,MAAM,IAAI,GAA4B;YACpC,QAAQ,EAAE,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC;YAC3C,QAAQ,EAAE,KAAK,CAAC,QAAQ;YACxB,QAAQ,EAAE,KAAK,CAAC,IAAI;YACpB,cAAc,EAAE,cAAc;SAC/B,CAAC;QAEF;;;;WAIG;QACH,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;YACtC,MAAM,OAAO,GAAuB,uBAAuB,CACzD,KAAK,CAAC,IAAI,CAAC,WAAW,CACvB,CAAC;YAEF,IAAI,OAAO,EAAE,CAAC;gBACZ,IAAI,CAAC,OAAO;oBACV,OAAO,CAAC,MAAM,GAAG,0BAA0B;wBACzC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,0BAA0B,CAAC;wBAClD,CAAC,CAAC,OAAO,CAAC;YAChB,CAAC;QACH,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC,CACF,CAAC;AACJ,CAAC"}

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

@@ -0,0 +1,184 @@
+import { MAX_DEVICE_NAME_LENGTH } from "./DiscoveredDeviceBuilder";
+import { normalizeReverseDnsName } from "./ReverseDnsNameUtil";
+import { getShortHostname } from "./ShortHostnameUtil";
+export const SKIPPED_NO_NAME_MESSAGE = "Skipped: the device has no name to shorten.";
+export const SKIPPED_NOT_FULLY_QUALIFIED_MESSAGE = "Skipped: the name is not a fully qualified hostname, so there is no domain to remove.";
+/*
+ * The collision-fallback suffix import appends — " (10.0.0.5)" — split off
+ * the name so a device imported as "kds01.wbhq.com (10.0.0.5)" can still be
+ * shortened.
+ *
+ * Only when the bracketed text is exactly the device's own hostname. That is
+ * the one shape DiscoveredDeviceBuilder.buildFallbackDeviceName produces, and
+ * anything else in brackets — "core-sw (rack 4)", an old address after the
+ * device was re-addressed — is an operator's text that this action has no
+ * business reinterpreting.
+ */
+export function splitAddressSuffix(data) {
+    const hostname = typeof data.hostname === "string" ? data.hostname.trim() : "";
+    if (!hostname) {
+        return { baseName: data.name };
+    }
+    const suffix = ` (${hostname})`;
+    if (data.name.length > suffix.length && data.name.endsWith(suffix)) {
+        return {
+            baseName: data.name.substring(0, data.name.length - suffix.length),
+            addressSuffix: suffix,
+        };
+    }
+    return { baseName: data.name };
+}
+function truncate(value, maxLength) {
+    return value.length > maxLength ? value.substring(0, maxLength) : value;
+}
+/**
+ * The plan for one device, on its own — no knowledge of the rest of the
+ * selection. `planShortDeviceNames` adds that.
+ */
+export function planShortDeviceName(device) {
+    const currentName = typeof device.name === "string" ? device.name.trim() : "";
+    if (!currentName) {
+        return {
+            kind: "skip",
+            id: device.id,
+            currentName: currentName,
+            reason: SKIPPED_NO_NAME_MESSAGE,
+        };
+    }
+    const split = splitAddressSuffix({ name: currentName, hostname: device.hostname });
+    const shortName = getShortHostname(split.baseName);
+    if (!shortName) {
+        return {
+            kind: "skip",
+            id: device.id,
+            currentName: currentName,
+            reason: SKIPPED_NOT_FULLY_QUALIFIED_MESSAGE,
+        };
+    }
+    /*
+     * A suffixed name keeps its suffix: it was address-qualified because the
+     * plain name was already taken, and the short name is even more likely to
+     * be. The short part is clamped so the whole still fits the import ceiling.
+     */
+    const suffix = split.addressSuffix || "";
+    const newName = truncate(truncate(shortName, Math.max(1, MAX_DEVICE_NAME_LENGTH - suffix.length)) +
+        suffix, MAX_DEVICE_NAME_LENGTH);
+    const plan = {
+        kind: "rename",
+        id: device.id,
+        currentName: currentName,
+        newName: newName,
+    };
+    const dnsName = getDnsNameToKeep({
+        device: device,
+        currentName: currentName,
+        baseName: split.baseName,
+    });
+    if (dnsName) {
+        plan.dnsName = dnsName;
+    }
+    return plan;
+}
+/*
+ * Whether the full name being cut away should be kept as the device's DNS
+ * name — so the action does not destroy the one copy of the FQDN, which is
+ * what the issue's follow-up comment asked for, and so a site rule matching
+ * that FQDN still sees it afterwards.
+ *
+ * Every condition below guards a way the old name might NOT be a DNS name, or
+ * might not be whole:
+ *
+ *   - The device already has a DNS name. That one came from a PTR record, and
+ *     it is never overwritten with an inference.
+ *   - The name equals the device's sysName. Then it is the name the device
+ *     calls itself, it is still stored as sysName, and nothing is lost.
+ *   - The name is at the import ceiling. DiscoveredDeviceBuilder clamps names
+ *     to MAX_DEVICE_NAME_LENGTH, so a name that long may be a cut-off FQDN,
+ *     and storing half a name as a DNS name would be inventing one. The rename
+ *     still happens — a first label is at most 63 characters, so it survives
+ *     any clamp intact.
+ *
+ * What is left over is a hand-typed FQDN-shaped name, which is stored as a DNS
+ * name too. That is judged acceptable: it is a DNS-shaped name the operator
+ * chose, and the column's description says where its value may come from.
+ */
+function getDnsNameToKeep(data) {
+    const existingDnsName = typeof data.device.dnsName === "string" ? data.device.dnsName.trim() : "";
+    if (existingDnsName) {
+        return undefined;
+    }
+    const sysName = typeof data.device.sysName === "string"
+        ? data.device.sysName.trim().toLowerCase()
+        : "";
+    if (sysName && sysName === data.baseName.trim().toLowerCase()) {
+        return undefined;
+    }
+    if (data.currentName.length >= MAX_DEVICE_NAME_LENGTH) {
+        return undefined;
+    }
+    return normalizeReverseDnsName(data.baseName);
+}
+export function buildInBatchCollisionMessage(data) {
+    const listed = data.otherNames
+        .slice(0, 3)
+        .map((name) => {
+        return `"${name}"`;
+    })
+        .join(", ");
+    const more = data.otherNames.length - 3;
+    return `Skipped: ${listed}${more > 0 ? ` and ${more} more` : ""} would also be renamed "${data.newName}", and two devices cannot share a name. Rename them individually.`;
+}
+/**
+ * The plan for a whole selection.
+ *
+ * On top of the per-device rules, two selected devices that would end up with
+ * the SAME short name — "kds01.store-1.example.com" and
+ * "kds01.store-2.example.com" — are BOTH skipped, each naming the other.
+ * Renaming the first and refusing the second would make the outcome depend on
+ * the order the table happened to be sorted in, and the device that kept its
+ * long name would be an accident. Compared without case, because device name
+ * uniqueness is case-insensitive.
+ *
+ * Collisions with devices OUTSIDE the selection are not visible here; the
+ * action checks those against the server, device by device.
+ */
+export function planShortDeviceNames(devices) {
+    const plans = devices.map((device) => {
+        return planShortDeviceName(device);
+    });
+    const renamesByName = new Map();
+    for (const plan of plans) {
+        if (plan.kind !== "rename") {
+            continue;
+        }
+        const key = plan.newName.toLowerCase();
+        const group = renamesByName.get(key) || [];
+        group.push(plan);
+        renamesByName.set(key, group);
+    }
+    return plans.map((plan) => {
+        if (plan.kind !== "rename") {
+            return plan;
+        }
+        const group = renamesByName.get(plan.newName.toLowerCase()) || [];
+        if (group.length < 2) {
+            return plan;
+        }
+        return {
+            kind: "skip",
+            id: plan.id,
+            currentName: plan.currentName,
+            reason: buildInBatchCollisionMessage({
+                newName: plan.newName,
+                otherNames: group
+                    .filter((other) => {
+                    return other !== plan;
+                })
+                    .map((other) => {
+                    return other.currentName;
+                }),
+            }),
+        };
+    });
+}
+//# sourceMappingURL=ShortDeviceNamePlanner.js.map

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

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

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

@@ -0,0 +1,79 @@
+import { normalizeReverseDnsName } from "./ReverseDnsNameUtil";
+/*
+ * The short form of a fully qualified hostname: "wb-0660-kds01.wbhq.com"
+ * becomes "wb-0660-kds01" (OneUptime issue #3678).
+ *
+ * Reverse DNS names a discovered host by its FQDN, and on an estate with one
+ * corporate domain that suffix is the same on every device in the list — it
+ * is noise, and it pushes the part an operator recognises to the far left of
+ * a truncated column. This is the one rule every piece of the short-name
+ * feature shares: the scan setting that names new imports, the Review dialog
+ * that previews them, and the bulk action that fixes devices imported before
+ * the setting existed. One function, so the three cannot disagree about what
+ * "short" means.
+ *
+ * WHY THE FIRST LABEL, AND NOT A SUFFIX THE OPERATOR TYPES. The issue asked
+ * for a configurable suffix (".wbhq.com"). A suffix list is strictly more
+ * work for the same answer on the reporter's estate, and it fails silently:
+ * a typo, a missing leading dot, or a second domain nobody listed leaves
+ * names unchanged with nothing to say why. The first label needs no
+ * configuration and behaves the same on every domain. The cost is on estates
+ * that put meaning in a middle label ("web.prod.example.com" and
+ * "web.stage.example.com" both become "web"), which is why the scan setting
+ * is opt-in and why import still falls back to an address-qualified name
+ * when a short name is already taken.
+ */
+/*
+ * A top-level label is letters (or an IDNA "xn--" label). Checked so that a
+ * dotted string which merely PASSES as a DNS name is not mistaken for one:
+ * "ubuntu-22.04" is a legal label sequence and a common sysName, and cutting
+ * it at the dot would rename a device "ubuntu-22".
+ */
+const TOP_LEVEL_LABEL_PATTERN = /^(?:[A-Za-z]+|[Xx][Nn]--[A-Za-z0-9-]+)$/;
+/*
+ * The short name has to NAME something. A first label with no letter in it —
+ * "10-18-167-31.dhcp.corp.com", "51.corp.example" — is an address spelled
+ * with dashes, and shortening it would present an address as though it were
+ * a hostname.
+ */
+const HAS_LETTER_PATTERN = /[A-Za-z]/;
+/**
+ * The first label of `value` when it is a fully qualified hostname worth
+ * shortening, or undefined when it is not.
+ *
+ * Undefined — rather than the value unchanged — so a caller can tell "this is
+ * already as short as it gets" from "this was shortened", which the bulk
+ * action needs in order to skip a device honestly rather than rewrite it with
+ * its own name.
+ *
+ * Accepts `unknown` for the same reason normalizeReverseDnsName does: names
+ * reach here out of jsonb and out of API rows, and a number or null must
+ * return undefined rather than throw inside a render. Case is preserved.
+ */
+export function getShortHostname(value) {
+    /*
+     * The full reverse-DNS rules first. A name with a space, markup, a
+     * control character, an in-addr.arpa echo, or nothing but digits is not a
+     * hostname, so it has no "short form" either — "Core Switch 1.5" stays
+     * exactly as it is.
+     */
+    const normalized = normalizeReverseDnsName(value);
+    if (!normalized) {
+        return undefined;
+    }
+    const labels = normalized.split(".");
+    if (labels.length < 2) {
+        return undefined;
+    }
+    const topLevelLabel = labels[labels.length - 1];
+    const firstLabel = labels[0];
+    if (!TOP_LEVEL_LABEL_PATTERN.test(topLevelLabel)) {
+        return undefined;
+    }
+    if (!HAS_LETTER_PATTERN.test(firstLabel)) {
+        return undefined;
+    }
+    return firstLabel;
+}
+export default getShortHostname;
+//# sourceMappingURL=ShortHostnameUtil.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"ShortHostnameUtil.js","sourceRoot":"","sources":["../../../../Utils/NetworkDiscovery/ShortHostnameUtil.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAE/D;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH;;;;;GAKG;AACH,MAAM,uBAAuB,GAC3B,yCAAyC,CAAC;AAE5C;;;;;GAKG;AACH,MAAM,kBAAkB,GAAW,UAAU,CAAC;AAE9C;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,gBAAgB,CAAC,KAAc;IAC7C;;;;;OAKG;IACH,MAAM,UAAU,GAAuB,uBAAuB,CAAC,KAAK,CAAC,CAAC;IAEtE,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,MAAM,GAAkB,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAEpD,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACtB,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,aAAa,GAAW,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAE,CAAC;IACzD,MAAM,UAAU,GAAW,MAAM,CAAC,CAAC,CAAE,CAAC;IAEtC,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC;QACjD,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;QACzC,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,eAAe,gBAAgB,CAAC"}

package/build/dist/Utils/NetworkSite/CidrMatchUtil.js

@@ -130,8 +130,8 @@ export class CidrMatchUtil {
     /*
      * True when the rule's populated criteria all match the target. A CIDR
      * criterion matches the target's ip; a hostname pattern matches the
-     * hostname, the SNMP sysName, or the device's display name — see
-     * RuleMatchTarget. A rule with no criteria never matches.
+     * hostname, the SNMP sysName, the device's display name, or its DNS name —
+     * see RuleMatchTarget. A rule with no criteria never matches.
      */
     static ruleMatches(rule, target) {
         if (rule.criteria !== undefined && rule.criteria !== null) {
@@ -157,11 +157,7 @@ export class CidrMatchUtil {
             }
         }
         if (hasPattern) {
-            const candidates = [
-                target.hostname,
-                target.sysName,
-                target.name,
-            ];
+            const candidates = CidrMatchUtil.getNameCandidates(target);
             const matchesAnyName = candidates.some((candidate) => {
                 return Boolean(candidate &&
                     CidrMatchUtil.hostnameMatchesWildcard(candidate, rule.hostnamePattern));
@@ -172,6 +168,16 @@ export class CidrMatchUtil {
         }
         return true;
     }
+    /*
+     * The name-ish attributes a hostname pattern is tried against, in one place
+     * so the legacy column path and the criteria path can never disagree about
+     * which names count: a device that matched a rule stored as a plain
+     * `hostnamePattern` column must match the same pattern once the rule is
+     * re-saved as criteria. See RuleMatchTarget for why each attribute is here.
+     */
+    static getNameCandidates(target) {
+        return [target.hostname, target.sysName, target.name, target.dnsName];
+    }
     static matchesConfiguredFilter(filter, target) {
         const expected = String(filter.value);
         if (filter.field === "subnetCidr") {
@@ -187,11 +193,14 @@ export class CidrMatchUtil {
         if (filter.field !== "hostnamePattern") {
             return false;
         }
-        const candidates = [
-            target.hostname,
-            target.sysName,
-            target.name,
-        ].filter((candidate) => {
+        /*
+         * Every operator below is phrased over the same candidate list, and the
+         * negated ones mean "NO candidate matches" rather than "some candidate
+         * does not match". That is what keeps adding `dnsName` safe: a device
+         * whose FQDN contains "printer" is still excluded by a DoesNotContain
+         * "printer" rule after it is renamed to its short hostname.
+         */
+        const candidates = CidrMatchUtil.getNameCandidates(target).filter((candidate) => {
             return typeof candidate === "string";
         });
         const expectedLower = expected.toLocaleLowerCase();

package/build/dist/Utils/NetworkSite/CidrMatchUtil.js.map

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