From 2367eb3c8878e658be3654d7c62fe718e9c29327 Mon Sep 17 00:00:00 2001
From: usbharu <64310155+usbharu@users.noreply.github.com>
Date: Wed, 21 Feb 2024 00:16:28 +0900
Subject: [PATCH] =?UTF-8?q?refactor:=20=E9=95=B7=E9=81=8E=E3=81=8E?=
 =?UTF-8?q?=E3=82=8B=E9=96=A2=E6=95=B0=E3=82=92=E5=88=86=E5=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/inbox/InboxControllerImpl.kt          | 75 +++++++++++--------
 1 file changed, 43 insertions(+), 32 deletions(-)

diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/inbox/InboxControllerImpl.kt b/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/inbox/InboxControllerImpl.kt
index 19bad740..4fe13562 100644
--- a/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/inbox/InboxControllerImpl.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/inbox/InboxControllerImpl.kt
@@ -41,7 +41,6 @@ class InboxControllerImpl(
     override suspend fun inbox(
         httpServletRequest: HttpServletRequest,
     ): ResponseEntity<String> {
-
         val headersList = httpServletRequest.headerNames?.toList().orEmpty()
         LOGGER.trace("Inbox Headers {}", headersList)
 
@@ -49,38 +48,10 @@ class InboxControllerImpl(
             httpServletRequest.inputStream.readAllBytes()!!
         }
 
-        try {
-            httpSignatureHeaderChecker.checkDate(httpServletRequest.getHeader("date")!!)
-        } catch (e: NullPointerException) {
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body("Required date header")
-        } catch (e: IllegalArgumentException) {
-            return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body("Request is too old.")
-        }
-        try {
-            httpSignatureHeaderChecker.checkHost(httpServletRequest.getHeader("host")!!)
-        } catch (e: NullPointerException) {
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body("Required host header")
-        } catch (e: IllegalArgumentException) {
-            return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body("Wrong host for request")
-        }
-        try {
-            httpSignatureHeaderChecker.checkDigest(body, httpServletRequest.getHeader("digest")!!)
-        } catch (e: NullPointerException) {
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST)
-                .body("Required request body digest in digest header (sha256)")
-        } catch (e: IllegalArgumentException) {
-            return ResponseEntity
-                .status(HttpStatus.UNAUTHORIZED)
-                .body("Wrong digest for request")
-        }
+        val responseEntity = checkHeader(httpServletRequest, body)
 
-        if (httpServletRequest.getHeader("signature").orEmpty().isBlank()) {
-            return ResponseEntity.status(HttpStatus.UNAUTHORIZED)
-                .header(
-                    WWW_AUTHENTICATE,
-                    "Signature realm=\"Example\",headers=\"(request-target) date host digest\""
-                )
-                .build()
+        if (responseEntity != null) {
+            return responseEntity
         }
 
         val parseActivity = try {
@@ -116,6 +87,46 @@ class InboxControllerImpl(
         return ResponseEntity(HttpStatus.ACCEPTED)
     }
 
+    private fun checkHeader(
+        httpServletRequest: HttpServletRequest,
+        body: ByteArray,
+    ): ResponseEntity<String>? {
+        try {
+            httpSignatureHeaderChecker.checkDate(httpServletRequest.getHeader("date")!!)
+        } catch (_: NullPointerException) {
+            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body("Required date header")
+        } catch (_: IllegalArgumentException) {
+            return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body("Request is too old.")
+        }
+        try {
+            httpSignatureHeaderChecker.checkHost(httpServletRequest.getHeader("host")!!)
+        } catch (_: NullPointerException) {
+            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body("Required host header")
+        } catch (_: IllegalArgumentException) {
+            return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body("Wrong host for request")
+        }
+        try {
+            httpSignatureHeaderChecker.checkDigest(body, httpServletRequest.getHeader("digest")!!)
+        } catch (_: NullPointerException) {
+            return ResponseEntity.status(HttpStatus.BAD_REQUEST)
+                .body("Required request body digest in digest header (sha256)")
+        } catch (_: IllegalArgumentException) {
+            return ResponseEntity
+                .status(HttpStatus.UNAUTHORIZED)
+                .body("Wrong digest for request")
+        }
+
+        if (httpServletRequest.getHeader("signature").orEmpty().isBlank()) {
+            return ResponseEntity.status(HttpStatus.UNAUTHORIZED)
+                .header(
+                    WWW_AUTHENTICATE,
+                    "Signature realm=\"Example\",headers=\"(request-target) date host digest\""
+                )
+                .build()
+        }
+        return null
+    }
+
     companion object {
         private val LOGGER = LoggerFactory.getLogger(InboxControllerImpl::class.java)
     }