@fedify/vocab 2.3.14 → 2.3.15

package/dist-tests/{actor-CdnIo4XD.mjs → actor-pD1GaHgZ.mjs}

@@ -1,6 +1,6 @@
 import "@js-temporal/polyfill";
 globalThis.addEventListener = () => {};
-import { B as __commonJSMin, E as Person, H as __toESM, P as Service, T as Organization, a as Application, m as Group } from "./vocab-Cyuznh-0.mjs";
+import { B as __commonJSMin, E as Person, H as __toESM, P as Service, T as Organization, a as Application, m as Group } from "./vocab-DHuK2moR.mjs";
 import { t as getTypeId } from "./type-Cf-vxmre.mjs";
 import { lookupWebFinger } from "@fedify/webfinger";
 import { SpanStatusCode, trace } from "@opentelemetry/api";
@@ -1206,7 +1206,7 @@ var esm_default = new class FetchMock {
 //#endregion
 //#region deno.json
 var name = "@fedify/vocab";
-var version = "2.3.14";
+var version = "2.3.15";
 //#endregion
 //#region src/actor.ts
 const ACTOR_DISCOVERY_HISTOGRAM_BUCKETS = [

package/dist-tests/actor.test.mjs

@@ -1,7 +1,7 @@
 import "@js-temporal/polyfill";
 globalThis.addEventListener = () => {};
-import { E as Person, P as Service, T as Organization, V as __exportAll, a as Application, m as Group } from "./vocab-Cyuznh-0.mjs";
-import { a as normalizeActorHandle, c as esm_default, i as isActor, n as getActorHandle, r as getActorTypeName, t as getActorClassByTypeName } from "./actor-CdnIo4XD.mjs";
+import { E as Person, P as Service, T as Organization, V as __exportAll, a as Application, m as Group } from "./vocab-DHuK2moR.mjs";
+import { a as normalizeActorHandle, c as esm_default, i as isActor, n as getActorHandle, r as getActorTypeName, t as getActorClassByTypeName } from "./actor-pD1GaHgZ.mjs";
 import { createTestMeterProvider, test } from "@fedify/fixture";
 import { deepStrictEqual, ok, rejects, strictEqual, throws } from "node:assert/strict";
 //#region ../../node_modules/.pnpm/fast-check@3.23.2/node_modules/fast-check/lib/esm/check/precondition/PreconditionFailure.js

package/dist-tests/lookup.test.mjs

@@ -1,7 +1,7 @@
 import { Temporal } from "@js-temporal/polyfill";
 globalThis.addEventListener = () => {};
-import { E as Person, S as Object$1, o as Collection, x as Note } from "./vocab-Cyuznh-0.mjs";
-import { c as esm_default, i as isActor, o as name, s as version } from "./actor-CdnIo4XD.mjs";
+import { E as Person, S as Object$1, o as Collection, x as Note } from "./vocab-DHuK2moR.mjs";
+import { c as esm_default, i as isActor, o as name, s as version } from "./actor-pD1GaHgZ.mjs";
 import { t as getTypeId } from "./type-Cf-vxmre.mjs";
 import { t as assertInstanceOf } from "./utils-CE8Dk5hm.mjs";
 import { createTestMeterProvider, createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
@@ -263,10 +263,12 @@ async function* traverseCollection(collection, options = {}) {
 }
 //#endregion
 //#region src/lookup.test.ts
+const allowPrivateAddress = { allowPrivateAddress: true };
 test("lookupObject()", {
 	sanitizeResources: false,
 	sanitizeOps: false
 }, async (t) => {
+	const responseTimers = [];
 	esm_default.spyGlobal();
 	esm_default.get("begin:https://example.com/.well-known/webfinger", {
 		subject: "acct:johndoe@example.com",
@@ -290,7 +292,8 @@ test("lookupObject()", {
 	});
 	const options = {
 		documentLoader: mockDocumentLoader,
-		contextLoader: mockDocumentLoader
+		contextLoader: mockDocumentLoader,
+		...allowPrivateAddress
 	};
 	await t.step("actor", async () => {
 		const person = await lookupObject("@johndoe@example.com", options);
@@ -329,7 +332,7 @@ test("lookupObject()", {
 	});
 	esm_default.removeRoutes({ includeFallback: false });
 	esm_default.get("begin:https://example.com/.well-known/webfinger", () => new Promise((resolve) => {
-		setTimeout(() => {
+		responseTimers.push(setTimeout(() => {
 			resolve({
 				subject: "acct:johndoe@example.com",
 				links: [{
@@ -338,7 +341,7 @@ test("lookupObject()", {
 					type: "application/activity+json"
 				}]
 			});
-		}, 1e3);
+		}, 1e3));
 	}));
 	await t.step("request cancellation", async () => {
 		const controller = new AbortController();
@@ -369,7 +372,7 @@ test("lookupObject()", {
 	});
 	esm_default.removeRoutes({ includeFallback: false });
 	esm_default.get("begin:https://example.com/.well-known/webfinger", () => new Promise((resolve) => {
-		setTimeout(() => {
+		responseTimers.push(setTimeout(() => {
 			resolve({
 				subject: "acct:johndoe@example.com",
 				links: [{
@@ -378,7 +381,7 @@ test("lookupObject()", {
 					type: "application/activity+json"
 				}]
 			});
-		}, 500);
+		}, 500));
 	}));
 	await t.step("cancellation with immediate abort", async () => {
 		const controller = new AbortController();
@@ -390,7 +393,7 @@ test("lookupObject()", {
 	});
 	esm_default.removeRoutes({ includeFallback: false });
 	esm_default.get("https://example.com/slow-object", () => new Promise((resolve) => {
-		setTimeout(() => {
+		responseTimers.push(setTimeout(() => {
 			resolve({
 				status: 200,
 				headers: { "Content-Type": "application/activity+json" },
@@ -400,7 +403,7 @@ test("lookupObject()", {
 					content: "Slow response"
 				}
 			});
-		}, 1e3);
+		}, 1e3));
 	}));
 	await t.step("direct object fetch cancellation", async () => {
 		const controller = new AbortController();
@@ -411,6 +414,7 @@ test("lookupObject()", {
 		controller.abort();
 		deepStrictEqual(await promise, null);
 	});
+	for (const timer of responseTimers) clearTimeout(timer);
 	esm_default.hardReset();
 	esm_default.removeRoutes();
 });
@@ -581,15 +585,18 @@ test("FEP-fe34: lookupObject() cross-origin security", {
 			throw new Error(`Unexpected URL: ${url}`);
 		};
 		deepStrictEqual(await lookupObject("@user@example.com", {
+			...allowPrivateAddress,
 			documentLoader: webfingerDocumentLoader,
 			contextLoader: mockDocumentLoader
 		}), null);
 		await rejects(() => lookupObject("@user@example.com", {
+			...allowPrivateAddress,
 			documentLoader: webfingerDocumentLoader,
 			contextLoader: mockDocumentLoader,
 			crossOrigin: "throw"
 		}), Error, "The object's @id (https://malicious.com/fake-actor) has a different origin than the document URL (https://different-origin.com/actor)");
 		const result2 = await lookupObject("@user@example.com", {
+			...allowPrivateAddress,
 			documentLoader: webfingerDocumentLoader,
 			contextLoader: mockDocumentLoader,
 			crossOrigin: "trust"
@@ -660,11 +667,20 @@ test("FEP-fe34: lookupObject() cross-origin security", {
 		const errorDocumentLoader = async (_url) => {
 			throw new Error("Network error");
 		};
-		deepStrictEqual(await lookupObject("https://example.com/note", {
-			documentLoader: errorDocumentLoader,
-			contextLoader: mockDocumentLoader,
-			crossOrigin: "throw"
-		}), null);
+		esm_default.spyGlobal();
+		esm_default.get("begin:https://example.com/.well-known/webfinger", 404);
+		let result;
+		try {
+			result = await lookupObject("https://example.com/note", {
+				...allowPrivateAddress,
+				documentLoader: errorDocumentLoader,
+				contextLoader: mockDocumentLoader,
+				crossOrigin: "throw"
+			});
+		} finally {
+			esm_default.hardReset();
+		}
+		deepStrictEqual(result, null);
 	});
 	await t.step("malformed JSON handling with cross-origin policy", async () => {
 		const malformedJsonDocumentLoader = async (url) => {
@@ -729,6 +745,7 @@ test("lookupObject() records activitypub.object.lookup counter", {
 		await t.step("records kind=actor for an actor result", async () => {
 			const [meterProvider, recorder] = createTestMeterProvider();
 			assertInstanceOf(await lookupObject("@johndoe@example.com", {
+				...allowPrivateAddress,
 				documentLoader: mockDocumentLoader,
 				contextLoader: mockDocumentLoader,
 				meterProvider
@@ -782,6 +799,7 @@ test("lookupObject() records activitypub.object.lookup counter", {
 			});
 			const [meterProvider, recorder] = createTestMeterProvider();
 			deepStrictEqual(await lookupObject("janedoe@example.com", {
+				...allowPrivateAddress,
 				documentLoader: mockDocumentLoader,
 				contextLoader: mockDocumentLoader,
 				meterProvider
@@ -811,6 +829,7 @@ test("lookupObject() records activitypub.object.lookup counter", {
 			});
 			const [meterProvider, recorder] = createTestMeterProvider();
 			await lookupObject("@johndoe@example.com", {
+				...allowPrivateAddress,
 				documentLoader: mockDocumentLoader,
 				contextLoader: mockDocumentLoader,
 				meterProvider
@@ -832,6 +851,7 @@ test("lookupObject() records activitypub.object.lookup counter", {
 			});
 			const [meterProvider, recorder] = createTestMeterProvider();
 			await lookupObject(new URL("acct:johndoe@example.com"), {
+				...allowPrivateAddress,
 				documentLoader: mockDocumentLoader,
 				contextLoader: mockDocumentLoader,
 				meterProvider

package/dist-tests/type.test.mjs

@@ -1,6 +1,6 @@
 import "@js-temporal/polyfill";
 globalThis.addEventListener = () => {};
-import { E as Person, L as getEntityTypeById, R as isEntityType, y as Link } from "./vocab-Cyuznh-0.mjs";
+import { E as Person, L as getEntityTypeById, R as isEntityType, y as Link } from "./vocab-DHuK2moR.mjs";
 import { t as getTypeId } from "./type-Cf-vxmre.mjs";
 import { test } from "@fedify/fixture";
 import { deepStrictEqual } from "node:assert/strict";