@evanp/activitypub-bot 0.39.1 → 0.39.3

package/lib/activitypubclient.js

@@ -160,15 +160,17 @@ export class ActivityPubClient {
     }
     this.#logger.debug({ headers }, 'Sending headers')
     const method = 'GET'
-    this.#logger.debug({ url: baseUrl }, 'Signing GET request')
     let storedPolicy, lastPolicy
     if (sign) {
+      this.#logger.debug({ url: baseUrl }, 'Signing GET request')
       storedPolicy = await this.#policyStorage.get(parsed.origin)
       if (!storedPolicy || storedPolicy === SignaturePolicyStorage.RFC9421) {
+        this.#logger.debug({ origin: parsed.origin, storedPolicy }, 'Signing with RFC 9421')
         lastPolicy = SignaturePolicyStorage.RFC9421
         const sigHeaders = await this.#messageSign({ username, url: baseUrl, method, headers })
         Object.assign(headers, sigHeaders || {})
       } else if (storedPolicy === SignaturePolicyStorage.DRAFT_CAVAGE_12) {
+        this.#logger.debug({ origin: parsed.origin, storedPolicy }, 'Signing with draft-cavage-12')
         lastPolicy = SignaturePolicyStorage.DRAFT_CAVAGE_12
         headers.signature =
         await this.#sign({ username, url: baseUrl, method, headers })
@@ -190,6 +192,10 @@ export class ActivityPubClient {
     if ([401, 403].includes(res.status) &&
         sign &&
         !storedPolicy) {
+      const body = await res.text()
+      this.#logger.debug(
+        { url, status: res.status, body, headers: res.headers },
+        'Authentication error; retrying with draft-cavage-12 signature')
       lastPolicy = SignaturePolicyStorage.DRAFT_CAVAGE_12
       delete headers['signature-input']
       headers.signature =
@@ -272,23 +278,32 @@ export class ActivityPubClient {
     const json = await obj.export()
     this.#fixupJson(json)
     const body = JSON.stringify(json)
-    const headers = {
+    const digest = await this.#digester.digest(body)
+    const contentDigest = await this.#digester.contentDigest(body)
+    const baseHeaders = {
       date: new Date().toUTCString(),
       'user-agent': ActivityPubClient.#userAgent,
-      'content-type': 'application/activity+json',
-      digest: await this.#digester.digest(body)
+      'content-type': 'application/activity+json'
     }
     const method = 'POST'
-    assert.ok(headers)
+    let headers
     this.#logger.debug({ url }, 'Signing POST')
     let lastPolicy
     const storedPolicy = await this.#policyStorage.get(parsed.origin)
     if (!storedPolicy || storedPolicy === SignaturePolicyStorage.RFC9421) {
       lastPolicy = SignaturePolicyStorage.RFC9421
+      headers = {
+        ...baseHeaders,
+        'content-digest': contentDigest
+      }
       const sigHeaders = await this.#messageSign({ username, url, method, headers })
       Object.assign(headers, sigHeaders || {})
     } else if (storedPolicy === SignaturePolicyStorage.DRAFT_CAVAGE_12) {
       lastPolicy = SignaturePolicyStorage.DRAFT_CAVAGE_12
+      headers = {
+        ...baseHeaders,
+        digest
+      }
       headers.signature =
         await this.#sign({ username, url, method, headers })
     } else {
@@ -307,7 +322,10 @@ export class ActivityPubClient {
     )
     if ([401, 403].includes(res.status) && !storedPolicy) {
       lastPolicy = SignaturePolicyStorage.DRAFT_CAVAGE_12
-      delete headers['signature-input']
+      headers = {
+        ...baseHeaders,
+        digest
+      }
       headers.signature =
         await this.#sign({ username, url, method, headers })
       res = await fetch(url,

package/package.json

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