usbharu
/
Hideout
mirror of https://github.com/usbharu/Hideout.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

fix: Inbox処理のトランザクションを修正

This commit is contained in:
usbharu 2023-12-03 10:28:19 +09:00
parent be7bd590eb
commit 158cd3a6df
1 changed files with 38 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/main/kotlin/dev/usbharu/hideout/activitypub/service/inbox/InboxJobProcessor.kt
View File

@ -34,25 +34,37 @@ class InboxJobProcessor(
private val transaction: Transaction private val transaction: Transaction
) : JobProcessor<InboxJobParam, InboxJob> { ) : JobProcessor<InboxJobParam, InboxJob> {
private suspend fun verifyHttpSignature(httpRequest: HttpRequest, signature: Signature): Boolean { private suspend fun verifyHttpSignature(
httpRequest: HttpRequest,
signature: Signature,
transaction: Transaction
): Boolean {
val requiredHeaders = when (httpRequest.method) { val requiredHeaders = when (httpRequest.method) {
HttpMethod.GET -> getRequiredHeaders HttpMethod.GET -> getRequiredHeaders
HttpMethod.POST -> postRequiredHeaders HttpMethod.POST -> postRequiredHeaders
} }
if (signature.headers.containsAll(requiredHeaders).not()) { if (signature.headers.containsAll(requiredHeaders).not()) {
logger.warn("FAILED Invalid signature. require: {}", requiredHeaders)
return false return false
} }
val user = try { val user = transaction.transaction {
userQueryService.findByKeyId(signature.keyId) try {
} catch (_: FailedToGetResourcesException) { userQueryService.findByKeyId(signature.keyId)
apUserService.fetchPersonWithEntity(signature.keyId).second } catch (_: FailedToGetResourcesException) {
apUserService.fetchPersonWithEntity(signature.keyId).second
}
} }
val verify = signatureVerifier.verify( val verify = try {
httpRequest, signatureVerifier.verify(
PublicKey(RsaUtil.decodeRsaPublicKeyPem(user.publicKey), signature.keyId) httpRequest,
) PublicKey(RsaUtil.decodeRsaPublicKeyPem(user.publicKey), signature.keyId)
)
} catch (e: Exception) {
logger.warn("FAILED Verify Http Signature", e)
return false
}
return verify.success return verify.success
} }
@ -60,6 +72,7 @@ class InboxJobProcessor(
@Suppress("TooGenericExceptionCaught") @Suppress("TooGenericExceptionCaught")
private fun parseSignatureHeader(httpHeaders: HttpHeaders): Signature? { private fun parseSignatureHeader(httpHeaders: HttpHeaders): Signature? {
return try { return try {
println("Signature Header =" + httpHeaders.get("Signature").single())
signatureHeaderParser.parse(httpHeaders) signatureHeaderParser.parse(httpHeaders)
} catch (e: RuntimeException) { } catch (e: RuntimeException) {
logger.trace("FAILED parse signature header", e) logger.trace("FAILED parse signature header", e)
@ -67,7 +80,8 @@ class InboxJobProcessor(
} }
} }
override suspend fun process(param: InboxJobParam) = transaction.transaction { override suspend fun process(param: InboxJobParam) {
val jsonNode = objectMapper.readTree(param.json) val jsonNode = objectMapper.readTree(param.json)
logger.info("START Process inbox. type: {}", param.type) logger.info("START Process inbox. type: {}", param.type)
@ -83,22 +97,24 @@ class InboxJobProcessor(
logger.debug("Has signature? {}", signature != null) logger.debug("Has signature? {}", signature != null)
val verify = signature?.let { verifyHttpSignature(httpRequest, it) } ?: false val verify = signature?.let { verifyHttpSignature(httpRequest, it, transaction) } ?: false
logger.debug("Is verifying success? {}", verify) transaction.transaction {
logger.debug("Is verifying success? {}", verify)
val activityPubProcessor = val activityPubProcessor =
activityPubProcessorList.firstOrNull { it.isSupported(param.type) } as ActivityPubProcessor<Object>? activityPubProcessorList.firstOrNull { it.isSupported(param.type) } as ActivityPubProcessor<Object>?
if (activityPubProcessor == null) { if (activityPubProcessor == null) {
logger.warn("ActivityType {} is not support.", param.type) logger.warn("ActivityType {} is not support.", param.type)
throw IllegalStateException("ActivityPubProcessor not found.") throw IllegalStateException("ActivityPubProcessor not found.")
}
val value = objectMapper.treeToValue(jsonNode, activityPubProcessor.type())
activityPubProcessor.process(ActivityPubProcessContext(value, jsonNode, httpRequest, signature, verify))
logger.info("SUCCESS Process inbox. type: {}", param.type)
} }
val value = objectMapper.treeToValue(jsonNode, activityPubProcessor.type())
activityPubProcessor.process(ActivityPubProcessContext(value, jsonNode, httpRequest, signature, verify))
logger.info("SUCCESS Process inbox. type: {}", param.type)
} }
override fun job(): InboxJob = InboxJob override fun job(): InboxJob = InboxJob