@fedify/fedify 2.4.0-dev.1962 → 2.4.0-dev.1988

package/dist/{proof-CYdLcTFg.cjs → proof-DHu5zI0Z.cjs}

@@ -1,6 +1,6 @@
 const { URLPattern } = require("urlpattern-polyfill");
 const require_rolldown_runtime = require("./rolldown-runtime-Dmm3t92W.cjs");
-const require_http = require("./http-C3kkrvAE.cjs");
+const require_http = require("./http-Z3anvCd-.cjs");
 let _logtape_logtape = require("@logtape/logtape");
 let _fedify_vocab = require("@fedify/vocab");
 let _opentelemetry_api = require("@opentelemetry/api");
@@ -12,7 +12,7 @@ _fedify_vocab_runtime_jsonld = require_rolldown_runtime.__toESM(_fedify_vocab_ru
 let json_canon = require("json-canon");
 json_canon = require_rolldown_runtime.__toESM(json_canon, 1);
 //#region src/sig/ld.ts
-const logger$3 = (0, _logtape_logtape.getLogger)([
+const logger$4 = (0, _logtape_logtape.getLogger)([
 	"fedify",
 	"sig",
 	"ld"
@@ -455,7 +455,7 @@ async function verifySignature(jsonLd, options = {}) {
 	try {
 		signature = (0, byte_encodings_base64.decodeBase64)(sig.signatureValue);
 	} catch (error) {
-		logger$3.debug("Failed to verify; invalid base64 signatureValue: {signatureValue}", {
+		logger$4.debug("Failed to verify; invalid base64 signatureValue: {signatureValue}", {
 			...sig,
 			error
 		});
@@ -474,7 +474,7 @@ async function verifySignature(jsonLd, options = {}) {
 	try {
 		sigOptsHash = await hashJsonLd(sigOpts, options.contextLoader);
 	} catch (error) {
-		logger$3.warn("Failed to verify; failed to hash the signature options: {signatureOptions}\n{error}", {
+		logger$4.warn("Failed to verify; failed to hash the signature options: {signatureOptions}\n{error}", {
 			signatureOptions: sigOpts,
 			error
 		});
@@ -486,7 +486,7 @@ async function verifySignature(jsonLd, options = {}) {
 	try {
 		docHash = await hashJsonLd(document, options.contextLoader);
 	} catch (error) {
-		logger$3.warn("Failed to verify; failed to hash the document: {document}\n{error}", {
+		logger$4.warn("Failed to verify; failed to hash the document: {document}\n{error}", {
 			document,
 			error
 		});
@@ -497,7 +497,7 @@ async function verifySignature(jsonLd, options = {}) {
 	const messageBytes = encoder.encode(message);
 	if (await crypto.subtle.verify("RSASSA-PKCS1-v1_5", key.publicKey, signature.slice(), messageBytes)) return key;
 	if (cached) {
-		logger$3.debug("Failed to verify with the cached key {keyId}; signature {signatureValue} is invalid.  Retrying with the freshly fetched key...", {
+		logger$4.debug("Failed to verify with the cached key {keyId}; signature {signatureValue} is invalid.  Retrying with the freshly fetched key...", {
 			keyId: sig.creator,
 			...sig
 		});
@@ -511,7 +511,7 @@ async function verifySignature(jsonLd, options = {}) {
 		if (key == null) return null;
 		return await crypto.subtle.verify("RSASSA-PKCS1-v1_5", key.publicKey, signature.slice(), messageBytes) ? key : null;
 	}
-	logger$3.debug("Failed to verify with the fetched key {keyId}; signature {signatureValue} is invalid.  Check if the key is correct or if the signed message is correct.  The message to sign is:\n{message}", {
+	logger$4.debug("Failed to verify with the fetched key {keyId}; signature {signatureValue} is invalid.  Check if the key is correct or if the signed message is correct.  The message to sign is:\n{message}", {
 		keyId: sig.creator,
 		...sig,
 		message
@@ -590,12 +590,12 @@ async function verifyJsonLdInternal(jsonLd, options, compact) {
 			const key = await verifySignature(compacted, verificationOptions);
 			if (key == null) return false;
 			if (key.ownerId == null) {
-				logger$3.debug("Key {keyId} has no owner.", { keyId: key.id?.href });
+				logger$4.debug("Key {keyId} has no owner.", { keyId: key.id?.href });
 				return false;
 			}
 			attributions.delete(key.ownerId.href);
 			if (attributions.size > 0) {
-				logger$3.debug("Some attributions are not authenticated by the Linked Data Signatures: {attributions}.", { attributions: [...attributions] });
+				logger$4.debug("Some attributions are not authenticated by the Linked Data Signatures: {attributions}.", { attributions: [...attributions] });
 				return false;
 			}
 			verified = true;
@@ -624,8 +624,20 @@ async function hashJsonLd(jsonLd, contextLoader) {
 }
 //#endregion
 //#region src/sig/owner.ts
+const logger$3 = (0, _logtape_logtape.getLogger)([
+	"fedify",
+	"sig",
+	"owner"
+]);
 /**
 * Checks if the actor of the given activity owns the specified key.
+*
+* Ownership is never taken from what the activity or the key say about
+* themselves, as both are written by whoever sent the activity.  It is
+* established from a document that the owner itself serves: either the key's
+* claimed owner links back to the key, or the actor the activity claims lists
+* the key as its own.
+*
 * @param activity The activity to check.
 * @param key The public key to check.
 * @param options Options for checking the key ownership.
@@ -640,23 +652,30 @@ async function doesActorOwnKey(activity, key, options) {
 		}
 	}, async (span) => {
 		try {
-			if (key.ownerId != null) {
-				const owns = key.ownerId.href === activity.actorId?.href;
-				span.setAttribute("activitypub.key_ownership.verified", owns);
-				span.setAttribute("activitypub.key_ownership.method", "owner_id");
-				return owns;
-			}
-			const actor = await activity.getActor(options);
-			if (actor == null || !(0, _fedify_vocab.isActor)(actor)) {
+			const actorId = activity.actorId;
+			if (actorId == null) {
 				span.setAttribute("activitypub.key_ownership.verified", false);
-				span.setAttribute("activitypub.key_ownership.method", "actor_fetch");
+				span.setAttribute("activitypub.key_ownership.method", "none");
 				return false;
 			}
-			for (const publicKeyId of actor.publicKeyIds) if (key.id != null && publicKeyId.href === key.id.href) {
+			if (key.ownerId != null) {
+				const owner = await require_http.verifyKeyOwnership(key, options);
+				if (owner?.id != null && owner.id.href === actorId.href) {
+					span.setAttribute("activitypub.key_ownership.verified", true);
+					span.setAttribute("activitypub.key_ownership.method", "key_owner");
+					return true;
+				}
+			}
+			const actor = await require_http.fetchActorDocument(actorId, options);
+			if (actor != null && await doesActorListKey(actor, key, options)) {
 				span.setAttribute("activitypub.key_ownership.verified", true);
 				span.setAttribute("activitypub.key_ownership.method", "actor_fetch");
 				return true;
 			}
+			logger$3.debug("The actor {actorId} does not own key {keyId}: neither the owner the key claims nor the actor's own document links the two to each other.", {
+				actorId: actorId.href,
+				keyId: key.id?.href
+			});
 			span.setAttribute("activitypub.key_ownership.verified", false);
 			span.setAttribute("activitypub.key_ownership.method", "actor_fetch");
 			return false;
@@ -673,9 +692,46 @@ async function doesActorOwnKey(activity, key, options) {
 	});
 }
 /**
+* Determines whether the given actor's own document lists the given key among
+* its public keys.
+*
+* Keys are matched by id, which is what an actor document links to.  A key
+* document may leave its id implicit, though, and then there is no id for the
+* actor to link to; the key material itself is the only thing the two can
+* have in common, so that is what gets compared.
+*/
+async function doesActorListKey(actor, key, options) {
+	if (key.id != null) {
+		for (const publicKeyId of actor.publicKeyIds) if (publicKeyId.href === key.id.href) return true;
+		return false;
+	}
+	if (key.publicKey == null) return false;
+	const publicKeys = actor.getPublicKeys({
+		...options,
+		suppressError: true
+	});
+	for await (const publicKey of publicKeys) {
+		if (publicKey.publicKey == null) continue;
+		if (await isSamePublicKey(publicKey.publicKey, key.publicKey)) return true;
+	}
+	return false;
+}
+/**
+* Compares two public keys by their key material, ignoring the metadata that
+* surrounds it.
+*/
+async function isSamePublicKey(a, b) {
+	const [x, y] = await Promise.all([require_http.exportJwk(a), require_http.exportJwk(b)]);
+	return x.kty === y.kty && x.crv === y.crv && x.n === y.n && x.e === y.e && x.x === y.x && x.y === y.y;
+}
+/**
 * Gets the actor that owns the specified key.  Returns `null` if the key has no
 * known owner.
 *
+* The owner is only returned when the key and the owner link to each other:
+* a document that merely claims to own a key is not enough, as the claim and
+* the key can come from the same host.
+*
 * @param keyId The ID of the key to check, or the key itself.
 * @param options Options for getting the key owner.
 * @returns The actor that owns the key, or `null` if the key has no known
@@ -685,52 +741,50 @@ async function doesActorOwnKey(activity, key, options) {
 async function getKeyOwner(keyId, options) {
 	const tracerProvider = options.tracerProvider ?? _opentelemetry_api.trace.getTracerProvider();
 	const documentLoader = options.documentLoader ?? (0, _fedify_vocab_runtime.getDocumentLoader)();
-	const contextLoader = options.contextLoader ?? (0, _fedify_vocab_runtime.getDocumentLoader)();
+	const fetchOptions = {
+		documentLoader,
+		contextLoader: options.contextLoader ?? (0, _fedify_vocab_runtime.getDocumentLoader)(),
+		tracerProvider
+	};
+	if (keyId instanceof _fedify_vocab.CryptographicKey) return await require_http.verifyKeyOwnership(keyId, fetchOptions);
+	let keyDoc;
+	let documentUrl = keyId;
+	try {
+		const remoteDocument = await documentLoader(keyId.href);
+		keyDoc = remoteDocument.document;
+		documentUrl = new URL(remoteDocument.documentUrl ?? "", keyId);
+	} catch (_) {
+		return null;
+	}
 	let object;
-	if (keyId instanceof _fedify_vocab.CryptographicKey) {
-		object = keyId;
-		if (object.id == null) return null;
-		keyId = object.id;
-	} else {
-		let keyDoc;
-		try {
-			const { document } = await documentLoader(keyId.href);
-			keyDoc = document;
-		} catch (_) {
-			return null;
-		}
+	try {
+		object = await _fedify_vocab.Object.fromJsonLd(keyDoc, {
+			...fetchOptions,
+			baseUrl: documentUrl
+		});
+	} catch (e) {
+		if (!(e instanceof TypeError)) throw e;
 		try {
-			object = await _fedify_vocab.Object.fromJsonLd(keyDoc, {
-				documentLoader,
-				contextLoader,
-				tracerProvider
-			});
+			object = await _fedify_vocab.CryptographicKey.fromJsonLd(keyDoc, fetchOptions);
 		} catch (e) {
-			if (!(e instanceof TypeError)) throw e;
-			try {
-				object = await _fedify_vocab.CryptographicKey.fromJsonLd(keyDoc, {
-					documentLoader,
-					contextLoader,
-					tracerProvider
-				});
-			} catch (e) {
-				if (e instanceof TypeError) return null;
-				throw e;
-			}
+			if (e instanceof TypeError) return null;
+			throw e;
 		}
 	}
-	let owner = null;
 	if (object instanceof _fedify_vocab.CryptographicKey) {
-		if (object.ownerId == null) return null;
-		owner = await object.getOwner({
-			documentLoader,
-			contextLoader,
-			tracerProvider
+		if (object.id != null && object.id.href !== keyId.href) return null;
+		return await require_http.verifyKeyOwnership(object.id == null ? object.clone({ id: keyId }) : object, fetchOptions);
+	}
+	if (!(0, _fedify_vocab.isActor)(object)) return null;
+	if (object.id == null || object.id.origin !== documentUrl.origin) {
+		logger$3.debug("The document served at {documentUrl} claims to be the actor {actorId}, which belongs to another origin; refusing to treat it as the owner of key {keyId}.", {
+			documentUrl: documentUrl.href,
+			actorId: object.id?.href,
+			keyId: keyId.href
 		});
-	} else if ((0, _fedify_vocab.isActor)(object)) owner = object;
-	else return null;
-	if (owner == null) return null;
-	for (const kid of owner.publicKeyIds) if (kid.href === keyId.href) return owner;
+		return null;
+	}
+	for (const kid of object.publicKeyIds) if (kid.href === keyId.href) return object;
 	return null;
 }
 //#endregion
@@ -1265,7 +1319,7 @@ async function signObject(object, privateKey, keyId, options = {}) {
 async function verifyProof(jsonLd, proof, options = {}) {
 	return await verifyProofWithMessageDigestCache(jsonLd, proof, options);
 }
-async function verifyProofWithMessageDigestCache(jsonLd, proof, options, messageDigestCache = {}, rawProofCandidate) {
+async function verifyProofWithMessageDigestCache(jsonLd, proof, options, messageDigestCache = {}, rawProofCandidate, keyIdBoundByCaller = false) {
 	return await (options.tracerProvider ?? _opentelemetry_api.trace.getTracerProvider()).getTracer(require_http.name, require_http.version).startActiveSpan("object_integrity_proofs.verify", async (span) => {
 		const start = performance.now();
 		let verified = false;
@@ -1277,7 +1331,7 @@ async function verifyProofWithMessageDigestCache(jsonLd, proof, options, message
 			if (proof.proofValue != null) span.setAttribute("object_integrity_proofs.signature", (0, byte_encodings_hex.encodeHex)(proof.proofValue));
 		}
 		try {
-			const key = await verifyProofInternal(jsonLd, proof, options, messageDigestCache, rawProofCandidate);
+			const key = await verifyProofInternal(jsonLd, proof, options, messageDigestCache, rawProofCandidate, keyIdBoundByCaller);
 			if (key == null) span.setStatus({ code: _opentelemetry_api.SpanStatusCode.ERROR });
 			else verified = true;
 			return key;
@@ -1594,12 +1648,15 @@ async function hasValidProofOptions(proofConfig, options, documentLoader) {
 	if (previousProof == null || previousProof.present && typeof previousProof.value !== "string" && (!Array.isArray(previousProof.value) || previousProof.value.some((item) => typeof item !== "string"))) return false;
 	return true;
 }
-async function verifyProofInternal(jsonLd, proof, options, messageDigestCache, rawProofCandidate) {
+async function verifyProofInternal(jsonLd, proof, options, messageDigestCache, rawProofCandidate, keyIdBoundByCaller = false) {
 	if (!isJsonLdNode(jsonLd) || proof.cryptosuite !== "eddsa-jcs-2022" || proof.verificationMethodId == null || proof.proofPurpose !== "assertionMethod" || proof.proofValue == null || proof.created == null) return null;
 	const proofContextLoader = messageDigestCache.proofContextLoader ?? preloadedOnlyDocumentLoader;
 	const proofConfiguration = await createProofConfiguration(jsonLd, proof, options, proofContextLoader, rawProofCandidate);
 	if (proofConfiguration == null || !await hasValidProofOptions(proofConfiguration.value, options, proofContextLoader)) return null;
-	const publicKeyPromise = require_http.measureSignatureKeyFetch(options.meterProvider, "object_integrity", () => require_http.fetchKey(proof.verificationMethodId, _fedify_vocab.Multikey, options));
+	const publicKeyPromise = require_http.measureSignatureKeyFetch(options.meterProvider, "object_integrity", () => require_http.fetchKey(proof.verificationMethodId, _fedify_vocab.Multikey, {
+		...options,
+		keyIdBoundByCaller
+	}));
 	const proofBytes = new TextEncoder().encode((0, json_canon.default)(proofConfiguration.value));
 	const proofDigest = await crypto.subtle.digest("SHA-256", proofBytes);
 	let fetchedKey;
@@ -1633,7 +1690,7 @@ async function verifyProofInternal(jsonLd, proof, options, messageDigestCache, r
 					get: () => Promise.resolve(void 0),
 					set: async (keyId, key) => await options.keyCache?.set(keyId, key)
 				}
-			}, messageDigestCache, rawProofCandidate);
+			}, messageDigestCache, rawProofCandidate, keyIdBoundByCaller);
 		}
 		logger.debug("The fetched key (verificationMethod) for the proof is not a valid Ed25519 key:\n{keyId}", {
 			proof,
@@ -1670,7 +1727,7 @@ async function verifyProofInternal(jsonLd, proof, options, messageDigestCache, r
 				get: () => Promise.resolve(void 0),
 				set: async (keyId, key) => await options.keyCache?.set(keyId, key)
 			}
-		}, messageDigestCache, rawProofCandidate);
+		}, messageDigestCache, rawProofCandidate, keyIdBoundByCaller);
 	}
 	logger.debug("Failed to verify the proof with the fetched key {keyId}:\n{proof}", {
 		keyId: proof.verificationMethodId.href,
@@ -1885,7 +1942,7 @@ async function verifyPortableObjectProof(jsonLd, options = {}) {
 				proofIndex
 			}
 		};
-		const key = await verifyProofWithMessageDigestCache(jsonLd, proofs[proofIndex], options, messageDigestCache, rawProofCandidate);
+		const key = await verifyProofWithMessageDigestCache(jsonLd, proofs[proofIndex], options, messageDigestCache, rawProofCandidate, true);
 		if (key == null) return {
 			verified: false,
 			reason: {

package/dist/{proof-Mov6-gSw.mjs → proof-DL8Iid3a.mjs}

@@ -1,12 +1,12 @@
 import { Temporal } from "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-CfLMX4HF.mjs";
-import { n as getDurationMs, r as getFederationMetrics, s as measureSignatureKeyFetch } from "./metrics-Dkyzq7ml.mjs";
-import { n as fetchKey, o as validateCryptoKey } from "./key-BcA-AzPp.mjs";
+import { n as version, t as name } from "./deno-BgMEefEr.mjs";
+import { n as getDurationMs, r as getFederationMetrics, s as measureSignatureKeyFetch } from "./metrics-CrqsHP0l.mjs";
+import { r as fetchKey, s as validateCryptoKey } from "./key-Cwbg5ggV.mjs";
 import { n as preloadedOnlyDocumentLoader } from "./public-audience-Cc2YJ3ip.mjs";
 import { r as normalizeOutgoingActivityJsonLd } from "./outgoing-jsonld-B5Ne7JoL.mjs";
-import { c as getNormalizationContextLoader } from "./ld-QpPkmUjy.mjs";
+import { c as getNormalizationContextLoader } from "./ld-CzhdWyTt.mjs";
 import { getLogger } from "@logtape/logtape";
 import { Activity, DataIntegrityProof, Multikey, getTypeId } from "@fedify/vocab";
 import { SpanStatusCode, trace } from "@opentelemetry/api";
@@ -164,7 +164,7 @@ async function signObject(object, privateKey, keyId, options = {}) {
 async function verifyProof(jsonLd, proof, options = {}) {
 	return await verifyProofWithMessageDigestCache(jsonLd, proof, options);
 }
-async function verifyProofWithMessageDigestCache(jsonLd, proof, options, messageDigestCache = {}, rawProofCandidate) {
+async function verifyProofWithMessageDigestCache(jsonLd, proof, options, messageDigestCache = {}, rawProofCandidate, keyIdBoundByCaller = false) {
 	return await (options.tracerProvider ?? trace.getTracerProvider()).getTracer(name, version).startActiveSpan("object_integrity_proofs.verify", async (span) => {
 		const start = performance.now();
 		let verified = false;
@@ -176,7 +176,7 @@ async function verifyProofWithMessageDigestCache(jsonLd, proof, options, message
 			if (proof.proofValue != null) span.setAttribute("object_integrity_proofs.signature", encodeHex(proof.proofValue));
 		}
 		try {
-			const key = await verifyProofInternal(jsonLd, proof, options, messageDigestCache, rawProofCandidate);
+			const key = await verifyProofInternal(jsonLd, proof, options, messageDigestCache, rawProofCandidate, keyIdBoundByCaller);
 			if (key == null) span.setStatus({ code: SpanStatusCode.ERROR });
 			else verified = true;
 			return key;
@@ -493,12 +493,15 @@ async function hasValidProofOptions(proofConfig, options, documentLoader) {
 	if (previousProof == null || previousProof.present && typeof previousProof.value !== "string" && (!Array.isArray(previousProof.value) || previousProof.value.some((item) => typeof item !== "string"))) return false;
 	return true;
 }
-async function verifyProofInternal(jsonLd, proof, options, messageDigestCache, rawProofCandidate) {
+async function verifyProofInternal(jsonLd, proof, options, messageDigestCache, rawProofCandidate, keyIdBoundByCaller = false) {
 	if (!isJsonLdNode(jsonLd) || proof.cryptosuite !== "eddsa-jcs-2022" || proof.verificationMethodId == null || proof.proofPurpose !== "assertionMethod" || proof.proofValue == null || proof.created == null) return null;
 	const proofContextLoader = messageDigestCache.proofContextLoader ?? preloadedOnlyDocumentLoader;
 	const proofConfiguration = await createProofConfiguration(jsonLd, proof, options, proofContextLoader, rawProofCandidate);
 	if (proofConfiguration == null || !await hasValidProofOptions(proofConfiguration.value, options, proofContextLoader)) return null;
-	const publicKeyPromise = measureSignatureKeyFetch(options.meterProvider, "object_integrity", () => fetchKey(proof.verificationMethodId, Multikey, options));
+	const publicKeyPromise = measureSignatureKeyFetch(options.meterProvider, "object_integrity", () => fetchKey(proof.verificationMethodId, Multikey, {
+		...options,
+		keyIdBoundByCaller
+	}));
 	const proofBytes = new TextEncoder().encode(serialize(proofConfiguration.value));
 	const proofDigest = await crypto.subtle.digest("SHA-256", proofBytes);
 	let fetchedKey;
@@ -532,7 +535,7 @@ async function verifyProofInternal(jsonLd, proof, options, messageDigestCache, r
 					get: () => Promise.resolve(void 0),
 					set: async (keyId, key) => await options.keyCache?.set(keyId, key)
 				}
-			}, messageDigestCache, rawProofCandidate);
+			}, messageDigestCache, rawProofCandidate, keyIdBoundByCaller);
 		}
 		logger.debug("The fetched key (verificationMethod) for the proof is not a valid Ed25519 key:\n{keyId}", {
 			proof,
@@ -569,7 +572,7 @@ async function verifyProofInternal(jsonLd, proof, options, messageDigestCache, r
 				get: () => Promise.resolve(void 0),
 				set: async (keyId, key) => await options.keyCache?.set(keyId, key)
 			}
-		}, messageDigestCache, rawProofCandidate);
+		}, messageDigestCache, rawProofCandidate, keyIdBoundByCaller);
 	}
 	logger.debug("Failed to verify the proof with the fetched key {keyId}:\n{proof}", {
 		keyId: proof.verificationMethodId.href,
@@ -784,7 +787,7 @@ async function verifyPortableObjectProof(jsonLd, options = {}) {
 				proofIndex
 			}
 		};
-		const key = await verifyProofWithMessageDigestCache(jsonLd, proofs[proofIndex], options, messageDigestCache, rawProofCandidate);
+		const key = await verifyProofWithMessageDigestCache(jsonLd, proofs[proofIndex], options, messageDigestCache, rawProofCandidate, true);
 		if (key == null) return {
 			verified: false,
 			reason: {

package/dist/{send-DB1mkFKO.mjs → send-6jS4xFsX.mjs}

@@ -1,12 +1,12 @@
 import "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-CfLMX4HF.mjs";
-import { n as getDurationMs, r as getFederationMetrics } from "./metrics-Dkyzq7ml.mjs";
-import { n as doubleKnock } from "./http-BR190IDB.mjs";
+import { n as version, t as name } from "./deno-BgMEefEr.mjs";
+import { n as getDurationMs, r as getFederationMetrics } from "./metrics-CrqsHP0l.mjs";
+import { n as doubleKnock } from "./http-CtidZS_t.mjs";
 import { getLogger } from "@logtape/logtape";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
-import { FetchError } from "@fedify/vocab-runtime";
+import { FetchError, UrlError, validatePublicUrl } from "@fedify/vocab-runtime";
 //#region src/federation/send.ts
 /**
 * Extracts the inbox URLs from recipients.
@@ -112,7 +112,7 @@ async function readLimitedResponseBody(response, maxBytes) {
 	if (truncated) result += "… (truncated)";
 	return result;
 }
-async function sendActivityInternal({ activity, activityId, activityType, keys, inbox, headers, specDeterminer, meterProvider, tracerProvider }, span) {
+async function sendActivityInternal({ activity, activityId, activityType, keys, inbox, allowPrivateAddress, headers, specDeterminer, meterProvider, tracerProvider }, span) {
 	const logger = getLogger([
 		"fedify",
 		"federation",
@@ -121,12 +121,25 @@ async function sendActivityInternal({ activity, activityId, activityType, keys,
 	const federationMetrics = getFederationMetrics(meterProvider);
 	const started = performance.now();
 	let deliverySuccess = false;
+	async function validateUrl(url) {
+		if (!allowPrivateAddress) try {
+			await validatePublicUrl(url);
+		} catch (error) {
+			if (error instanceof UrlError) logger.error("Disallowed private URL: {url}", {
+				url,
+				error
+			});
+			throw error;
+		}
+	}
+	await validateUrl(inbox.href);
 	headers = new Headers(headers);
 	headers.set("Content-Type", "application/activity+json");
 	const request = new Request(inbox, {
 		method: "POST",
 		headers,
-		body: JSON.stringify(activity)
+		body: JSON.stringify(activity),
+		redirect: "manual"
 	});
 	let rsaKey = null;
 	for (const key of keys) if (key.privateKey.algorithm.name === "RSASSA-PKCS1-v1_5") {
@@ -142,19 +155,20 @@ async function sendActivityInternal({ activity, activityId, activityType, keys,
 	});
 	let response;
 	try {
-		response = rsaKey == null ? await fetch(request) : await doubleKnock(request, rsaKey, {
+		response = rsaKey == null ? await fetchWithValidatedRedirects(request, validateUrl) : await doubleKnock(request, rsaKey, {
 			tracerProvider,
-			specDeterminer
+			specDeterminer,
+			validateRedirect: validateUrl
 		});
 	} catch (error) {
-		const transportError = error instanceof FetchError ? error : createFetchError(inbox.href, error);
+		const failure = error instanceof FetchError || error instanceof UrlError ? error : createFetchError(inbox.href, error);
 		logger.error("Failed to send activity {activityId} to {inbox}:\n{error}", {
 			activityId,
 			inbox: inbox.href,
-			error: transportError
+			error: failure
 		});
 		federationMetrics.recordDelivery(inbox, getDurationMs(started), false, activityType);
-		throw transportError;
+		throw failure;
 	}
 	try {
 		if (!response.ok) {
@@ -191,6 +205,49 @@ function createFetchError(url, cause) {
 	error.cause = cause;
 	return error;
 }
+async function fetchWithValidatedRedirects(request, validateUrl) {
+	let body = await request.clone().text();
+	for (let redirects = 0;; redirects++) {
+		const response = await fetch(request, { redirect: "manual" });
+		const location = response.headers.get("Location");
+		if (![
+			301,
+			302,
+			303,
+			307,
+			308
+		].includes(response.status) || location == null) return response;
+		await response.body?.cancel();
+		if (redirects >= 20) throw new TypeError("Too many redirects");
+		const url = new URL(location, request.url);
+		await validateUrl(url.href);
+		const headers = new Headers(request.headers);
+		if (url.origin !== new URL(request.url).origin) {
+			headers.delete("Authorization");
+			headers.delete("Proxy-Authorization");
+			headers.delete("Cookie");
+			headers.delete("Host");
+		}
+		let method = request.method;
+		if ((response.status === 301 || response.status === 302) && method === "POST" || response.status === 303 && method !== "GET" && method !== "HEAD") {
+			method = "GET";
+			body = void 0;
+			for (const name of [
+				"Content-Encoding",
+				"Content-Language",
+				"Content-Length",
+				"Content-Location",
+				"Content-Type"
+			]) headers.delete(name);
+		}
+		request = new Request(url, {
+			method,
+			headers,
+			body,
+			redirect: "manual"
+		});
+	}
+}
 /**
 * An error that is thrown when an activity fails to send to a remote inbox.
 * It contains structured information about the failure, including the HTTP

package/dist/sig/http.test.mjs

@@ -10,8 +10,8 @@ import { t as assertThrows } from "../assert_throws-BJ5wuvR2.mjs";
 import "../std__assert-CxFT0MNt.mjs";
 import { t as assertRejects } from "../assert_rejects-wFbSPn1O.mjs";
 import { t as assert } from "../assert-CebeUf0C.mjs";
-import { t as exportJwk } from "../key-BcA-AzPp.mjs";
-import { a as parseRfc9421Signature, c as timingSafeEqual, i as formatRfc9421SignatureParameters, l as verifyRequest, n as doubleKnock, o as parseRfc9421SignatureInput, r as formatRfc9421Signature, s as signRequest, t as createRfc9421SignatureBase, u as verifyRequestDetailed } from "../http-BR190IDB.mjs";
+import { t as exportJwk } from "../key-Cwbg5ggV.mjs";
+import { a as parseRfc9421Signature, c as timingSafeEqual, i as formatRfc9421SignatureParameters, l as verifyRequest, n as doubleKnock, o as parseRfc9421SignatureInput, r as formatRfc9421Signature, s as signRequest, t as createRfc9421SignatureBase, u as verifyRequestDetailed } from "../http-CtidZS_t.mjs";
 import { i as rsaPrivateKey2, l as rsaPublicKey5, o as rsaPublicKey1, s as rsaPublicKey2 } from "../keys-DIJNHW-Y.mjs";
 import { createTestMeterProvider, createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import { FetchError, exportSpki } from "@fedify/vocab-runtime";