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

package/src/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/src/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/src/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/src/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/src/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/src/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/src/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/src/lookup.test.ts

@@ -416,6 +416,127 @@ test("FEP-fe34: lookupObject() cross-origin security", {
     );
   });
 
+  await t.step(
+    "same-authority non-FE34 IRIs are still trusted",
+    async () => {
+      // deno-lint-ignore require-await
+      const atProtoDocumentLoader = async (url: string) => {
+        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 () => {
+      // deno-lint-ignore require-await
+      const portableDocumentLoader = async (url: string) => {
+        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 () => {
+      // deno-lint-ignore require-await
+      const portableDocumentLoader = async (url: string) => {
+        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}`);
+      };
+
+      const result = await lookupObject(
+        "https://gateway.example/.well-known/apgateway/did:key:z6Mkabc/note",
+        {
+          documentLoader: portableDocumentLoader,
+          contextLoader: mockDocumentLoader,
+        },
+      );
+
+      deepStrictEqual(result, 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 () => {
     // deno-lint-ignore require-await
     const noIdDocumentLoader = async (url: string) => {

package/src/lookup.ts

@@ -2,6 +2,7 @@ import type { GetUserAgentOptions } from "@fedify/vocab-runtime";
 import {
   type DocumentLoader,
   getDocumentLoader,
+  haveSameFe34Origin,
   haveSameIriOrigin,
   parseIri,
   type RemoteDocument,
@@ -335,7 +336,8 @@ async function lookupObjectInternal(
   }
   if (
     options.crossOrigin !== "trust" && object.id != null &&
-    !haveSameIriOrigin(object.id, documentUrl)
+    !haveSameIriOrigin(object.id, documentUrl) &&
+    !haveSameFe34Origin(object.id, documentUrl)
   ) {
     if (options.crossOrigin === "throw") {
       throw new Error(

package/src/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/src/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/src/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/src/preprocessors.ts

@@ -7,7 +7,8 @@ import { Image, Link } from "./vocab.ts";
  * When an `icon` or `image` property on a vocabulary object contains an
  * explicit ActivityStreams `Link` rather than an `Image`, this preprocessor
  * converts it into an `Image` by mapping `href` to `url`, copying
- * `mediaType`, `name`, `width`, and `height`, and discarding the rest.
+ * `mediaType`, `name`, `width`, `height`, and `digestMultibase`, and
+ * discarding the rest.
  *
  * If the value is not a Link, or the Link has no `href`, it returns
  * `undefined` so the normal range decoder continues.
@@ -44,5 +45,6 @@ export const normalizeLinkToImage: PropertyPreprocessor<Image> = async (
     names: link.names != null && link.names.length > 0 ? link.names : undefined,
     width: link.width,
     height: link.height,
+    digestMultibase: link.digestMultibase,
   });
 };

package/src/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/src/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: []