@fedify/relay 2.2.7 → 2.2.9

package/dist/litepub.test.js

@@ -1,7 +1,7 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as exportSpki, r as getDocumentLoader, t as isRelayFollowerData } from "./types-BgQwXq2b.js";
+import { n as exportSpki, r as getDocumentLoader, t as isRelayFollowerData } from "./types-Ca7lcriL.js";
 import { MemoryKvStore, signRequest } from "@fedify/fedify";
 import { createRelay } from "@fedify/relay";
 import { Accept, Announce, Create, Delete, Follow, Move, Note, Person, Undo, Update } from "@fedify/vocab";

package/dist/mastodon.test.js

@@ -1,7 +1,7 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as exportSpki, r as getDocumentLoader, t as isRelayFollowerData } from "./types-BgQwXq2b.js";
+import { n as exportSpki, r as getDocumentLoader, t as isRelayFollowerData } from "./types-Ca7lcriL.js";
 import { MemoryKvStore, signRequest } from "@fedify/fedify";
 import { createRelay } from "@fedify/relay";
 import { Create, Delete, Follow, Move, Note, Person, Undo, Update } from "@fedify/vocab";

package/dist/{types-BgQwXq2b.js → types-Ca7lcriL.js}

@@ -21992,6 +21992,23 @@ var joinmastodon_default = { "@context": {
 		"@type": "@id"
 	}
 } };
+var miscellany_default = { "@context": {
+	"as": "https://www.w3.org/ns/activitystreams#",
+	"xsd": "http://www.w3.org/2001/XMLSchema#",
+	"Hashtag": "as:Hashtag",
+	"manuallyApprovesFollowers": {
+		"@id": "as:manuallyApprovesFollowers",
+		"@type": "xsd:boolean"
+	},
+	"movedTo": {
+		"@id": "as:movedTo",
+		"@type": "@id"
+	},
+	"sensitive": {
+		"@id": "as:sensitive",
+		"@type": "xsd:boolean"
+	}
+} };
 var schemaorg_default = { "@context": {
 	"type": "@type",
 	"id": "@id",
@@ -25576,10 +25593,11 @@ const preloadedContexts = {
 	"https://gotosocial.org/ns": gotosocial_default,
 	"https://w3id.org/fep/5711": fep_5711_default,
 	"https://join-lemmy.org/context.json": join_lemmy_default,
-	"http://joinmastodon.org/ns": joinmastodon_default
+	"http://joinmastodon.org/ns": joinmastodon_default,
+	"https://purl.archive.org/miscellany": miscellany_default
 };
 var name = "@fedify/vocab-runtime";
-var version = "2.2.7";
+var version = "2.2.9";
 const parametersNeedLowerCase = ["rel", "type"];
 const regexpLinkWhitespace = /[\n\r\s\t]/;
 function validateURI(uri) {
@@ -25828,8 +25846,8 @@ function logRequest(logger, request) {
 	});
 }
 var UrlError = class extends Error {
-	constructor(message) {
-		super(message);
+	constructor(message, options) {
+		super(message, options);
 		this.name = "UrlError";
 	}
 };
@@ -25857,10 +25875,37 @@ async function validatePublicUrl(url) {
 	let addresses;
 	try {
 		addresses = await lookup(hostname, { all: true });
-	} catch {
-		addresses = [];
+	} catch (error) {
+		throw new UrlError("DNS lookup failed", { cause: error });
+	}
+	validateLookupAddresses(addresses);
+}
+/**
+* Validates the IP addresses returned by `node:dns.lookup()`.
+*
+* Cloudflare Workers' `node:dns` implementation currently maps every record
+* in a DNS-over-HTTPS `Answer` array—including CNAME records—to a
+* `LookupAddress`, even though Node.js specifies that the `address` field must
+* contain an IPv4 or IPv6 literal.  See:
+* https://github.com/cloudflare/workerd/issues/6886
+*
+* Work around that bug by ignoring non-IP entries only when the lookup also
+* returns at least one actual IP address.  This remains fail-closed: a result
+* containing no IP addresses is rejected, and every returned IP address is
+* still validated and must be public.  This workaround can be revisited once
+* the Workerd issue is fixed in supported Cloudflare Workers runtimes.
+*
+* @internal
+*/
+function validateLookupAddresses(addresses) {
+	let ipAddressCount = 0;
+	for (const { address } of addresses) {
+		const family = isIP(address);
+		if (family === 0) continue;
+		ipAddressCount++;
+		validatePublicIpAddress(address, family);
 	}
-	for (const { address, family } of addresses) validatePublicIpAddress(address, family);
+	if (ipAddressCount === 0) throw new UrlError("DNS lookup did not return any IP address");
 }
 function validatePublicIpAddress(address, family) {
 	if (family === 4 && isValidPublicIPv4Address(address) || family === 6 && isValidPublicIPv6Address(address)) return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/relay",
-  "version": "2.2.7",
+  "version": "2.2.9",
   "description": "ActivityPub relay support for Fedify",
   "keywords": [
     "Fedify",
@@ -50,14 +50,14 @@
   "dependencies": {
     "@js-temporal/polyfill": "^0.5.1",
     "@logtape/logtape": "^2.0.5",
-    "@fedify/fedify": "^2.2.7",
-    "@fedify/vocab": "2.2.7"
+    "@fedify/fedify": "^2.2.9",
+    "@fedify/vocab": "2.2.9"
   },
   "devDependencies": {
     "tsdown": "^0.21.6",
     "typescript": "^6.0.0",
     "urlpattern-polyfill": "^10.1.0",
-    "@fedify/vocab-runtime": "^2.2.7"
+    "@fedify/vocab-runtime": "^2.2.9"
   },
   "scripts": {
     "build:self": "tsdown",