@fedify/fedify 1.5.0-dev.672 → 1.5.0-dev.679

package/CHANGES.md

@@ -8,6 +8,14 @@ Version 1.5.0
 
 To be released.
 
+ -  A `Federation` object now can have a canonical origin for web URLs and
+    a canonical host for fediverse handles.  This affects the URLs constructed
+    by `Context` objects, and the WebFinger responses.
+
+     -  Added `CreateFederationOptions.origin` option.
+     -  Added `FederationOrigin` interface.
+     -  Added `Context.canonicalOrigin` property.
+
  -  Fedify now accepts PEM-PKCS#1 besides PEM-SPKI for RSA public keys.
     [[#209]]
 
@@ -16,8 +24,8 @@ To be released.
      -  Added `importPkcs1()` function.
      -  Added `importPem()` function.
 
- -  Fedify became to choose the public key of the actor if `keyId` has no
-    fragment and the actor has only one public key.  [[#211]]
+ -  The `fetchKey()` function became to choose the public key of the actor
+    if `keyId` has no fragment and the actor has only one public key.  [[#211]]
 
  -  Fixed a bug of the `fedify inbox` command where it had failed to render
     the web interface when the `fedify` command was installed using
@@ -33,6 +41,19 @@ To be released.
 [#211]: https://github.com/fedify-dev/fedify/issues/211
 
 
+Version 1.4.3
+-------------
+
+Released on February 22, 2025.
+
+ -  Added the following default contexts to `Follow`, `Undo`, and `Update`
+    classes:
+
+     -  <https://w3id.org/security/v1>
+     -  <https://www.w3.org/ns/did/v1>
+     -  <https://w3id.org/security/multikey/v1>
+
+
 Version 1.4.2
 -------------
 
@@ -144,6 +165,19 @@ Released on February 5, 2025.
 [#195]: https://github.com/fedify-dev/fedify/issues/195
 
 
+Version 1.3.10
+--------------
+
+Released on February 22, 2025.
+
+ -  Added the following default contexts to `Follow`, `Undo`, and `Update`
+    classes:
+
+     -  <https://w3id.org/security/v1>
+     -  <https://www.w3.org/ns/did/v1>
+     -  <https://w3id.org/security/multikey/v1>
+
+
 Version 1.3.9
 -------------
 
@@ -371,6 +405,19 @@ Released on November 30, 2024.
 [#193]: https://github.com/fedify-dev/fedify/issues/193
 
 
+Version 1.2.14
+--------------
+
+Released on February 22, 2025.
+
+ -  Added the following default contexts to `Follow`, `Undo`, and `Update`
+    classes:
+
+     -  <https://w3id.org/security/v1>
+     -  <https://www.w3.org/ns/did/v1>
+     -  <https://w3id.org/security/multikey/v1>
+
+
 Version 1.2.13
 --------------
 
@@ -644,6 +691,19 @@ Released on October 31, 2024.
 [#118]: https://github.com/fedify-dev/fedify/issues/118
 
 
+Version 1.1.14
+--------------
+
+Released on February 22, 2025.
+
+ -  Added the following default contexts to `Follow`, `Undo`, and `Update`
+    classes:
+
+     -  <https://w3id.org/security/v1>
+     -  <https://www.w3.org/ns/did/v1>
+     -  <https://w3id.org/security/multikey/v1>
+
+
 Version 1.1.13
 --------------
 
@@ -958,6 +1018,19 @@ Released on October 20, 2024.
 [#150]: https://github.com/fedify-dev/fedify/issues/150
 
 
+Version 1.0.17
+--------------
+
+Released on February 22, 2025.
+
+ -  Added the following default contexts to `Follow`, `Undo`, and `Update`
+    classes:
+
+     -  <https://w3id.org/security/v1>
+     -  <https://www.w3.org/ns/did/v1>
+     -  <https://w3id.org/security/multikey/v1>
+
+
 Version 1.0.16
 --------------
 

package/esm/deno.js

@@ -1,6 +1,6 @@
 export default {
     "name": "@fedify/fedify",
-    "version": "1.5.0-dev.672+6a6ed659",
+    "version": "1.5.0-dev.679+0f44ca2e",
     "license": "MIT",
     "exports": {
         ".": "./mod.ts",

package/esm/federation/middleware.js

@@ -40,6 +40,7 @@ export class FederationImpl {
     inboxQueueStarted;
     outboxQueueStarted;
     manuallyStartQueue;
+    origin;
     router;
     nodeInfoDispatcher;
     actorCallbacks;
@@ -94,6 +95,37 @@ export class FederationImpl {
         this.inboxQueueStarted = false;
         this.outboxQueueStarted = false;
         this.manuallyStartQueue = options.manuallyStartQueue ?? false;
+        if (options.origin != null) {
+            if (typeof options.origin === "string") {
+                if (!URL.canParse(options.origin) || !options.origin.match(/^https?:\/\//)) {
+                    throw new TypeError(`Invalid origin: ${JSON.stringify(options.origin)}`);
+                }
+                const origin = new URL(options.origin);
+                if (!origin.pathname.match(/^\/*$/) || origin.search !== "" ||
+                    origin.hash !== "") {
+                    throw new TypeError(`Invalid origin: ${JSON.stringify(options.origin)}`);
+                }
+                this.origin = { handleHost: origin.host, webOrigin: origin.origin };
+            }
+            else {
+                const { handleHost, webOrigin } = options.origin;
+                if (!URL.canParse(`https://${handleHost}/`) || handleHost.includes("/")) {
+                    throw new TypeError(`Invalid origin.handleHost: ${JSON.stringify(handleHost)}`);
+                }
+                if (!URL.canParse(webOrigin) || !webOrigin.match(/^https?:\/\//)) {
+                    throw new TypeError(`Invalid origin.webOrigin: ${JSON.stringify(webOrigin)}`);
+                }
+                const webOriginUrl = new URL(webOrigin);
+                if (!webOriginUrl.pathname.match(/^\/*$/) || webOriginUrl.search !== "" ||
+                    webOriginUrl.hash !== "") {
+                    throw new TypeError(`Invalid origin.webOrigin: ${JSON.stringify(webOrigin)}`);
+                }
+                this.origin = {
+                    handleHost: new URL(`https://${handleHost}/`).host,
+                    webOrigin: webOriginUrl.origin,
+                };
+            }
+        }
         this.router = new Router({
             trailingSlashInsensitive: options.trailingSlashInsensitive,
         });
@@ -1318,6 +1350,7 @@ export class FederationImpl {
             case "webfinger":
                 return await handleWebFinger(request, {
                     context,
+                    host: this.origin?.handleHost,
                     actorDispatcher: this.actorCallbacks?.dispatcher,
                     actorHandleMapper: this.actorCallbacks?.handleMapper,
                     actorAliasMapper: this.actorCallbacks?.aliasMapper,
@@ -1536,6 +1569,9 @@ export class ContextImpl {
     get origin() {
         return this.url.origin;
     }
+    get canonicalOrigin() {
+        return this.federation.origin?.webOrigin ?? this.origin;
+    }
     get tracerProvider() {
         return this.federation.tracerProvider;
     }
@@ -1544,14 +1580,14 @@ export class ContextImpl {
         if (path == null) {
             throw new RouterError("No NodeInfo dispatcher registered.");
         }
-        return new URL(path, this.url);
+        return new URL(path, this.canonicalOrigin);
     }
     getActorUri(identifier) {
         const path = this.federation.router.build("actor", { identifier, handle: identifier });
         if (path == null) {
             throw new RouterError("No actor dispatcher registered.");
         }
-        return new URL(path, this.url);
+        return new URL(path, this.canonicalOrigin);
     }
     getObjectUri(
     // deno-lint-ignore no-explicit-any
@@ -1569,14 +1605,14 @@ export class ContextImpl {
         if (path == null) {
             throw new RouterError("No object dispatcher registered.");
         }
-        return new URL(path, this.url);
+        return new URL(path, this.canonicalOrigin);
     }
     getOutboxUri(identifier) {
         const path = this.federation.router.build("outbox", { identifier, handle: identifier });
         if (path == null) {
             throw new RouterError("No outbox dispatcher registered.");
         }
-        return new URL(path, this.url);
+        return new URL(path, this.canonicalOrigin);
     }
     getInboxUri(identifier) {
         if (identifier == null) {
@@ -1584,54 +1620,55 @@ export class ContextImpl {
             if (path == null) {
                 throw new RouterError("No shared inbox path registered.");
             }
-            return new URL(path, this.url);
+            return new URL(path, this.canonicalOrigin);
         }
         const path = this.federation.router.build("inbox", { identifier, handle: identifier });
         if (path == null) {
             throw new RouterError("No inbox path registered.");
         }
-        return new URL(path, this.url);
+        return new URL(path, this.canonicalOrigin);
     }
     getFollowingUri(identifier) {
         const path = this.federation.router.build("following", { identifier, handle: identifier });
         if (path == null) {
             throw new RouterError("No following collection path registered.");
         }
-        return new URL(path, this.url);
+        return new URL(path, this.canonicalOrigin);
     }
     getFollowersUri(identifier) {
         const path = this.federation.router.build("followers", { identifier, handle: identifier });
         if (path == null) {
             throw new RouterError("No followers collection path registered.");
         }
-        return new URL(path, this.url);
+        return new URL(path, this.canonicalOrigin);
     }
     getLikedUri(identifier) {
         const path = this.federation.router.build("liked", { identifier, handle: identifier });
         if (path == null) {
             throw new RouterError("No liked collection path registered.");
         }
-        return new URL(path, this.url);
+        return new URL(path, this.canonicalOrigin);
     }
     getFeaturedUri(identifier) {
         const path = this.federation.router.build("featured", { identifier, handle: identifier });
         if (path == null) {
             throw new RouterError("No featured collection path registered.");
         }
-        return new URL(path, this.url);
+        return new URL(path, this.canonicalOrigin);
     }
     getFeaturedTagsUri(identifier) {
         const path = this.federation.router.build("featuredTags", { identifier, handle: identifier });
         if (path == null) {
             throw new RouterError("No featured tags collection path registered.");
         }
-        return new URL(path, this.url);
+        return new URL(path, this.canonicalOrigin);
     }
     parseUri(uri) {
         if (uri == null)
             return null;
-        if (uri.origin !== this.url.origin)
+        if (uri.origin !== this.origin && uri.origin !== this.canonicalOrigin) {
             return null;
+        }
         const route = this.federation.router.route(uri.pathname);
         const logger = getLogger(["fedify", "federation"]);
         if (route == null)
@@ -1798,7 +1835,7 @@ export class ContextImpl {
             logger.warn("No actor dispatcher registered.");
             return [];
         }
-        const actorUri = new URL(path, this.url);
+        const actorUri = new URL(path, this.canonicalOrigin);
         const keyPairs = await this.federation.actorCallbacks?.keyPairsDispatcher(new ContextImpl({
             ...this,
             invokedFromActorKeyPairsDispatcher: { identifier },
@@ -1994,7 +2031,7 @@ export class ContextImpl {
             const collectionId = this.federation.router.build("followers", { identifier, handle: identifier });
             opts.collectionSync = collectionId == null
                 ? undefined
-                : new URL(collectionId, this.url).href;
+                : new URL(collectionId, this.canonicalOrigin).href;
         }
         else {
             expandedRecipients = [recipients];

package/esm/vocab/follow.yaml

@@ -12,5 +12,8 @@ description: |
 defaultContext:
 - "https://w3id.org/identity/v1"
 - "https://www.w3.org/ns/activitystreams"
+- "https://w3id.org/security/v1"
 - "https://w3id.org/security/data-integrity/v1"
+- "https://www.w3.org/ns/did/v1"
+- "https://w3id.org/security/multikey/v1"
 properties: []

package/esm/vocab/undo.yaml

@@ -15,5 +15,8 @@ description: |
 defaultContext:
 - "https://w3id.org/identity/v1"
 - "https://www.w3.org/ns/activitystreams"
+- "https://w3id.org/security/v1"
 - "https://w3id.org/security/data-integrity/v1"
+- "https://www.w3.org/ns/did/v1"
+- "https://w3id.org/security/multikey/v1"
 properties: []

package/esm/vocab/update.yaml

@@ -13,7 +13,10 @@ description: |
 defaultContext:
 - "https://w3id.org/identity/v1"
 - "https://www.w3.org/ns/activitystreams"
+- "https://w3id.org/security/v1"
 - "https://w3id.org/security/data-integrity/v1"
+- "https://www.w3.org/ns/did/v1"
+- "https://w3id.org/security/multikey/v1"
 - alsoKnownAs:
     "@id": "as:alsoKnownAs"
     "@type": "@id"