From 0e547fce3d053370c5978a05bcd817bb3eca54ba Mon Sep 17 00:00:00 2001
From: usbharu <64310155+usbharu@users.noreply.github.com>
Date: Thu, 21 Dec 2023 13:36:45 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=89=8A=E9=99=A4=E6=B8=88=E3=81=BF?=
 =?UTF-8?q?=E3=83=A6=E3=83=BC=E3=82=B6=E3=83=BC=E3=81=A8=E3=82=A2=E3=82=AF?=
 =?UTF-8?q?=E3=83=86=E3=82=A3=E3=83=93=E3=83=86=E3=82=A3actor=E3=81=8C?=
 =?UTF-8?q?=E3=81=AA=E3=81=84=E3=81=A8=E3=81=8D=E3=81=AE=E3=83=95=E3=82=A9?=
 =?UTF-8?q?=E3=83=BC=E3=83=AB=E3=83=90=E3=83=83=E3=82=AF=E3=82=92=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/e2eTest/resources/application.yml         |  3 +
 .../service/inbox/InboxJobProcessor.kt        | 10 +++-
 .../hideout/core/domain/model/actor/Actor.kt  | 60 +++++++++++++------
 3 files changed, 55 insertions(+), 18 deletions(-)

diff --git a/src/e2eTest/resources/application.yml b/src/e2eTest/resources/application.yml
index 330660e2..dcd84955 100644
--- a/src/e2eTest/resources/application.yml
+++ b/src/e2eTest/resources/application.yml
@@ -9,6 +9,9 @@ hideout:
       public-key: "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu1SU1LfVLPHCozMxH2Mo4lgOEePzNm0tRgeLezV6ffAt0gunVTLw7onLRnrq0/IzW7yWR7QkrmBL7jTKEn5u+qKhbwKfBstIs+bMY2Zkp18gnTxKLxoS2tFczGkPLPgizskuemMghRniWaoLcyehkd3qqGElvW/VDL5AaWTg0nLVkjRo9z+40RQzuVaE8AkAFmxZzow3x+VJYKdjykkJ0iT9wCS0DRTXu269V264Vf/3jvredZiKRkgwlL9xNAwxXFg0x/XFw005UWVRIkdgcKWTjpBP2dPwVZ4WWC+9aGVd+Gyn1o0CLelf4rEjGoXbAAEgAqeGUxrcIlbjXfbcmwIDAQAB"
   storage:
     type: local
+  debug:
+    trace-query-exception: true
+    trace-query-call: true
 
 spring:
   flyway:
diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/inbox/InboxJobProcessor.kt b/src/main/kotlin/dev/usbharu/hideout/activitypub/service/inbox/InboxJobProcessor.kt
index 660f5958..f090390e 100644
--- a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/inbox/InboxJobProcessor.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/activitypub/service/inbox/InboxJobProcessor.kt
@@ -94,7 +94,15 @@ class InboxJobProcessor(
 
         //todo 不正なactorを取得してしまわないようにする
         val verify =
-            signature?.let { verifyHttpSignature(httpRequest, it, transaction, jsonNode["actor"].textValue()) } ?: false
+            signature?.let {
+                verifyHttpSignature(
+                    httpRequest,
+                    it,
+                    transaction,
+                    jsonNode.get("actor")?.asText() ?: signature.keyId
+                )
+            }
+                ?: false
 
         logger.debug("Is verifying success? {}", verify)
 
diff --git a/src/main/kotlin/dev/usbharu/hideout/core/domain/model/actor/Actor.kt b/src/main/kotlin/dev/usbharu/hideout/core/domain/model/actor/Actor.kt
index 3833e71a..5eb351e3 100644
--- a/src/main/kotlin/dev/usbharu/hideout/core/domain/model/actor/Actor.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/core/domain/model/actor/Actor.kt
@@ -57,6 +57,32 @@ data class Actor private constructor(
             postsCount: Int = 0,
             lastPostDate: Instant? = null
         ): Actor {
+
+            if (id == 0L) {
+                return Actor(
+                    id = id,
+                    name = name,
+                    domain = domain,
+                    screenName = screenName,
+                    description = description,
+                    inbox = inbox,
+                    outbox = outbox,
+                    url = url,
+                    publicKey = publicKey,
+                    privateKey = privateKey,
+                    createdAt = createdAt,
+                    keyId = keyId,
+                    followers = followers,
+                    following = following,
+                    instance = instance,
+                    locked = locked,
+                    followersCount = followersCount,
+                    followingCount = followingCount,
+                    postsCount = postsCount,
+                    lastPostDate = lastPostDate
+                )
+            }
+
             // idは0未満ではいけない
             require(id >= 0) { "id must be greater than or equal to 0." }
 
@@ -184,22 +210,22 @@ data class Actor private constructor(
 
     override fun toString(): String {
         return "Actor(" +
-            "id=$id, " +
-            "name='$name', " +
-            "domain='$domain', " +
-            "screenName='$screenName', " +
-            "description='$description', " +
-            "inbox='$inbox', " +
-            "outbox='$outbox', " +
-            "url='$url', " +
-            "publicKey='$publicKey', " +
-            "privateKey=$privateKey, " +
-            "createdAt=$createdAt, " +
-            "keyId='$keyId', " +
-            "followers=$followers, " +
-            "following=$following, " +
-            "instance=$instance, " +
-            "locked=$locked" +
-            ")"
+                "id=$id, " +
+                "name='$name', " +
+                "domain='$domain', " +
+                "screenName='$screenName', " +
+                "description='$description', " +
+                "inbox='$inbox', " +
+                "outbox='$outbox', " +
+                "url='$url', " +
+                "publicKey='$publicKey', " +
+                "privateKey=$privateKey, " +
+                "createdAt=$createdAt, " +
+                "keyId='$keyId', " +
+                "followers=$followers, " +
+                "following=$following, " +
+                "instance=$instance, " +
+                "locked=$locked" +
+                ")"
     }
 }