mirror of https://github.com/usbharu/Hideout.git
fix: keyidを修正
This commit is contained in:
parent
4843bbbf0e
commit
a2ff102efb
|
@ -2,7 +2,6 @@ package dev.usbharu.hideout.plugins
|
||||||
|
|
||||||
import dev.usbharu.hideout.ap.JsonLd
|
import dev.usbharu.hideout.ap.JsonLd
|
||||||
import dev.usbharu.hideout.config.Config
|
import dev.usbharu.hideout.config.Config
|
||||||
import dev.usbharu.hideout.repository.IUserAuthRepository
|
|
||||||
import dev.usbharu.hideout.service.IUserAuthService
|
import dev.usbharu.hideout.service.IUserAuthService
|
||||||
import dev.usbharu.hideout.service.UserAuthService
|
import dev.usbharu.hideout.service.UserAuthService
|
||||||
import dev.usbharu.hideout.util.HttpUtil.Activity
|
import dev.usbharu.hideout.util.HttpUtil.Activity
|
||||||
|
@ -14,19 +13,13 @@ import io.ktor.http.*
|
||||||
import io.ktor.server.application.*
|
import io.ktor.server.application.*
|
||||||
import io.ktor.server.response.*
|
import io.ktor.server.response.*
|
||||||
import io.ktor.util.*
|
import io.ktor.util.*
|
||||||
import io.netty.handler.codec.base64.Base64
|
|
||||||
import kotlinx.coroutines.runBlocking
|
import kotlinx.coroutines.runBlocking
|
||||||
import org.koin.java.KoinJavaComponent.inject
|
|
||||||
|
|
||||||
import org.koin.ktor.ext.inject
|
|
||||||
import tech.barbero.http.message.signing.HttpMessage
|
import tech.barbero.http.message.signing.HttpMessage
|
||||||
import tech.barbero.http.message.signing.HttpMessageSigner
|
import tech.barbero.http.message.signing.HttpMessageSigner
|
||||||
import tech.barbero.http.message.signing.HttpRequest
|
import tech.barbero.http.message.signing.HttpRequest
|
||||||
import tech.barbero.http.message.signing.KeyMap
|
import tech.barbero.http.message.signing.KeyMap
|
||||||
import java.net.URI
|
import java.net.URI
|
||||||
import java.security.KeyFactory
|
import java.security.KeyFactory
|
||||||
import java.security.KeyPairGenerator
|
|
||||||
import java.security.MessageDigest
|
|
||||||
import java.security.PrivateKey
|
import java.security.PrivateKey
|
||||||
import java.security.PublicKey
|
import java.security.PublicKey
|
||||||
import java.security.spec.X509EncodedKeySpec
|
import java.security.spec.X509EncodedKeySpec
|
||||||
|
@ -113,7 +106,7 @@ val httpSignaturePlugin = createClientPlugin("HttpSign",::HttpSignaturePluginCon
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
val builder = HttpMessageSigner.builder().algorithm(algorithmType).keyId("${Config.configData.url}/users/$keyId/pubkey").keyMap(keyMap)
|
val builder = HttpMessageSigner.builder().algorithm(algorithmType).keyId(keyId).keyMap(keyMap)
|
||||||
var tmp = builder
|
var tmp = builder
|
||||||
headers.forEach {
|
headers.forEach {
|
||||||
tmp = tmp.addHeaderToSign(it)
|
tmp = tmp.addHeaderToSign(it)
|
||||||
|
@ -149,9 +142,11 @@ val httpSignaturePlugin = createClientPlugin("HttpSign",::HttpSignaturePluginCon
|
||||||
|
|
||||||
class KtorKeyMap(private val userAuthRepository: IUserAuthService) : KeyMap {
|
class KtorKeyMap(private val userAuthRepository: IUserAuthService) : KeyMap {
|
||||||
override fun getPublicKey(keyId: String?): PublicKey = runBlocking {
|
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 = java.util.Base64.getDecoder().decode(
|
||||||
userAuthRepository.findByUsername(
|
userAuthRepository.findByUsername(
|
||||||
(keyId ?: throw IllegalArgumentException("keyId is null"))
|
username
|
||||||
).publicKey
|
).publicKey
|
||||||
)
|
)
|
||||||
val x509EncodedKeySpec = X509EncodedKeySpec(publicBytes)
|
val x509EncodedKeySpec = X509EncodedKeySpec(publicBytes)
|
||||||
|
@ -159,9 +154,11 @@ class KtorKeyMap(private val userAuthRepository: IUserAuthService) : KeyMap {
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun getPrivateKey(keyId: String?): PrivateKey = runBlocking {
|
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 = java.util.Base64.getDecoder().decode(
|
||||||
userAuthRepository.findByUsername(
|
userAuthRepository.findByUsername(
|
||||||
(keyId ?: throw IllegalArgumentException("keyId is null"))
|
username
|
||||||
).privateKey
|
).privateKey
|
||||||
)
|
)
|
||||||
val x509EncodedKeySpec = X509EncodedKeySpec(publicBytes)
|
val x509EncodedKeySpec = X509EncodedKeySpec(publicBytes)
|
||||||
|
|
Loading…
Reference in New Issue