From a5188bbb653a43da204bbeaee02c54074c7d9de3 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Fri, 31 Mar 2023 13:12:26 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=E9=8D=B5=E3=81=AE=E8=AA=AD=E3=81=BF?= =?UTF-8?q?=E8=BE=BC=E3=81=BF=E6=96=B9=E6=B3=95=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kotlin/dev/usbharu/hideout/plugins/ActivityPub.kt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/kotlin/dev/usbharu/hideout/plugins/ActivityPub.kt b/src/main/kotlin/dev/usbharu/hideout/plugins/ActivityPub.kt index 66725e3e..a01ef3ff 100644 --- a/src/main/kotlin/dev/usbharu/hideout/plugins/ActivityPub.kt +++ b/src/main/kotlin/dev/usbharu/hideout/plugins/ActivityPub.kt @@ -144,10 +144,11 @@ class KtorKeyMap(private val userAuthRepository: IUserAuthService) : KeyMap { override fun getPublicKey(keyId: String?): PublicKey = runBlocking { val username = (keyId ?: throw IllegalArgumentException("keyId is null")).substringBeforeLast("/pubkey") .substringAfterLast("/") - val publicBytes = java.util.Base64.getDecoder().decode( + val publicBytes = Base64.getDecoder().decode( userAuthRepository.findByUsername( username - ).publicKey + ).publicKey?.replace("-----BEGIN PUBLIC KEY-----", "-----END PUBLIC KEY-----")?.replace("", "") + ?.replace("\\n", "") ) val x509EncodedKeySpec = X509EncodedKeySpec(publicBytes) return@runBlocking KeyFactory.getInstance("RSA").generatePublic(x509EncodedKeySpec) @@ -156,10 +157,11 @@ class KtorKeyMap(private val userAuthRepository: IUserAuthService) : KeyMap { override fun getPrivateKey(keyId: String?): PrivateKey = runBlocking { val username = (keyId ?: throw IllegalArgumentException("keyId is null")).substringBeforeLast("/pubkey") .substringAfterLast("/") - val publicBytes = java.util.Base64.getDecoder().decode( + val publicBytes = Base64.getDecoder().decode( userAuthRepository.findByUsername( username - ).privateKey + ).privateKey?.replace("-----BEGIN PUBLIC KEY-----", "-----END PUBLIC KEY-----")?.replace("", "") + ?.replace("\\n", "") ) val x509EncodedKeySpec = X509EncodedKeySpec(publicBytes) return@runBlocking KeyFactory.getInstance("RSA").generatePrivate(x509EncodedKeySpec)