@thotischner/observability-mcp 3.6.1 → 3.8.0

package/dist/tools/enrich-ips.test.js

@@ -7,21 +7,21 @@ function parse(result) {
 }
 const ds = IpEnrichmentDataset.fromCsv(["1.2.3.0/24,US,Ashburn,AS14618,Example Cloud,true", "203.0.113.5,DE,Berlin,AS3320,Example ISP,false"].join("\n"));
 describe("enrichIpsHandler (R6, issue #415 Gap B)", () => {
-    it("returns a clear 'not configured' notice when no dataset is loaded", () => {
-        const out = parse(enrichIpsHandler(null, { ips: ["1.2.3.4"] }));
+    it("returns a clear 'not configured' notice when no dataset is loaded", async () => {
+        const out = parse(await enrichIpsHandler(null, { ips: ["1.2.3.4"] }));
         assert.match(out.error, /not configured/i);
         assert.match(out.error, /OMCP_IP_ENRICH_FILE/);
     });
-    it("rejects empty / missing ips", () => {
-        assert.match(parse(enrichIpsHandler(ds, { ips: [] })).error, /non-empty array/i);
-        assert.match(parse(enrichIpsHandler(ds, {})).error, /non-empty array/i);
+    it("rejects empty / missing ips", async () => {
+        assert.match(parse(await enrichIpsHandler(ds, { ips: [] })).error, /non-empty array/i);
+        assert.match(parse(await enrichIpsHandler(ds, {})).error, /non-empty array/i);
     });
-    it("rejects an over-large batch", () => {
+    it("rejects an over-large batch", async () => {
         const many = Array.from({ length: 1001 }, (_, i) => `1.2.3.${i % 255}`);
-        assert.match(parse(enrichIpsHandler(ds, { ips: many })).error, /Too many IPs/i);
+        assert.match(parse(await enrichIpsHandler(ds, { ips: many })).error, /Too many IPs/i);
     });
-    it("enriches known IPs and reports found=false for misses + invalid", () => {
-        const out = parse(enrichIpsHandler(ds, { ips: ["1.2.3.99", "8.8.8.8", "not-an-ip"] }));
+    it("enriches known IPs and reports found=false for misses + invalid", async () => {
+        const out = parse(await enrichIpsHandler(ds, { ips: ["1.2.3.99", "8.8.8.8", "not-an-ip"] }));
         assert.equal(out.results.length, 3);
         const matched = out.results.find((r) => r.ip === "1.2.3.99");
         assert.equal(matched.found, true);
@@ -35,9 +35,9 @@ describe("enrichIpsHandler (R6, issue #415 Gap B)", () => {
         assert.deepEqual(out.summary, { total: 3, matched: 1, unmatched: 1, invalid: 1 });
         assert.equal(out.datasetSize, 2);
     });
-    it("accepts IPv6 inputs and enriches them (not counted invalid)", () => {
+    it("accepts IPv6 inputs and enriches them (not counted invalid)", async () => {
         const ds6 = IpEnrichmentDataset.fromCsv(["2001:db8::/32,US,,AS14618,Example Cloud,true", "1.2.3.0/24,DE,Berlin,AS3320,Example ISP,false"].join("\n"));
-        const out = parse(enrichIpsHandler(ds6, { ips: ["2001:db8::1", "2606:4700::1", "1.2.3.9"] }));
+        const out = parse(await enrichIpsHandler(ds6, { ips: ["2001:db8::1", "2606:4700::1", "1.2.3.9"] }));
         const v6hit = out.results.find((r) => r.ip === "2001:db8::1");
         assert.equal(v6hit.found, true);
         assert.equal(v6hit.org, "Example Cloud");
@@ -47,3 +47,47 @@ describe("enrichIpsHandler (R6, issue #415 Gap B)", () => {
         assert.deepEqual(out.summary, { total: 3, matched: 2, unmatched: 1, invalid: 0 });
     });
 });
+describe("enrichIpsHandler — optional RDAP fallback (issue #477)", () => {
+    // Minimal RdapResolver stub: returns a fixed hit for one IP, null otherwise,
+    // and records which IPs it was asked about (to prove CSV-first).
+    function rdapStub(hit) {
+        const asked = [];
+        return {
+            asked,
+            resolver: { lookup: async (ip) => { asked.push(ip); return hit[ip] ?? null; } },
+        };
+    }
+    it("with no dataset but RDAP enabled → not 'not configured'; resolves via RDAP", async () => {
+        const { resolver } = rdapStub({ "8.8.8.8": { country: "US", org: "Google LLC" } });
+        const out = parse(await enrichIpsHandler(null, { ips: ["8.8.8.8", "203.0.113.9"] }, undefined, resolver));
+        const hit = out.results.find((r) => r.ip === "8.8.8.8");
+        assert.equal(hit.found, true);
+        assert.equal(hit.via, "rdap");
+        assert.equal(hit.org, "Google LLC");
+        assert.equal(out.results.find((r) => r.ip === "203.0.113.9").found, false);
+        assert.equal(out.summary.viaRdap, 1);
+        assert.equal(out.rdapEnabled, true);
+    });
+    it("offline dataset is PREFERRED — RDAP is not consulted for a covered IP", async () => {
+        const { asked, resolver } = rdapStub({ "1.2.3.9": { country: "XX", org: "should-not-be-used" } });
+        const out = parse(await enrichIpsHandler(ds, { ips: ["1.2.3.9"] }, undefined, resolver));
+        const hit = out.results.find((r) => r.ip === "1.2.3.9");
+        assert.equal(hit.via, "dataset");
+        assert.equal(hit.city, "Ashburn"); // from the CSV, not RDAP
+        assert.deepEqual(asked, [], "RDAP must not be queried for a dataset-covered IP");
+    });
+    it("RDAP fills only the gaps the dataset didn't cover", async () => {
+        const { asked, resolver } = rdapStub({ "9.9.9.9": { country: "US", org: "Quad9" } });
+        const out = parse(await enrichIpsHandler(ds, { ips: ["1.2.3.9", "9.9.9.9"] }, undefined, resolver));
+        assert.equal(out.results.find((r) => r.ip === "1.2.3.9").via, "dataset");
+        assert.equal(out.results.find((r) => r.ip === "9.9.9.9").via, "rdap");
+        assert.deepEqual(asked, ["9.9.9.9"], "RDAP queried only for the uncovered IP");
+        assert.equal(out.summary.matched, 2);
+        assert.equal(out.summary.viaRdap, 1);
+    });
+    it("no dataset and no RDAP → still 'not configured', and names both options", async () => {
+        const out = parse(await enrichIpsHandler(null, { ips: ["8.8.8.8"] }));
+        assert.match(out.error, /not configured/i);
+        assert.match(out.error, /OMCP_IP_ENRICH_RDAP/);
+    });
+});