@fedify/fedify 2.4.0-dev.2084 → 2.4.0-dev.2099

package/dist/sig/portable-collection.test.mjs

@@ -1,17 +1,17 @@
 import "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "../deno-Dn-py9Zy.mjs";
-import { c as verifyPortableObjectProofWithRoot, o as verifyPortableObjectProof } from "../proof-ozG4HfcQ.mjs";
+import { n as version, t as name } from "../deno-dxdvl2XZ.mjs";
+import { l as verifyPortableObjectProofWithRoot, s as verifyPortableObjectProof } from "../proof-ChjBwnep.mjs";
 import { n as ed25519PrivateKey, r as ed25519PublicKey } from "../keys-DIJNHW-Y.mjs";
 import { getLogger } from "@logtape/logtape";
 import { Collection, CollectionPage, Note, Object as Object$1, OrderedCollection, Person, isActor, traverseCollection } from "@fedify/vocab";
 import { trace } from "@opentelemetry/api";
 import { test } from "@fedify/fixture";
 import { FetchError, canonicalizePortableUri, encodeMultibase, exportDidKey, formatIri, fromCompatibleEf61Id, getDocumentLoader, getFe34Origin, parseIri, preloadedContexts } from "@fedify/vocab-runtime";
+import { dereferencePortableIri, getPortableGatewayCandidates } from "@fedify/vocab-runtime/internal/portable-dereference";
 import serialize from "json-canon";
 import { deepStrictEqual, ok, strictEqual } from "node:assert/strict";
-import { dereferencePortableIri, getPortableGatewayCandidates } from "@fedify/vocab-runtime/internal/portable-dereference";
 //#region src/sig/portable-collection.ts
 const logger = getLogger([
 	"fedify",
@@ -54,6 +54,8 @@ function getContextState(context) {
 }
 function canonicalize(id) {
 	try {
+		const portable = fromCompatibleEf61Id(id);
+		if (portable != null) return canonicalizePortableUri(formatIri(portable));
 		return canonicalizePortableUri(typeof id === "string" ? id : formatIri(id));
 	} catch (error) {
 		if (error instanceof TypeError) return null;
@@ -234,7 +236,20 @@ async function fetchOwner(candidate, options) {
 	const contextLoader = options.contextLoader ?? getDocumentLoader();
 	const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
 	const tracer = tracerProvider.getTracer(name, version);
-	const gateways = options.gateways ?? (getPortableGatewayCandidates(candidate).length > 0 ? void 0 : options.gatewayHints);
+	let inferredGateways;
+	try {
+		const portable = fromCompatibleEf61Id(candidate);
+		if (portable != null) {
+			inferredGateways = [new URL(candidate.origin)];
+			candidate = portable;
+		}
+	} catch (error) {
+		if (!(error instanceof TypeError)) throw error;
+		logger.debug("The owner {owner} of a portable collection is a malformed compatible identifier.", { owner: candidate.href });
+		return null;
+	}
+	const gateways = options.gateways ?? (inferredGateways != null || getPortableGatewayCandidates(candidate).length > 0 ? void 0 : options.gatewayHints);
+	if (options.gateways != null) inferredGateways = void 0;
 	const span = tracer.startSpan("activitypub.lookup_object");
 	try {
 		const object = await dereferencePortableIri(candidate, {
@@ -242,6 +257,7 @@ async function fetchOwner(candidate, options) {
 			contextLoader,
 			tracerProvider,
 			gateways,
+			...inferredGateways == null ? {} : { inferredGateways },
 			verifyPortableObject: (document, verifierOptions) => verifyPortableObjectProof(document, {
 				...options,
 				...verifierOptions
@@ -569,13 +585,61 @@ test("verifyPortableObject() uses the actual fetch source", async () => {
 		referrer,
 		documentUrl: new URL(`https://user@gw1.example/.well-known/apgateway/${did}/actor/outbox`)
 	}), "unknownCollectionSource");
-	assertFailure(await verify(outbox({ id: gatewayUrl(evil, outboxId) }), {
+	const result = await verify(outbox({ id: gatewayUrl(evil, outboxId) }), {
+		documentLoader,
+		gateways,
+		referrer,
+		documentUrl: new URL(gatewayUrl(gw1, outboxId))
+	});
+	ok(result.verified);
+	strictEqual(result.method, "gateway");
+	if (result.method !== "gateway") return;
+	deepStrictEqual(result.gateway, new URL(gw1));
+	assertFailure(await verify(outbox({ id: `${evil}/outbox` }), {
 		documentLoader,
 		gateways,
 		referrer,
 		documentUrl: new URL(gatewayUrl(gw1, outboxId))
 	}), "notPortableObject");
 });
+test("verifyPortableObject() trusts unsecured collections of compatible-ID actors", async () => {
+	const compatibleActorId = gatewayUrl(gw1, actorId);
+	const compatibleOutboxId = gatewayUrl(gw1, outboxId);
+	const signed = await sign(actor({
+		id: compatibleActorId,
+		inbox: gatewayUrl(gw1, `ap://${did}/actor/inbox`),
+		outbox: compatibleOutboxId,
+		followers: gatewayUrl(gw1, `ap://${did}/actor/followers`)
+	}));
+	const collection = outbox({
+		id: compatibleOutboxId,
+		attributedTo: compatibleActorId
+	});
+	const documentLoader = createLoader({ [compatibleActorId]: signed });
+	const result = await verify(collection, {
+		documentLoader,
+		documentUrl: new URL(compatibleOutboxId)
+	});
+	ok(result.verified, JSON.stringify(result));
+	strictEqual(result.method, "gateway");
+	if (result.method !== "gateway") return;
+	deepStrictEqual(result.gateway, new URL(gw1));
+	deepStrictEqual(documentLoader.fetched, [compatibleActorId]);
+	const noGateways = createLoader({ [compatibleActorId]: signed });
+	assertFailure(await verify(collection, {
+		documentLoader: noGateways,
+		documentUrl: new URL(compatibleOutboxId),
+		gateways: []
+	}), "collectionOwnerUnavailable");
+	deepStrictEqual(noGateways.fetched.filter((url) => url === compatibleActorId), []);
+	assertFailure(await verify(collection, {
+		documentLoader: createLoader({ [compatibleActorId]: actor({
+			id: compatibleActorId,
+			outbox: compatibleOutboxId
+		}) }),
+		documentUrl: new URL(compatibleOutboxId)
+	}), "collectionOwnerUnavailable");
+});
 test("verifyPortableObject() requires an unambiguous owner", async () => {
 	const base = {
 		documentLoader: createLoader({ [gatewayUrl(gw1, actorId)]: signedActor }),

package/dist/sig/portable-key.test.mjs

@@ -1,13 +1,13 @@
 import "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { r as fetchKey } from "../key-BJrp524f.mjs";
-import { l as verifyRequest, s as signRequest } from "../http-B0VRNipE.mjs";
+import { r as fetchKey } from "../key-DYfmjnmp.mjs";
+import { d as verifyRequest, l as signRequest } from "../http-DsgawTd8.mjs";
 import { c as rsaPublicKey3, i as rsaPrivateKey2, n as ed25519PrivateKey, r as ed25519PublicKey, s as rsaPublicKey2 } from "../keys-DIJNHW-Y.mjs";
-import { n as getKeyOwner, t as doesActorOwnKey } from "../owner-CsKVgMzk.mjs";
+import { n as getKeyOwner, t as doesActorOwnKey } from "../owner-BJPDRDRq.mjs";
 import { Create, CryptographicKey, Multikey, Person } from "@fedify/vocab";
 import { test } from "@fedify/fixture";
-import { FetchError, encodeMultibase, exportDidKey, parseIri, preloadedContexts } from "@fedify/vocab-runtime";
+import { FetchError, encodeMultibase, exportDidKey, exportSpki, parseIri, preloadedContexts } from "@fedify/vocab-runtime";
 import serialize from "json-canon";
 import { deepStrictEqual, ok, strictEqual } from "node:assert/strict";
 //#region src/sig/portable-key.test.ts
@@ -129,7 +129,16 @@ test("verifyRequest() rejects gateway keys that portable actors do not vouch for
 		"an unsigned actor document": unsigned,
 		"an actor document signed by another DID": await sign(unsigned, otherKeyPair.privateKey, `${otherDid}#${otherDid.slice(8)}`),
 		"an unlisted gateway": await sign(await actorJson({ gateways: [gw2] })),
-		"a key missing from assertionMethod": await sign(await actorJson({ assertionMethod: false })),
+		"a key missing from both assertionMethod and publicKey": await sign(await actorJson({
+			assertionMethod: false,
+			publicKey: null
+		})),
+		"a key referred to by URL in assertionMethod, embedded in publicKey": await sign({
+			...await actorJson({ assertionMethod: false }),
+			assertionMethod: [keyId.href]
+		}),
+		"a key only in publicKey without an owner": await sign(withoutPublicKeyOwner(await actorJson({ assertionMethod: false }))),
+		"two keys with the same ID in publicKey": await sign(await duplicatePublicKey(await actorJson({ assertionMethod: false }))),
 		"a key referred to by URL": await sign({
 			...await actorJson({
 				publicKey: null,
@@ -154,18 +163,175 @@ test("verifyRequest() rejects gateway keys that portable actors do not vouch for
 		contextLoader
 	}), null);
 });
-test("verifyRequest() keeps web-origin trust for compatible-ID actors", async () => {
-	const id = compatibleId(gw1);
-	const documentLoader = createLoader({ [id]: await actorJson({
-		id,
-		gateways: [gw1]
+function withoutPublicKeyOwner(json) {
+	const { owner: _, ...publicKey } = json.publicKey;
+	return {
+		...json,
+		publicKey
+	};
+}
+async function duplicatePublicKey(json) {
+	const publicKey = json.publicKey;
+	return {
+		...json,
+		publicKey: [publicKey, {
+			...publicKey,
+			publicKeyPem: await exportSpki(rsaPublicKey3.publicKey)
+		}]
+	};
+}
+test("verifyRequest() accepts gateway keys referred to by URL in publicKey", async () => {
+	const documentLoader = createLoader({ [compatibleId(gw1)]: await sign({
+		...await actorJson({ publicKey: null }),
+		publicKey: keyId.href
 	}) });
+	strictEqual((await verifyRequest(await signedRequest(), {
+		documentLoader,
+		contextLoader
+	}))?.id?.href, keyId.href);
+});
+test("verifyRequest() accepts gateway keys only in publicKey", async () => {
+	const documentLoader = createLoader({ [compatibleId(gw1)]: await sign(await actorJson({ assertionMethod: false })) });
 	const key = await verifyRequest(await signedRequest(), {
 		documentLoader,
 		contextLoader
 	});
 	strictEqual(key?.id?.href, keyId.href);
+	strictEqual(key?.ownerId?.href, parseIri(actorId).href);
+});
+test("verifyRequest() resolves gateway keys of compatible-ID actors", async () => {
+	const id = compatibleId(gw1);
+	const signed = await sign(await actorJson({
+		id,
+		gateways: [gw1]
+	}));
+	let key = await verifyRequest(await signedRequest(), {
+		documentLoader: createLoader({ [id]: signed }),
+		contextLoader
+	});
+	strictEqual(key?.id?.href, keyId.href);
 	strictEqual(key?.ownerId?.href, id);
+	key = await verifyRequest(await signedRequest(), {
+		documentLoader: createLoader({ [id]: await sign(await actorJson({
+			id,
+			gateways: [gw1],
+			assertionMethod: false
+		})) }),
+		contextLoader
+	});
+	strictEqual(key?.id?.href, keyId.href);
+	const evil = "https://evil.example";
+	const evilId = compatibleId(evil);
+	const evilKeyId = new URL(`${evilId}#main-key`);
+	const unsigned = await actorJson({
+		id: evilId,
+		gateways: [evil],
+		key: evilKeyId
+	});
+	const documentLoader = createLoader({ [evilId]: unsigned });
+	strictEqual(await verifyRequest(await signedRequest(void 0, evilKeyId), {
+		documentLoader,
+		contextLoader
+	}), null);
+	strictEqual(await getKeyOwner(evilKeyId, {
+		documentLoader,
+		contextLoader
+	}), null);
+	strictEqual(await verifyRequest(await signedRequest(), {
+		documentLoader: createLoader({ [id]: await sign(await actorJson({
+			id,
+			gateways: [gw1]
+		}), otherKeyPair.privateKey, `${otherDid}#${otherDid.slice(8)}`) }),
+		contextLoader
+	}), null);
+});
+test("keys at ordinary URLs cannot belong to portable actors", async () => {
+	const evil = "https://evil.example";
+	const evilActorId = compatibleId(evil);
+	const evilKeyId = new URL(`${evil}/keys/1`);
+	const options = {
+		documentLoader: createLoader({
+			[evilKeyId.href]: {
+				"@context": "https://w3id.org/security/v1",
+				id: evilKeyId.href,
+				type: "Key",
+				owner: evilActorId,
+				publicKeyPem: await exportSpki(gatewayPublicKey)
+			},
+			[evilActorId]: await actorJson({
+				id: evilActorId,
+				gateways: [evil],
+				key: evilKeyId,
+				assertionMethod: false
+			})
+		}),
+		contextLoader
+	};
+	strictEqual(await verifyRequest(await signedRequest(void 0, evilKeyId), options), null);
+	strictEqual((await fetchKey(evilKeyId, CryptographicKey, options)).key, null);
+	strictEqual(await getKeyOwner(evilKeyId, options), null);
+	const key = new CryptographicKey({
+		id: evilKeyId,
+		owner: new URL(evilActorId),
+		publicKey: gatewayPublicKey
+	});
+	strictEqual(await getKeyOwner(key, options), null);
+	ok(!await doesActorOwnKey(new Create({
+		id: new URL(`${evil}/activities/1`),
+		actor: new URL(evilActorId)
+	}), key, options));
+	const actorKeyId = new URL(`${evil}/users/alice#main-key`);
+	for (const document of [await actorJson({
+		id: evilActorId,
+		gateways: [evil],
+		key: actorKeyId
+	}), withoutPublicKeyOwner(await actorJson({
+		id: evilActorId,
+		gateways: [evil],
+		key: actorKeyId,
+		assertionMethod: false
+	}))]) {
+		const actorOptions = {
+			documentLoader: createLoader({ [`${evil}/users/alice`]: document }),
+			contextLoader
+		};
+		strictEqual(await verifyRequest(await signedRequest(void 0, actorKeyId), actorOptions), null);
+		strictEqual((await fetchKey(actorKeyId, CryptographicKey, actorOptions)).key, null);
+		strictEqual(await getKeyOwner(actorKeyId, actorOptions), null);
+	}
+	const ownerKeyId = new URL(`${evil}/keys/2`);
+	const ownerOptions = {
+		documentLoader: createLoader({
+			[ownerKeyId.href]: {
+				"@context": "https://w3id.org/security/v1",
+				id: ownerKeyId.href,
+				type: "Key",
+				owner: `${evil}/users/bob`,
+				publicKeyPem: await exportSpki(gatewayPublicKey)
+			},
+			[`${evil}/users/bob`]: await actorJson({
+				id: evilActorId,
+				gateways: [evil],
+				key: ownerKeyId,
+				assertionMethod: false
+			})
+		}),
+		contextLoader
+	};
+	strictEqual(await getKeyOwner(ownerKeyId, ownerOptions), null);
+	strictEqual(await getKeyOwner(new CryptographicKey({
+		id: ownerKeyId,
+		owner: new URL(`${evil}/users/bob`),
+		publicKey: gatewayPublicKey
+	}), ownerOptions), null);
+	const keyCache = {
+		get: () => Promise.resolve(key),
+		set: () => Promise.resolve()
+	};
+	strictEqual((await fetchKey(evilKeyId, CryptographicKey, {
+		...options,
+		keyCache
+	})).key, null);
 });
 test("gateway keys are neither cached nor accepted outside HTTP Signatures", async () => {
 	const calls = [];

package/dist/sig/proof.test.mjs

@@ -10,10 +10,10 @@ import "../std__assert-DvMDRPes.mjs";
 import { t as assertRejects } from "../assert_rejects-CTptdYck.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
 import { r as normalizeOutgoingActivityJsonLd } from "../outgoing-jsonld-4IJqPYos.mjs";
-import { a as verifyObject, l as verifyProof, n as hasProofLike, o as verifyPortableObjectProof, r as signObject, t as createProof } from "../proof-ozG4HfcQ.mjs";
-import { l as verifyRequest } from "../http-B0VRNipE.mjs";
+import { i as signObject, n as createProof, o as verifyObject, r as hasProofLike, s as verifyPortableObjectProof, u as verifyProof } from "../proof-ChjBwnep.mjs";
+import { d as verifyRequest } from "../http-DsgawTd8.mjs";
 import { i as rsaPrivateKey2, n as ed25519PrivateKey, r as ed25519PublicKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-DIJNHW-Y.mjs";
-import { t as getAuthenticatedDocumentLoader } from "../docloader-BUq5bYJr.mjs";
+import { t as getAuthenticatedDocumentLoader } from "../docloader-eBxQDsk9.mjs";
 import { Create, DataIntegrityProof, Document, Multikey, Note, PUBLIC_COLLECTION, Place, Translation } from "@fedify/vocab";
 import { createTestMeterProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import { decodeMultibase, encodeMultibase, exportDidKey, exportMultibaseKey, formatIri, importMultibaseKey, parseIri } from "@fedify/vocab-runtime";
@@ -1064,6 +1064,45 @@ test("verifyPortableObjectProof()", async (t) => {
 			reason: { type: "missingProof" }
 		});
 	});
+	await t.step("treats compatible identifiers as portable IDs", async () => {
+		const compatibleActorId = `https://gateway.example/.well-known/apgateway/did:key:${portableDidMethod}/actor`;
+		const actor = {
+			"@context": portableContext,
+			id: compatibleActorId,
+			type: "Person",
+			inbox: `${compatibleActorId}/inbox`,
+			outbox: `${compatibleActorId}/outbox`
+		};
+		const signed = await signPortableJsonLd(actor);
+		const result = await verifyPortableObjectProof(signed, options);
+		assert(result.verified);
+		assertEquals(result.keys[0].id, portableKeyId);
+		assertEquals(signed.id, compatibleActorId);
+		assertEquals(await verifyPortableObjectProof(actor, options), {
+			verified: false,
+			reason: { type: "missingProof" }
+		});
+		const otherId = `https://gateway.example/.well-known/apgateway/did:key:z6MkhaXgBZDvotDkL5257faiztiGiC2QtKLGpbnnEGta2doK/activities/1`;
+		assertEquals(await verifyPortableObjectProof(await signPortableJsonLd({
+			"@context": portableContext,
+			id: otherId,
+			type: "Create",
+			actor: compatibleActorId,
+			object: "https://social.example/objects/1"
+		}), options), {
+			verified: false,
+			reason: {
+				type: "verificationMethodMismatch",
+				proofIndex: 0,
+				objectId: new URL(otherId),
+				verificationMethod: portableKeyId
+			}
+		});
+		await assertRejects(() => verifyPortableObjectProof({
+			...actor,
+			id: `https://user@gateway.example/.well-known/apgateway/did:key:${portableDidMethod}/actor`
+		}, options), TypeError);
+	});
 	await t.step("keeps non-portable documents outside the policy", async () => {
 		for (const document of [
 			{
@@ -1072,7 +1111,7 @@ test("verifyPortableObjectProof()", async (t) => {
 			},
 			{
 				...unsignedObject,
-				id: "https://gateway.example/.well-known/apgateway/did:key:z6MkAlice/objects/1"
+				id: "https://gateway.example/.well-known/apgateway/hl:zQmdfTbBqBPQ"
 			},
 			{
 				"@context": portableContext,
@@ -1804,6 +1843,70 @@ test("verifyObject() rejects did:key proofs from another portable attribution or
 		contextLoader: mockDocumentLoader
 	}), null);
 });
+async function signCompatibleNote(attribution, keyId) {
+	const context = ["https://www.w3.org/ns/activitystreams", "https://w3id.org/security/data-integrity/v1"];
+	return await (await signObject(new Note({
+		id: new URL(`${attribution}/notes/1`),
+		attribution: new URL(attribution),
+		content: "Note of a compatible-ID actor"
+	}), ed25519PrivateKey, keyId, {
+		contextLoader: mockDocumentLoader,
+		context
+	})).toJsonLd({
+		format: "compact",
+		contextLoader: mockDocumentLoader,
+		context
+	});
+}
+test("verifyObject() authenticates compatible-ID attributions by DID proofs", async () => {
+	const did = await exportDidKey(ed25519PublicKey.publicKey);
+	const keyId = new URL(`${did}#${did.substring(8)}`);
+	const options = {
+		documentLoader() {
+			throw new TypeError("did:key must not use the document loader");
+		},
+		contextLoader: mockDocumentLoader
+	};
+	for (const gateway of ["https://gw1.example", "https://gw2.example"]) assertInstanceOf(await verifyObject(Note, await signCompatibleNote(`${gateway}/.well-known/apgateway/${did}/actor`, keyId), options), Note);
+	assertEquals(await verifyObject(Note, await signCompatibleNote("https://gw1.example/.well-known/apgateway/did:key:z6MkOther/actor", keyId), options), null);
+});
+test("verifyObject() does not trust compatible-ID actors by web origin", async () => {
+	const did = await exportDidKey(ed25519PublicKey.publicKey);
+	const attribution = `https://evil.example/.well-known/apgateway/${did}/actor`;
+	const keyId = new URL("https://evil.example/keys/1");
+	const documents = {
+		[keyId.href]: {
+			"@context": "https://w3id.org/security/multikey/v1",
+			id: keyId.href,
+			type: "Multikey",
+			controller: attribution,
+			publicKeyMultibase: await exportMultibaseKey(ed25519PublicKey.publicKey)
+		},
+		[attribution]: {
+			"@context": ["https://www.w3.org/ns/activitystreams", "https://w3id.org/security/multikey/v1"],
+			id: attribution,
+			type: "Person",
+			inbox: `${attribution}/inbox`,
+			assertionMethod: keyId.href
+		}
+	};
+	const fetched = [];
+	assertEquals(await verifyObject(Note, await signCompatibleNote(attribution, keyId), {
+		documentLoader: (url) => {
+			fetched.push(url);
+			const document = documents[url];
+			if (document == null) throw new TypeError(`Unexpected: ${url}`);
+			return Promise.resolve({
+				contextUrl: null,
+				documentUrl: url,
+				document
+			});
+		},
+		contextLoader: mockDocumentLoader
+	}), null);
+	assertEquals(fetched, [keyId.href]);
+	assertEquals(await verifyObject(Note, await signCompatibleNote(`https://user@gw.example/.well-known/apgateway/${did}/actor`, new URL(`${did}#${did.substring(8)}`)), { contextLoader: mockDocumentLoader }), null);
+});
 test("signObject() preserves FEP-22cd contexts through proof verification", async () => {
 	const did = await exportDidKey(ed25519PublicKey.publicKey);
 	const keyId = new URL(`${did}#${did.substring(8)}`);

package/dist/{sig-k3C8sF7g.cjs → sig-B689Nj7y.cjs}

@@ -1,6 +1,6 @@
 const { URLPattern } = require("urlpattern-polyfill");
-const require_http = require("./http-B5q1CHtL.cjs");
-require("./owner-BQFZtFV4.cjs");
+const require_http = require("./http-C8cZTE3Y.cjs");
+require("./owner-DSzH7wro.cjs");
 let _logtape_logtape = require("@logtape/logtape");
 let _fedify_vocab = require("@fedify/vocab");
 let _opentelemetry_api = require("@opentelemetry/api");
@@ -48,6 +48,8 @@ function getContextState(context) {
 }
 function canonicalize(id) {
 	try {
+		const portable = (0, _fedify_vocab_runtime.fromCompatibleEf61Id)(id);
+		if (portable != null) return (0, _fedify_vocab_runtime.canonicalizePortableUri)((0, _fedify_vocab_runtime.formatIri)(portable));
 		return (0, _fedify_vocab_runtime.canonicalizePortableUri)(typeof id === "string" ? id : (0, _fedify_vocab_runtime.formatIri)(id));
 	} catch (error) {
 		if (error instanceof TypeError) return null;
@@ -228,7 +230,20 @@ async function fetchOwner(candidate, options) {
 	const contextLoader = options.contextLoader ?? (0, _fedify_vocab_runtime.getDocumentLoader)();
 	const tracerProvider = options.tracerProvider ?? _opentelemetry_api.trace.getTracerProvider();
 	const tracer = tracerProvider.getTracer(require_http.name, require_http.version);
-	const gateways = options.gateways ?? ((0, _fedify_vocab_runtime_internal_portable_dereference.getPortableGatewayCandidates)(candidate).length > 0 ? void 0 : options.gatewayHints);
+	let inferredGateways;
+	try {
+		const portable = (0, _fedify_vocab_runtime.fromCompatibleEf61Id)(candidate);
+		if (portable != null) {
+			inferredGateways = [new URL(candidate.origin)];
+			candidate = portable;
+		}
+	} catch (error) {
+		if (!(error instanceof TypeError)) throw error;
+		logger.debug("The owner {owner} of a portable collection is a malformed compatible identifier.", { owner: candidate.href });
+		return null;
+	}
+	const gateways = options.gateways ?? (inferredGateways != null || (0, _fedify_vocab_runtime_internal_portable_dereference.getPortableGatewayCandidates)(candidate).length > 0 ? void 0 : options.gatewayHints);
+	if (options.gateways != null) inferredGateways = void 0;
 	const span = tracer.startSpan("activitypub.lookup_object");
 	try {
 		const object = await (0, _fedify_vocab_runtime_internal_portable_dereference.dereferencePortableIri)(candidate, {
@@ -236,6 +251,7 @@ async function fetchOwner(candidate, options) {
 			contextLoader,
 			tracerProvider,
 			gateways,
+			...inferredGateways == null ? {} : { inferredGateways },
 			verifyPortableObject: (document, verifierOptions) => require_http.verifyPortableObjectProof(document, {
 				...options,
 				...verifierOptions

package/dist/{sig-DhdomAN0.js → sig-C85KqAcx.js}

@@ -1,7 +1,7 @@
 import { Temporal } from "temporal-polyfill";
 import { URLPattern } from "urlpattern-polyfill";
-import { f as verifyPortableObjectProof, ht as version, m as verifyPortableObjectProofWithRoot, mt as name } from "./http-4PCCvhsU.js";
-import "./owner-_pbbgLJK.js";
+import { _ as verifyPortableObjectProofWithRoot, bt as name, h as verifyPortableObjectProof, xt as version } from "./http-D-rbr_Sy.js";
+import "./owner-U12fDpQW.js";
 import { getLogger } from "@logtape/logtape";
 import { CollectionPage, Object as Object$1, isActor } from "@fedify/vocab";
 import { trace } from "@opentelemetry/api";
@@ -49,6 +49,8 @@ function getContextState(context) {
 }
 function canonicalize(id) {
 	try {
+		const portable = fromCompatibleEf61Id(id);
+		if (portable != null) return canonicalizePortableUri(formatIri(portable));
 		return canonicalizePortableUri(typeof id === "string" ? id : formatIri(id));
 	} catch (error) {
 		if (error instanceof TypeError) return null;
@@ -229,7 +231,20 @@ async function fetchOwner(candidate, options) {
 	const contextLoader = options.contextLoader ?? getDocumentLoader();
 	const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
 	const tracer = tracerProvider.getTracer(name, version);
-	const gateways = options.gateways ?? (getPortableGatewayCandidates(candidate).length > 0 ? void 0 : options.gatewayHints);
+	let inferredGateways;
+	try {
+		const portable = fromCompatibleEf61Id(candidate);
+		if (portable != null) {
+			inferredGateways = [new URL(candidate.origin)];
+			candidate = portable;
+		}
+	} catch (error) {
+		if (!(error instanceof TypeError)) throw error;
+		logger.debug("The owner {owner} of a portable collection is a malformed compatible identifier.", { owner: candidate.href });
+		return null;
+	}
+	const gateways = options.gateways ?? (inferredGateways != null || getPortableGatewayCandidates(candidate).length > 0 ? void 0 : options.gatewayHints);
+	if (options.gateways != null) inferredGateways = void 0;
 	const span = tracer.startSpan("activitypub.lookup_object");
 	try {
 		const object = await dereferencePortableIri(candidate, {
@@ -237,6 +252,7 @@ async function fetchOwner(candidate, options) {
 			contextLoader,
 			tracerProvider,
 			gateways,
+			...inferredGateways == null ? {} : { inferredGateways },
 			verifyPortableObject: (document, verifierOptions) => verifyPortableObjectProof(document, {
 				...options,
 				...verifierOptions

package/dist/{temporal-Ba0EAZAI.mjs → temporal-Dl9x-Qw4.mjs}

@@ -1,7 +1,7 @@
 import { Temporal } from "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { c as getNormalizationContextLoader } from "./ld-BmFz5NLA.mjs";
+import { c as getNormalizationContextLoader } from "./ld-B00wWHzc.mjs";
 import jsonld from "@fedify/vocab-runtime/jsonld";
 //#region src/federation/temporal.ts
 function isPlainObject(value) {

package/dist/testing/kv.test.mjs

@@ -6,7 +6,7 @@ import { t as MemoryKvStore } from "../kv-DCHkaJ9-.mjs";
 import { t as ManualClockKvStore } from "../kv-DBRWVx3Q.mjs";
 import { n as baseOptions, o as stringSchema, t as MockQueue } from "../tasks-dbCShlCb.mjs";
 import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
-import { o as createFederation } from "../middleware-BKeQYPm0.mjs";
+import { o as createFederation } from "../middleware-Br1_d-Ga.mjs";
 //#region src/testing/kv.test.ts
 test("ManualClockKvStore keeps an entry at its exact expiration instant", async () => {
 	const kv = new ManualClockKvStore();

package/dist/testing/mod.d.mts

@@ -2035,8 +2035,11 @@ interface PortableInboxForwardingOptions {
   /**
    * How long a delivery waits for forwarding requests made immediately, i.e.,
    * when no outbox queue is configured, before Fedify responds to it.
-   * Requests still running afterwards continue in the background.  It does
-   * not apply when forwarding is queued.  It cannot have calendar units,
+   * Requests still running afterwards continue in the background.  It also
+   * bounds verifying the HTTP Signature that identifies the gateway which
+   * forwarded the delivery, with or without an outbox queue; if the
+   * verification does not finish in time, the activity is forwarded to that
+   * gateway as well.  It cannot have calendar units,
    * i.e., weeks, months, or years, and cannot be longer than
    * 2,147,483,647 milliseconds (about 24.8 days), the longest delay timers
    * support.

package/dist/utils/docloader.test.mjs

@@ -5,9 +5,9 @@ import { t as esm_default } from "../esm-BHXXx4Wx.mjs";
 import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assertRejects } from "../assert_rejects-CTptdYck.mjs";
-import { l as verifyRequest } from "../http-B0VRNipE.mjs";
+import { d as verifyRequest } from "../http-DsgawTd8.mjs";
 import { i as rsaPrivateKey2 } from "../keys-DIJNHW-Y.mjs";
-import { t as getAuthenticatedDocumentLoader } from "../docloader-BUq5bYJr.mjs";
+import { t as getAuthenticatedDocumentLoader } from "../docloader-eBxQDsk9.mjs";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 import { FetchError, UrlError } from "@fedify/vocab-runtime";
 //#region src/utils/docloader.test.ts

package/dist/utils/kv-cache.test.mjs

@@ -1,7 +1,7 @@
 import { Temporal } from "temporal-polyfill";
 import { URLPattern } from "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as kvCache, t as MockKvStore } from "../kv-cache-C4C3LyYW.mjs";
+import { n as kvCache, t as MockKvStore } from "../kv-cache-EvOgrFsS.mjs";
 import { deepStrictEqual, throws } from "node:assert";
 import { createTestMeterProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import { preloadedContexts } from "@fedify/vocab-runtime";

package/dist/utils/mod.cjs

@@ -1,5 +1,5 @@
 const { URLPattern } = require("urlpattern-polyfill");
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_kv_cache = require("../kv-cache-Dhhhrryv.cjs");
+const require_kv_cache = require("../kv-cache-Dvd-Q-E2.cjs");
 exports.getAuthenticatedDocumentLoader = require_kv_cache.getAuthenticatedDocumentLoader;
 exports.kvCache = require_kv_cache.kvCache;

package/dist/utils/mod.js

@@ -1,4 +1,4 @@
 import { Temporal } from "temporal-polyfill";
 import { URLPattern } from "urlpattern-polyfill";
-import { n as getAuthenticatedDocumentLoader, t as kvCache } from "../kv-cache-1KUmAPH7.js";
+import { n as getAuthenticatedDocumentLoader, t as kvCache } from "../kv-cache-DIxwMeNi.js";
 export { getAuthenticatedDocumentLoader, kvCache };