@evanp/activitypub-bot 0.26.1 → 0.26.3

package/lib/httpsignatureauthenticator.js

@@ -49,6 +49,9 @@ export class HTTPSignatureAuthenticator {
     try {
       const keyId = this.#signer.keyId(signature)
       const ok = await this.#remoteKeyStorage.getPublicKey(keyId)
+      if (!ok) {
+        throw createHttpError(400, 'public key not found')
+      }
       let owner = ok.owner
       let publicKeyPem = ok.publicKeyPem
       let result = await this.#signer.validate(publicKeyPem, signature, method, originalUrl, headers)

package/lib/routes/server.js

@@ -5,32 +5,35 @@ const router = express.Router()
 
 router.get('/', async (req, res) => {
   const fullUrl = `${req.protocol}://${req.get('host')}${req.originalUrl}`
+  const sendJson = async () => {
+    const { formatter } = req.app.locals
+    const server = await as2.import({
+      '@context': [
+        'https://www.w3.org/ns/activitystreams',
+        'https://w3id.org/security/v1'
+      ],
+      id: formatter.format({ server: true }),
+      type: 'Service',
+      publicKey: formatter.format({ server: true, type: 'publickey' }),
+      url: {
+        type: 'Link',
+        mediaType: 'text/html',
+        href: fullUrl
+      }
+    })
+    const body = await server.export({ useOriginalContext: true })
+    res.status(200)
+    res.type(as2.mediaType)
+    res.json(body)
+  }
   res.format({
     html: async () => {
       const { indexFileName } = req.app.locals
       res.sendFile(indexFileName)
     },
-    json: async () => {
-      const { formatter } = req.app.locals
-      const server = await as2.import({
-        '@context': [
-          'https://www.w3.org/ns/activitystreams',
-          'https://w3id.org/security/v1'
-        ],
-        id: formatter.format({ server: true }),
-        type: 'Service',
-        publicKey: formatter.format({ server: true, type: 'publickey' }),
-        url: {
-          type: 'Link',
-          mediaType: 'text/html',
-          href: fullUrl
-        }
-      })
-      const body = await server.export({ useOriginalContext: true })
-      res.status(200)
-      res.type(as2.mediaType)
-      res.json(body)
-    }
+    'application/activity+json': sendJson,
+    'application/ld+json': sendJson,
+    json: sendJson
   })
 })
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@evanp/activitypub-bot",
-  "version": "0.26.1",
+  "version": "0.26.3",
   "description": "server-side ActivityPub bot framework",
   "type": "module",
   "main": "lib/index.js",