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

package/CHANGES.md

@@ -16,6 +16,9 @@ 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]]
+
  -  Fixed a bug of the `fedify inbox` command where it had failed to render
     the web interface when the `fedify` command was installed using
     `deno install` command from JSR.
@@ -27,6 +30,7 @@ To be released.
      -  You can easily copy the fediverse handle of the ephemeral actor.
 
 [#209]: https://github.com/fedify-dev/fedify/issues/209
+[#211]: https://github.com/fedify-dev/fedify/issues/211
 
 
 Version 1.4.2

package/esm/deno.js

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

package/esm/runtime/key.js

@@ -95,7 +95,7 @@ export async function importMultibaseKey(key) {
             type: "pkcs1",
         });
         const spki = keyObject.export({ type: "spki", format: "der" }).buffer;
-        return await dntShim.crypto.subtle.importKey("spki", spki, { name: "RSASSA-PKCS1-v1_5", hash: "SHA-256" }, true, ["verify"]);
+        return await dntShim.crypto.subtle.importKey("spki", new Uint8Array(spki), { name: "RSASSA-PKCS1-v1_5", hash: "SHA-256" }, true, ["verify"]);
     }
     else if (code === 0xed) { // ed25519-pub
         return await dntShim.crypto.subtle.importKey("raw", content, "Ed25519", true, ["verify"]);

package/esm/sig/key.js

@@ -208,12 +208,20 @@ cls, { documentLoader, contextLoader, keyCache, tracerProvider } = {}) {
                 contextLoader,
                 tracerProvider,
             });
+        let length = 0;
+        let lastKey = null;
         for await (const k of keys) {
+            length++;
+            lastKey = k;
             if (k.id?.href === keyId) {
                 key = k;
                 break;
             }
         }
+        const keyIdUrl = new URL(keyId);
+        if (key == null && keyIdUrl.hash === "" && length === 1) {
+            key = lastKey;
+        }
         if (key == null) {
             logger.debug("Failed to verify; object {keyId} returned an {actorType}, " +
                 "but has no key matching {keyId}.", { keyId, actorType: object.constructor.name });