@fedify/vocab 2.4.0-dev.1599 → 2.4.0-dev.1634

package/dist-tests/{actor-NhcklZK0.mjs → actor-BQd8S953.mjs}

@@ -1,6 +1,6 @@
 import "temporal-polyfill";
 globalThis.addEventListener = () => {};
-import { A as Person, G as __toESM, L as Service, U as __commonJSMin, a as Application, k as Organization, v as Group } from "./vocab-BQ8y6QS7.mjs";
+import { G as __commonJSMin, M as Person, a as Application, j as Organization, q as __toESM, v as Group, z as Service } from "./vocab-Bjwctrxn.mjs";
 import { t as getTypeId } from "./type-_BlsfT3S.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.4.0-dev.1599+7b19967f";
+var version = "2.4.0-dev.1634+3b4bfbb6";
 //#endregion
 //#region src/actor.ts
 const ACTOR_DISCOVERY_HISTOGRAM_BUCKETS = [

package/dist-tests/actor.test.mjs

@@ -1,7 +1,7 @@
 import "temporal-polyfill";
 globalThis.addEventListener = () => {};
-import { A as Person, L as Service, W as __exportAll, a as Application, k as Organization, v as Group } from "./vocab-BQ8y6QS7.mjs";
-import { a as normalizeActorHandle, c as esm_default, i as isActor, n as getActorHandle, r as getActorTypeName, t as getActorClassByTypeName } from "./actor-NhcklZK0.mjs";
+import { K as __exportAll, M as Person, a as Application, j as Organization, v as Group, z as Service } from "./vocab-Bjwctrxn.mjs";
+import { a as normalizeActorHandle, c as esm_default, i as isActor, n as getActorHandle, r as getActorTypeName, t as getActorClassByTypeName } from "./actor-BQd8S953.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/application.yaml

@@ -7,6 +7,7 @@ entity: true
 description: Describes a software application.
 defaultContext:
 - "https://www.w3.org/ns/activitystreams"
+- "https://w3id.org/fep/ef61"
 - "https://w3id.org/security/v1"
 - "https://w3id.org/security/data-integrity/v1"
 - "https://www.w3.org/ns/did/v1"
@@ -78,6 +79,20 @@ properties:
   range:
   - "https://w3id.org/security#Multikey"
 
+- pluralName: gateways
+  singularName: gateway
+  singularAccessor: true
+  compactName: gateways
+  uri: "https://w3id.org/fep/ef61/gateways"
+  container: list
+  description: |
+    Gateways where the latest version of this portable actor object can be
+    retrieved.
+
+    See [FEP-ef61](https://w3id.org/fep/ef61) for details.
+  range:
+  - "fedify:gatewayUrl"
+
 - singularName: manuallyApprovesFollowers
   functional: true
   compactName: manuallyApprovesFollowers

package/dist-tests/audio.yaml

@@ -7,6 +7,7 @@ entity: true
 description: Represents an audio document of any kind.
 defaultContext:
 - "https://www.w3.org/ns/activitystreams"
-- "https://w3id.org/security/data-integrity/v1"
+- "https://w3id.org/security/data-integrity/v2"
+- digestMultibase: "https://www.w3.org/ns/credentials/v2#digestMultibase"
 - "https://gotosocial.org/ns"
 properties: []

package/dist-tests/document.yaml

@@ -7,7 +7,8 @@ entity: true
 description: Represents a document of any kind.
 defaultContext:
 - "https://www.w3.org/ns/activitystreams"
-- "https://w3id.org/security/data-integrity/v1"
+- "https://w3id.org/security/data-integrity/v2"
+- digestMultibase: "https://www.w3.org/ns/credentials/v2#digestMultibase"
 - "https://gotosocial.org/ns"
 
 properties:
@@ -30,3 +31,15 @@ properties:
     device-independent pixels of the linked resource.
   range:
   - "http://www.w3.org/2001/XMLSchema#nonNegativeInteger"
+
+- singularName: digestMultibase
+  functional: true
+  compactName: digestMultibase
+  uri: "https://www.w3.org/ns/credentials/v2#digestMultibase"
+  description: |
+    The multibase-encoded integrity digest of an external resource represented
+    by this document.
+
+    See [FEP-ef61](https://w3id.org/fep/ef61) for details.
+  range:
+  - "http://www.w3.org/2001/XMLSchema#string"

package/dist-tests/endpoints.yaml

@@ -84,3 +84,17 @@ properties:
     objects which are not addressed to the `Public`` endpoint.
   range:
   - "http://www.w3.org/2001/XMLSchema#anyURI"
+
+- singularName: uploadMedia
+  functional: true
+  compactName: uploadMedia
+  uri: "https://www.w3.org/ns/activitystreams#uploadMedia"
+  description: |
+    Upload endpoint URI for this user for binary data, such as an image or
+    video, as described in the [ActivityPub Media
+    Upload](https://www.w3.org/wiki/SocialCG/ActivityPub/MediaUpload) extension.
+    Clients `POST` a `multipart/form-data` request containing a `file` part
+    (the binary payload) and an `object` part (an ActivityStreams object shell)
+    to this endpoint.
+  range:
+  - "http://www.w3.org/2001/XMLSchema#anyURI"

package/dist-tests/group.yaml

@@ -7,6 +7,7 @@ entity: true
 description: Represents a formal or informal collective of Actors.
 defaultContext:
 - "https://www.w3.org/ns/activitystreams"
+- "https://w3id.org/fep/ef61"
 - "https://w3id.org/security/v1"
 - "https://w3id.org/security/data-integrity/v1"
 - "https://www.w3.org/ns/did/v1"
@@ -78,6 +79,20 @@ properties:
   range:
   - "https://w3id.org/security#Multikey"
 
+- pluralName: gateways
+  singularName: gateway
+  singularAccessor: true
+  compactName: gateways
+  uri: "https://w3id.org/fep/ef61/gateways"
+  container: list
+  description: |
+    Gateways where the latest version of this portable actor object can be
+    retrieved.
+
+    See [FEP-ef61](https://w3id.org/fep/ef61) for details.
+  range:
+  - "fedify:gatewayUrl"
+
 - singularName: manuallyApprovesFollowers
   functional: true
   compactName: manuallyApprovesFollowers

package/dist-tests/image.yaml

@@ -7,6 +7,7 @@ entity: true
 description: An image document of any kind.
 defaultContext:
 - "https://www.w3.org/ns/activitystreams"
-- "https://w3id.org/security/data-integrity/v1"
+- "https://w3id.org/security/data-integrity/v2"
+- digestMultibase: "https://www.w3.org/ns/credentials/v2#digestMultibase"
 - "https://gotosocial.org/ns"
 properties: []

package/dist-tests/link.yaml

@@ -12,7 +12,9 @@ description: |
   object) to the resource identified by the `href`. Properties of
   the {@link Link} are properties of the reference as opposed to properties of
   the resource.
-defaultContext: "https://www.w3.org/ns/activitystreams"
+defaultContext:
+- "https://www.w3.org/ns/activitystreams"
+- "https://w3id.org/fep/ef61"
 
 properties:
 - singularName: href
@@ -48,6 +50,17 @@ properties:
   range:
   - "http://www.w3.org/2001/XMLSchema#string"
 
+- singularName: digestMultibase
+  functional: true
+  compactName: digestMultibase
+  uri: "https://www.w3.org/ns/credentials/v2#digestMultibase"
+  description: |
+    The multibase-encoded integrity digest of the linked resource.
+
+    See [FEP-ef61](https://w3id.org/fep/ef61) for details.
+  range:
+  - "http://www.w3.org/2001/XMLSchema#string"
+
 - pluralName: names
   singularName: name
   singularAccessor: true

package/dist-tests/lookup.test.mjs

@@ -1,7 +1,7 @@
 import { Temporal } from "temporal-polyfill";
 globalThis.addEventListener = () => {};
-import { A as Person, E as Object$1, T as Note, o as Collection } from "./vocab-BQ8y6QS7.mjs";
-import { c as esm_default, i as isActor, o as name, s as version } from "./actor-NhcklZK0.mjs";
+import { D as Note, M as Person, O as Object$1, o as Collection } from "./vocab-Bjwctrxn.mjs";
+import { c as esm_default, i as isActor, o as name, s as version } from "./actor-BQd8S953.mjs";
 import { t as getTypeId } from "./type-_BlsfT3S.mjs";
 import { t as assertInstanceOf } from "./utils-CQjrpUkt.mjs";
 import { createTestMeterProvider, createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
@@ -9,7 +9,7 @@ import { deepStrictEqual, equal, ok, rejects } from "node:assert/strict";
 import { lookupWebFinger } from "@fedify/webfinger";
 import { SpanStatusCode, trace } from "@opentelemetry/api";
 import { getLogger } from "@logtape/logtape";
-import { getDocumentLoader, haveSameIriOrigin, parseIri } from "@fedify/vocab-runtime";
+import { getDocumentLoader, haveSameFe34Origin, haveSameIriOrigin, parseIri } from "@fedify/vocab-runtime";
 import { delay } from "es-toolkit";
 //#region src/handle.ts
 /**
@@ -223,7 +223,7 @@ async function lookupObjectInternal(identifier, options = {}) {
 		}
 		throw error;
 	}
-	if (options.crossOrigin !== "trust" && object.id != null && !haveSameIriOrigin(object.id, documentUrl)) {
+	if (options.crossOrigin !== "trust" && object.id != null && !haveSameIriOrigin(object.id, documentUrl) && !haveSameFe34Origin(object.id, documentUrl)) {
 		if (options.crossOrigin === "throw") throw new Error(`The object's @id (${object.id.href}) has a different origin than the document URL (${remoteDoc.documentUrl}); refusing to return the object.  If you want to bypass this check and are aware of the security implications, set the crossOrigin option to "trust".`);
 		logger.warn("The object's @id ({objectId}) has a different origin than the document URL ({documentUrl}); refusing to return the object.  If you want to bypass this check and are aware of the security implications, set the crossOrigin option to \"trust\".", {
 			...remoteDoc,
@@ -538,6 +538,73 @@ test("FEP-fe34: lookupObject() cross-origin security", {
 		deepStrictEqual(result.id, new URL("https://example.com/note"));
 		deepStrictEqual(result.content, "This is a legitimate note from the same origin");
 	});
+	await t.step("same-authority non-FE34 IRIs are still trusted", async () => {
+		const atProtoDocumentLoader = async (url) => {
+			if (url === "https://gateway.example/at-item") return {
+				documentUrl: "at://did%3Aplc%3Aexample/collection/item",
+				contextUrl: null,
+				document: {
+					"@context": "https://www.w3.org/ns/activitystreams",
+					type: "Note",
+					id: "at://did:plc:example/collection/reply",
+					content: "AT Protocol note"
+				}
+			};
+			throw new Error(`Unexpected URL: ${url}`);
+		};
+		const result = await lookupObject("https://gateway.example/at-item", {
+			documentLoader: atProtoDocumentLoader,
+			contextLoader: mockDocumentLoader
+		});
+		assertInstanceOf(result, Note);
+		deepStrictEqual(result.id, new URL("at://did%3Aplc%3Aexample/collection/reply"));
+		deepStrictEqual(result.content, "AT Protocol note");
+	});
+	await t.step("portable object IDs are trusted by DID cryptographic origin", async () => {
+		const portableDocumentLoader = async (url) => {
+			if (url === "https://gateway.example/.well-known/apgateway/did:key:z6Mkabc/note") return {
+				documentUrl: "ap+ef61://did:key:z6Mkabc/note",
+				contextUrl: null,
+				document: {
+					"@context": "https://www.w3.org/ns/activitystreams",
+					type: "Note",
+					id: "ap://did:key:z6Mkabc/note",
+					content: "Portable note"
+				}
+			};
+			throw new Error(`Unexpected URL: ${url}`);
+		};
+		const result = await lookupObject("https://gateway.example/.well-known/apgateway/did:key:z6Mkabc/note", {
+			documentLoader: portableDocumentLoader,
+			contextLoader: mockDocumentLoader
+		});
+		assertInstanceOf(result, Note);
+		deepStrictEqual(result.content, "Portable note");
+	});
+	await t.step("portable object IDs reject mismatched cryptographic origins", async () => {
+		const portableDocumentLoader = async (url) => {
+			if (url === "https://gateway.example/.well-known/apgateway/did:key:z6Mkabc/note") return {
+				documentUrl: "ap+ef61://did:key:z6Mkabc/note",
+				contextUrl: null,
+				document: {
+					"@context": "https://www.w3.org/ns/activitystreams",
+					type: "Note",
+					id: "ap://did:key:z6Mkdef/note",
+					content: "Spoofed portable note"
+				}
+			};
+			throw new Error(`Unexpected URL: ${url}`);
+		};
+		deepStrictEqual(await lookupObject("https://gateway.example/.well-known/apgateway/did:key:z6Mkabc/note", {
+			documentLoader: portableDocumentLoader,
+			contextLoader: mockDocumentLoader
+		}), null);
+		await rejects(() => lookupObject("https://gateway.example/.well-known/apgateway/did:key:z6Mkabc/note", {
+			documentLoader: portableDocumentLoader,
+			contextLoader: mockDocumentLoader,
+			crossOrigin: "throw"
+		}), Error, "The object's @id (ap+ef61://did%3Akey%3Az6Mkdef/note) has a different origin than the document URL (ap+ef61://did:key:z6Mkabc/note)");
+	});
 	await t.step("objects without @id are trusted", async () => {
 		const noIdDocumentLoader = async (url) => {
 			if (url === "https://example.com/note") return {

package/dist-tests/organization.yaml

@@ -7,6 +7,7 @@ entity: true
 description: Represents an organization.
 defaultContext:
 - "https://www.w3.org/ns/activitystreams"
+- "https://w3id.org/fep/ef61"
 - "https://w3id.org/security/v1"
 - "https://w3id.org/security/data-integrity/v1"
 - "https://www.w3.org/ns/did/v1"
@@ -78,6 +79,20 @@ properties:
   range:
   - "https://w3id.org/security#Multikey"
 
+- pluralName: gateways
+  singularName: gateway
+  singularAccessor: true
+  compactName: gateways
+  uri: "https://w3id.org/fep/ef61/gateways"
+  container: list
+  description: |
+    Gateways where the latest version of this portable actor object can be
+    retrieved.
+
+    See [FEP-ef61](https://w3id.org/fep/ef61) for details.
+  range:
+  - "fedify:gatewayUrl"
+
 - singularName: manuallyApprovesFollowers
   functional: true
   compactName: manuallyApprovesFollowers

package/dist-tests/page.yaml

@@ -7,6 +7,7 @@ entity: true
 description: Represents a Web Page.
 defaultContext:
 - "https://www.w3.org/ns/activitystreams"
-- "https://w3id.org/security/data-integrity/v1"
+- "https://w3id.org/security/data-integrity/v2"
+- digestMultibase: "https://www.w3.org/ns/credentials/v2#digestMultibase"
 - "https://gotosocial.org/ns"
 properties: []

package/dist-tests/person.yaml

@@ -7,6 +7,7 @@ entity: true
 description: Represents an individual person.
 defaultContext:
 - "https://www.w3.org/ns/activitystreams"
+- "https://w3id.org/fep/ef61"
 - "https://w3id.org/security/v1"
 - "https://w3id.org/security/data-integrity/v1"
 - "https://www.w3.org/ns/did/v1"
@@ -78,6 +79,20 @@ properties:
   range:
   - "https://w3id.org/security#Multikey"
 
+- pluralName: gateways
+  singularName: gateway
+  singularAccessor: true
+  compactName: gateways
+  uri: "https://w3id.org/fep/ef61/gateways"
+  container: list
+  description: |
+    Gateways where the latest version of this portable actor object can be
+    retrieved.
+
+    See [FEP-ef61](https://w3id.org/fep/ef61) for details.
+  range:
+  - "fedify:gatewayUrl"
+
 - singularName: manuallyApprovesFollowers
   functional: true
   compactName: manuallyApprovesFollowers

package/dist-tests/service.yaml

@@ -7,6 +7,7 @@ entity: true
 description: Represents a service of any kind.
 defaultContext:
 - "https://www.w3.org/ns/activitystreams"
+- "https://w3id.org/fep/ef61"
 - "https://w3id.org/security/v1"
 - "https://w3id.org/security/data-integrity/v1"
 - "https://www.w3.org/ns/did/v1"
@@ -78,6 +79,20 @@ properties:
   range:
   - "https://w3id.org/security#Multikey"
 
+- pluralName: gateways
+  singularName: gateway
+  singularAccessor: true
+  compactName: gateways
+  uri: "https://w3id.org/fep/ef61/gateways"
+  container: list
+  description: |
+    Gateways where the latest version of this portable actor object can be
+    retrieved.
+
+    See [FEP-ef61](https://w3id.org/fep/ef61) for details.
+  range:
+  - "fedify:gatewayUrl"
+
 - singularName: manuallyApprovesFollowers
   functional: true
   compactName: manuallyApprovesFollowers

package/dist-tests/type.test.mjs

@@ -1,6 +1,6 @@
 import "temporal-polyfill";
 globalThis.addEventListener = () => {};
-import { A as Person, B as getEntityTypeById, C as Link, V as isEntityType } from "./vocab-BQ8y6QS7.mjs";
+import { H as getEntityTypeById, M as Person, U as isEntityType, w as Link } from "./vocab-Bjwctrxn.mjs";
 import { t as getTypeId } from "./type-_BlsfT3S.mjs";
 import { test } from "@fedify/fixture";
 import { deepStrictEqual } from "node:assert/strict";

package/dist-tests/video.yaml

@@ -7,6 +7,7 @@ entity: true
 description: Represents a video document of any kind.
 defaultContext:
 - "https://www.w3.org/ns/activitystreams"
-- "https://w3id.org/security/data-integrity/v1"
+- "https://w3id.org/security/data-integrity/v2"
+- digestMultibase: "https://www.w3.org/ns/credentials/v2#digestMultibase"
 - "https://gotosocial.org/ns"
 properties: []