From 72ce47b2681b2910ccc81e042e8cbd386f6d82cb Mon Sep 17 00:00:00 2001
From: usbharu <64310155+usbharu@users.noreply.github.com>
Date: Fri, 31 Mar 2023 12:36:35 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20Signature=E3=83=98=E3=83=83=E3=83=80?=
 =?UTF-8?q?=E3=83=BC=E3=82=92=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/kotlin/dev/usbharu/hideout/plugins/ActivityPub.kt      | 2 +-
 .../dev/usbharu/hideout/service/ActivityPubUserService.kt       | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/kotlin/dev/usbharu/hideout/plugins/ActivityPub.kt b/src/main/kotlin/dev/usbharu/hideout/plugins/ActivityPub.kt
index c0910735..9a825d29 100644
--- a/src/main/kotlin/dev/usbharu/hideout/plugins/ActivityPub.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/plugins/ActivityPub.kt
@@ -100,7 +100,7 @@ val httpSignaturePlugin = createClientPlugin("HttpSign",::HttpSignaturePluginCon
                 }
             }
 
-            val builder = HttpMessageSigner.builder().algorithm(algorithmType).keyId(keyId).keyMap(keyMap)
+            val builder = HttpMessageSigner.builder().algorithm(algorithmType).keyId("${Config.configData.url}/users/$keyId/pubkey").keyMap(keyMap)
             var tmp = builder
             headers.forEach {
                 tmp = tmp.addHeaderToSign(it)
diff --git a/src/main/kotlin/dev/usbharu/hideout/service/ActivityPubUserService.kt b/src/main/kotlin/dev/usbharu/hideout/service/ActivityPubUserService.kt
index d4f9d18c..081f0366 100644
--- a/src/main/kotlin/dev/usbharu/hideout/service/ActivityPubUserService.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/service/ActivityPubUserService.kt
@@ -50,6 +50,7 @@ class ActivityPubUserService(
         val inboxUrl = person.inbox ?: throw IllegalArgumentException("inbox is not found")
         httpClient.post(inboxUrl) {
             contentType(ContentType.Application.Activity)
+            header("Signature","keyId=\"${person.preferredUsername}\",algorithm=\"rsa-sha256\",headers=\"(request-target) host date\"")
             setBody(Accept(
                     name = "Follow",
                     `object` = follow,