@fedify/webfinger 2.4.0-dev.2155 → 2.4.0-dev.2157

package/deno.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/webfinger",
-  "version": "2.4.0-dev.2155+2ccc5085",
+  "version": "2.4.0-dev.2157+b76e5888",
   "license": "MIT",
   "exports": {
     ".": "./src/mod.ts"

package/dist/lookup.test.cjs

@@ -22,10 +22,12 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 }) : target, mod));
 //#endregion
 let _fedify_fixture = require("@fedify/fixture");
-let es_toolkit = require("es-toolkit");
-let node_assert_strict = require("node:assert/strict");
 let _fedify_vocab_runtime = require("@fedify/vocab-runtime");
 let _logtape_logtape = require("@logtape/logtape");
+let es_toolkit = require("es-toolkit");
+let node_assert_strict = require("node:assert/strict");
+let node_dns_promises = require("node:dns/promises");
+node_dns_promises = __toESM(node_dns_promises, 1);
 let _opentelemetry_api = require("@opentelemetry/api");
 //#endregion
 //#region ../../node_modules/.pnpm/regexparam@3.0.0/node_modules/regexparam/dist/index.mjs
@@ -1235,7 +1237,7 @@ var esm_default = new class FetchMock {
 //#endregion
 //#region deno.json
 var name = "@fedify/webfinger";
-var version = "2.4.0-dev.2155+2ccc5085";
+var version = "2.4.0-dev.2157+b76e5888";
 //#endregion
 //#region src/body.ts
 /** Decoded JSON body limit: 16 MiB.  @internal */
@@ -1454,7 +1456,11 @@ async function lookupWebFingerInternal(resource, options = {}) {
 			await (0, _fedify_vocab_runtime.validatePublicUrl)(url.href);
 		} catch (e) {
 			if (e instanceof _fedify_vocab_runtime.UrlError) {
-				logger.error("Invalid URL for WebFinger resource descriptor: {error}", { error: e });
+				if (e.reason === "dns") logger.debug("DNS lookup failed for {url}", {
+					url: url.href,
+					error: e
+				});
+				else logger.error("Invalid URL for WebFinger resource descriptor: {error}", { error: e });
 				return {
 					resource: null,
 					result: "network_error",
@@ -1996,4 +2002,42 @@ async function lookupWebFingerInternal(resource, options = {}) {
 		esm_default.hardReset();
 	}
 });
+(0, _fedify_fixture.test)("lookupWebFinger() logs DNS failures as such", async (t) => {
+	if ("Deno" in globalThis && (await Deno.permissions.query({ name: "net" })).state !== "granted") return;
+	for (const result of [
+		"throws",
+		"empty",
+		"private"
+	]) await t.step(result, async () => {
+		const originalLookup = node_dns_promises.default.lookup;
+		node_dns_promises.default.lookup = (() => result === "throws" ? Promise.reject(/* @__PURE__ */ new Error("Resolver unavailable")) : Promise.resolve(result === "empty" ? [] : [{
+			address: "127.0.0.1",
+			family: 4
+		}]));
+		const records = [];
+		await (0, _logtape_logtape.configure)({
+			sinks: { buffer: (record) => records.push(record) },
+			loggers: [{
+				category: "fedify",
+				sinks: ["buffer"],
+				lowestLevel: "debug"
+			}, {
+				category: ["logtape", "meta"],
+				sinks: []
+			}],
+			reset: true
+		});
+		try {
+			(0, node_assert_strict.deepStrictEqual)(await lookupWebFinger("acct:alice@dns-failure.invalid"), null);
+			const failures = records.filter((r) => r.rawMessage !== "Fetching WebFinger resource descriptor from {url}...");
+			(0, node_assert_strict.deepStrictEqual)(failures.map((r) => [r.level, r.rawMessage]), [result === "private" ? ["error", "Invalid URL for WebFinger resource descriptor: {error}"] : ["debug", "DNS lookup failed for {url}"]]);
+			const { error } = failures[0].properties;
+			(0, node_assert_strict.ok)(error instanceof _fedify_vocab_runtime.UrlError);
+			(0, node_assert_strict.deepStrictEqual)(error.reason, result === "private" ? "disallowed" : "dns");
+		} finally {
+			await (0, _logtape_logtape.reset)();
+			node_dns_promises.default.lookup = originalLookup;
+		}
+	});
+});
 //#endregion

package/dist/lookup.test.js

@@ -1,8 +1,9 @@
 import { createTestMeterProvider, test } from "@fedify/fixture";
+import { FetchError, UrlError, getUserAgent, validatePublicUrl } from "@fedify/vocab-runtime";
+import { configure, getLogger, reset } from "@logtape/logtape";
 import { withTimeout } from "es-toolkit";
 import { deepStrictEqual, ok } from "node:assert/strict";
-import { FetchError, UrlError, getUserAgent, validatePublicUrl } from "@fedify/vocab-runtime";
-import { getLogger } from "@logtape/logtape";
+import dns from "node:dns/promises";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
 //#region \0rolldown/runtime.js
 var __create = Object.create;
@@ -1234,7 +1235,7 @@ var esm_default = new class FetchMock {
 //#endregion
 //#region deno.json
 var name = "@fedify/webfinger";
-var version = "2.4.0-dev.2155+2ccc5085";
+var version = "2.4.0-dev.2157+b76e5888";
 //#endregion
 //#region src/body.ts
 /** Decoded JSON body limit: 16 MiB.  @internal */
@@ -1453,7 +1454,11 @@ async function lookupWebFingerInternal(resource, options = {}) {
 			await validatePublicUrl(url.href);
 		} catch (e) {
 			if (e instanceof UrlError) {
-				logger.error("Invalid URL for WebFinger resource descriptor: {error}", { error: e });
+				if (e.reason === "dns") logger.debug("DNS lookup failed for {url}", {
+					url: url.href,
+					error: e
+				});
+				else logger.error("Invalid URL for WebFinger resource descriptor: {error}", { error: e });
 				return {
 					resource: null,
 					result: "network_error",
@@ -1995,5 +2000,43 @@ test("lookupWebFinger() bounds resource descriptors", async () => {
 		esm_default.hardReset();
 	}
 });
+test("lookupWebFinger() logs DNS failures as such", async (t) => {
+	if ("Deno" in globalThis && (await Deno.permissions.query({ name: "net" })).state !== "granted") return;
+	for (const result of [
+		"throws",
+		"empty",
+		"private"
+	]) await t.step(result, async () => {
+		const originalLookup = dns.lookup;
+		dns.lookup = (() => result === "throws" ? Promise.reject(/* @__PURE__ */ new Error("Resolver unavailable")) : Promise.resolve(result === "empty" ? [] : [{
+			address: "127.0.0.1",
+			family: 4
+		}]));
+		const records = [];
+		await configure({
+			sinks: { buffer: (record) => records.push(record) },
+			loggers: [{
+				category: "fedify",
+				sinks: ["buffer"],
+				lowestLevel: "debug"
+			}, {
+				category: ["logtape", "meta"],
+				sinks: []
+			}],
+			reset: true
+		});
+		try {
+			deepStrictEqual(await lookupWebFinger("acct:alice@dns-failure.invalid"), null);
+			const failures = records.filter((r) => r.rawMessage !== "Fetching WebFinger resource descriptor from {url}...");
+			deepStrictEqual(failures.map((r) => [r.level, r.rawMessage]), [result === "private" ? ["error", "Invalid URL for WebFinger resource descriptor: {error}"] : ["debug", "DNS lookup failed for {url}"]]);
+			const { error } = failures[0].properties;
+			ok(error instanceof UrlError);
+			deepStrictEqual(error.reason, result === "private" ? "disallowed" : "dns");
+		} finally {
+			await reset();
+			dns.lookup = originalLookup;
+		}
+	});
+});
 //#endregion
 export {};

package/dist/mod.cjs

@@ -4,7 +4,7 @@ let _logtape_logtape = require("@logtape/logtape");
 let _opentelemetry_api = require("@opentelemetry/api");
 //#region deno.json
 var name = "@fedify/webfinger";
-var version = "2.4.0-dev.2155+2ccc5085";
+var version = "2.4.0-dev.2157+b76e5888";
 //#endregion
 //#region src/body.ts
 /** Decoded JSON body limit: 16 MiB.  @internal */
@@ -223,7 +223,11 @@ async function lookupWebFingerInternal(resource, options = {}) {
 			await (0, _fedify_vocab_runtime.validatePublicUrl)(url.href);
 		} catch (e) {
 			if (e instanceof _fedify_vocab_runtime.UrlError) {
-				logger.error("Invalid URL for WebFinger resource descriptor: {error}", { error: e });
+				if (e.reason === "dns") logger.debug("DNS lookup failed for {url}", {
+					url: url.href,
+					error: e
+				});
+				else logger.error("Invalid URL for WebFinger resource descriptor: {error}", { error: e });
 				return {
 					resource: null,
 					result: "network_error",

package/dist/mod.js

@@ -3,7 +3,7 @@ import { getLogger } from "@logtape/logtape";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
 //#region deno.json
 var name = "@fedify/webfinger";
-var version = "2.4.0-dev.2155+2ccc5085";
+var version = "2.4.0-dev.2157+b76e5888";
 //#endregion
 //#region src/body.ts
 /** Decoded JSON body limit: 16 MiB.  @internal */
@@ -222,7 +222,11 @@ async function lookupWebFingerInternal(resource, options = {}) {
 			await validatePublicUrl(url.href);
 		} catch (e) {
 			if (e instanceof UrlError) {
-				logger.error("Invalid URL for WebFinger resource descriptor: {error}", { error: e });
+				if (e.reason === "dns") logger.debug("DNS lookup failed for {url}", {
+					url: url.href,
+					error: e
+				});
+				else logger.error("Invalid URL for WebFinger resource descriptor: {error}", { error: e });
 				return {
 					resource: null,
 					result: "network_error",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/webfinger",
-  "version": "2.4.0-dev.2155+2ccc5085",
+  "version": "2.4.0-dev.2157+b76e5888",
   "homepage": "https://fedify.dev/",
   "repository": {
     "type": "git",
@@ -57,7 +57,7 @@
     "@logtape/logtape": "^2.2.0",
     "@opentelemetry/api": "^1.9.1",
     "es-toolkit": "1.46.1",
-    "@fedify/vocab-runtime": "2.4.0-dev.2155+2ccc5085"
+    "@fedify/vocab-runtime": "2.4.0-dev.2157+b76e5888"
   },
   "scripts": {
     "build:self": "tsdown",

package/src/lookup.test.ts

@@ -1,7 +1,10 @@
 import { createTestMeterProvider, test } from "@fedify/fixture";
+import { UrlError } from "@fedify/vocab-runtime";
+import { configure, type LogRecord, reset } from "@logtape/logtape";
 import { withTimeout } from "es-toolkit";
 import fetchMock from "fetch-mock";
 import { deepStrictEqual, ok } from "node:assert/strict";
+import dns from "node:dns/promises";
 import type { ResourceDescriptor } from "./jrd.ts";
 import { lookupWebFinger } from "./lookup.ts";
 
@@ -922,3 +925,67 @@ test("lookupWebFinger() bounds resource descriptors", async () => {
     fetchMock.hardReset();
   }
 });
+
+test("lookupWebFinger() logs DNS failures as such", async (t) => {
+  // The validator skips DNS when Deno has no network permission.  Checked
+  // here rather than with top-level await, which the CommonJS build rejects.
+  if (
+    "Deno" in globalThis &&
+    (await Deno.permissions.query({ name: "net" })).state !== "granted"
+  ) return;
+  for (const result of ["throws", "empty", "private"] as const) {
+    await t.step(result, async () => {
+      // Stubbing works only because vocab-runtime's url.ts uses the default
+      // node:dns/promises import; see the FIXME there.
+      const originalLookup = dns.lookup;
+      dns.lookup = (() =>
+        result === "throws"
+          ? Promise.reject(new Error("Resolver unavailable"))
+          : Promise.resolve(
+            result === "empty" ? [] : [{ address: "127.0.0.1", family: 4 }],
+          )) as typeof dns.lookup;
+      const records: LogRecord[] = [];
+      await configure({
+        sinks: {
+          buffer: (record) =>
+            records.push(record),
+        },
+        loggers: [
+          { category: "fedify", sinks: ["buffer"], lowestLevel: "debug" },
+          { category: ["logtape", "meta"], sinks: [] },
+        ],
+        reset: true,
+      });
+      try {
+        deepStrictEqual(
+          await lookupWebFinger("acct:alice@dns-failure.invalid"),
+          null,
+        );
+        const failures = records.filter((r) =>
+          r.rawMessage !==
+            "Fetching WebFinger resource descriptor from {url}..."
+        );
+        deepStrictEqual(
+          failures.map((r) => [r.level, r.rawMessage]),
+          [
+            result === "private"
+              ? [
+                "error",
+                "Invalid URL for WebFinger resource descriptor: {error}",
+              ]
+              : ["debug", "DNS lookup failed for {url}"],
+          ],
+        );
+        const { error } = failures[0].properties;
+        ok(error instanceof UrlError);
+        deepStrictEqual(
+          error.reason,
+          result === "private" ? "disallowed" : "dns",
+        );
+      } finally {
+        await reset();
+        dns.lookup = originalLookup;
+      }
+    });
+  }
+});

package/src/lookup.ts

@@ -322,10 +322,17 @@ async function lookupWebFingerInternal(
         await validatePublicUrl(url.href);
       } catch (e) {
         if (e instanceof UrlError) {
-          logger.error(
-            "Invalid URL for WebFinger resource descriptor: {error}",
-            { error: e },
-          );
+          if (e.reason === "dns") {
+            logger.debug("DNS lookup failed for {url}", {
+              url: url.href,
+              error: e,
+            });
+          } else {
+            logger.error(
+              "Invalid URL for WebFinger resource descriptor: {error}",
+              { error: e },
+            );
+          }
           return { resource: null, result: "network_error", remoteHost };
         }
         throw e;