From ecdbf74e574a33f7b995fe593e681f5bfe0f29a2 Mon Sep 17 00:00:00 2001 From: usbharu Date: Wed, 19 Feb 2025 12:33:17 +0900 Subject: [PATCH 1/6] =?UTF-8?q?refactor:=20WebHostMetadata=E3=82=92XRD?= =?UTF-8?q?=E3=81=AB=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WebFingerHostMetaLinkConfiguration.kt | 5 +++-- .../interfaces/wellknown/HostmetaController.kt | 14 ++++++-------- .../wellknown/XRD.kt} | 17 ++++++++++++++--- 3 files changed, 23 insertions(+), 13 deletions(-) rename hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/{application/hostmeta/WebHostMetadata.kt => interfaces/wellknown/XRD.kt} (58%) diff --git a/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/config/WebFingerHostMetaLinkConfiguration.kt b/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/config/WebFingerHostMetaLinkConfiguration.kt index 03220ad2..7882f5b8 100644 --- a/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/config/WebFingerHostMetaLinkConfiguration.kt +++ b/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/config/WebFingerHostMetaLinkConfiguration.kt @@ -1,6 +1,6 @@ package dev.usbharu.hideout.activitypub.config -import dev.usbharu.hideout.activitypub.application.hostmeta.Link +import dev.usbharu.hideout.activitypub.interfaces.wellknown.Link import dev.usbharu.hideout.core.config.ApplicationConfig import org.springframework.context.annotation.Bean import org.springframework.context.annotation.Configuration @@ -12,7 +12,8 @@ class WebFingerHostMetaLinkConfiguration(private val applicationConfig: Applicat return Link( rel = "lrdd", type = "application/jrd+json", - template = applicationConfig.url.resolve(".well-known/webfinger").toString() + "?resource={uri}" + template = applicationConfig.url.resolve(".well-known/webfinger").toString() + "?resource={uri}", + href = null ) } } diff --git a/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/wellknown/HostmetaController.kt b/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/wellknown/HostmetaController.kt index 2f1a2671..7b11c9cb 100644 --- a/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/wellknown/HostmetaController.kt +++ b/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/wellknown/HostmetaController.kt @@ -1,7 +1,5 @@ package dev.usbharu.hideout.activitypub.interfaces.wellknown -import dev.usbharu.hideout.activitypub.application.hostmeta.Link -import dev.usbharu.hideout.activitypub.application.hostmeta.WebHostMetadata import org.springframework.core.annotation.Order import org.springframework.http.MediaType import org.springframework.http.ResponseEntity @@ -14,19 +12,19 @@ import org.springframework.web.bind.annotation.RestController class HostmetaController(private val linkList: List = emptyList()) { @Order(1) @GetMapping("/host-meta") - fun hostmeta(): ResponseEntity { + fun hostmeta(): ResponseEntity { return ResponseEntity.ok().contentType(MediaType("application", "xrd+xml")) - .body(WebHostMetadata(linkList)) + .body(XRD(linkList)) } @Order(2) @GetMapping("/host-meta", produces = ["application/json"]) - fun hostmetaJson(): WebHostMetadata { - return WebHostMetadata(linkList) + fun hostmetaJson(): XRD { + return XRD(linkList) } @GetMapping("/host-meta.json", produces = ["application/json"]) - fun hostmetaJson2(): WebHostMetadata { - return WebHostMetadata(linkList) + fun hostmetaJson2(): XRD { + return XRD(linkList) } } diff --git a/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/application/hostmeta/WebHostMetadata.kt b/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/wellknown/XRD.kt similarity index 58% rename from hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/application/hostmeta/WebHostMetadata.kt rename to hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/wellknown/XRD.kt index 9cb4bdf5..1f4827f4 100644 --- a/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/application/hostmeta/WebHostMetadata.kt +++ b/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/wellknown/XRD.kt @@ -1,20 +1,31 @@ -package dev.usbharu.hideout.activitypub.application.hostmeta +package dev.usbharu.hideout.activitypub.interfaces.wellknown +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement +import java.net.URI @JacksonXmlRootElement(localName = "XRD", namespace = "http://docs.oasis-open.org/ns/xri/xrd-1.0") -class WebHostMetadata( +@JsonInclude(JsonInclude.Include.NON_NULL) +class XRD( @JacksonXmlProperty(localName = "Link", namespace = "http://docs.oasis-open.org/ns/xri/xrd-1.0") @JacksonXmlElementWrapper(useWrapping = false) @JsonProperty("links") val links: List, + @JacksonXmlProperty(localName = "subject") + @JsonProperty(value = "subject") + @JsonInclude(JsonInclude.Include.NON_NULL) + val subject: URI? = null, ) +@JsonInclude(JsonInclude.Include.NON_NULL) class Link( @JacksonXmlProperty(localName = "rel", isAttribute = true) val rel: String, - @JacksonXmlProperty(localName = "template", isAttribute = true) val template: String, + @JsonInclude(JsonInclude.Include.NON_NULL) + @JacksonXmlProperty(localName = "template", isAttribute = true) val template: String?, @JacksonXmlProperty(localName = "type", isAttribute = true) val type: String, + @JsonInclude(JsonInclude.Include.NON_NULL) + @JacksonXmlProperty(localName = "href", isAttribute = true) val href: String?, ) From c37e442dd7c9681816fd44fc5ffbb12e7ad9cd0d Mon Sep 17 00:00:00 2001 From: usbharu Date: Wed, 19 Feb 2025 12:33:52 +0900 Subject: [PATCH 2/6] =?UTF-8?q?feat:=20WebFinger=E3=82=92=E5=AE=9F?= =?UTF-8?q?=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../webfinger/WebFingerApplicationService.kt | 51 +++++++++++++++++++ .../wellknown/WebFingerController.kt | 18 +++++++ 2 files changed, 69 insertions(+) create mode 100644 hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/application/webfinger/WebFingerApplicationService.kt create mode 100644 hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/wellknown/WebFingerController.kt diff --git a/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/application/webfinger/WebFingerApplicationService.kt b/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/application/webfinger/WebFingerApplicationService.kt new file mode 100644 index 00000000..3d10f4a1 --- /dev/null +++ b/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/application/webfinger/WebFingerApplicationService.kt @@ -0,0 +1,51 @@ +package dev.usbharu.hideout.activitypub.application.webfinger + +import dev.usbharu.hideout.activitypub.interfaces.wellknown.Link +import dev.usbharu.hideout.activitypub.interfaces.wellknown.XRD +import dev.usbharu.hideout.core.application.shared.AbstractApplicationService +import dev.usbharu.hideout.core.application.shared.Transaction +import dev.usbharu.hideout.core.config.ApplicationConfig +import dev.usbharu.hideout.core.domain.model.actor.ActorRepository +import dev.usbharu.hideout.core.domain.model.support.domain.apHost +import dev.usbharu.hideout.core.domain.model.support.principal.Principal +import org.slf4j.LoggerFactory +import org.springframework.stereotype.Service +import java.net.URI + +@Service +class WebFingerApplicationService( + transaction: Transaction, + private val applicationConfig: ApplicationConfig, + private val actorRepository: ActorRepository, +) : AbstractApplicationService(transaction, logger) { + + + override suspend fun internalExecute(resource: String, principal: Principal): XRD { + if (resource.startsWith("acct:").not()) { + throw IllegalArgumentException("Parameter (resource) is invalid.") + } + val acct = resource.substringAfter("acct:") + + val host = acct.substringAfter('@', "") + if (applicationConfig.url.apHost != host) { + throw IllegalArgumentException("Parameter (resource) is invalid.") + } + val username = acct.substringBefore('@', "") + if (username.isEmpty()) { + throw IllegalArgumentException("Actor is not found.") + } + + val actor = actorRepository.findByNameAndDomain(username, applicationConfig.url.apHost) + ?: throw IllegalArgumentException("Actor $username not found.") + + return XRD( + listOf(Link("self", null, "application/activity+json", actor.url.toString())), + URI.create("acct:${actor.name.name}@${actor.domain.domain}") + ) + + } + + companion object { + private val logger = LoggerFactory.getLogger(WebFingerApplicationService::class.java) + } +} \ No newline at end of file diff --git a/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/wellknown/WebFingerController.kt b/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/wellknown/WebFingerController.kt new file mode 100644 index 00000000..2af12b52 --- /dev/null +++ b/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/wellknown/WebFingerController.kt @@ -0,0 +1,18 @@ +package dev.usbharu.hideout.activitypub.interfaces.wellknown + +import dev.usbharu.hideout.activitypub.application.webfinger.WebFingerApplicationService +import dev.usbharu.hideout.core.domain.model.support.principal.Anonymous +import org.springframework.web.bind.annotation.GetMapping +import org.springframework.web.bind.annotation.RequestMapping +import org.springframework.web.bind.annotation.RequestParam +import org.springframework.web.bind.annotation.RestController + +@RestController +@RequestMapping("/.well-known") +class WebFingerController( + private val webFingerApplicationService: WebFingerApplicationService, +) { + @GetMapping("/webfinger", produces = ["application/json"]) + suspend fun webfinger(@RequestParam(name = "resource", required = true) resource: String): XRD = + webFingerApplicationService.execute(resource, Anonymous) +} \ No newline at end of file From 17cc92d3449b7cce886caf57a03152ccfe115e29 Mon Sep 17 00:00:00 2001 From: usbharu Date: Wed, 19 Feb 2025 12:43:40 +0900 Subject: [PATCH 3/6] =?UTF-8?q?test:=20=E3=83=86=E3=82=B9=E3=83=88?= =?UTF-8?q?=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wellknown/WebFingerControllerTest.kt | 55 +++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 hideout/hideout-activitypub/src/test/kotlin/wellknown/WebFingerControllerTest.kt diff --git a/hideout/hideout-activitypub/src/test/kotlin/wellknown/WebFingerControllerTest.kt b/hideout/hideout-activitypub/src/test/kotlin/wellknown/WebFingerControllerTest.kt new file mode 100644 index 00000000..783a7e74 --- /dev/null +++ b/hideout/hideout-activitypub/src/test/kotlin/wellknown/WebFingerControllerTest.kt @@ -0,0 +1,55 @@ +package wellknown + +import dev.usbharu.hideout.SpringApplication +import org.junit.jupiter.api.BeforeEach +import org.junit.jupiter.api.Test +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc +import org.springframework.boot.test.context.SpringBootTest +import org.springframework.http.MediaType +import org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers.springSecurity +import org.springframework.test.context.jdbc.Sql +import org.springframework.test.web.servlet.MockMvc +import org.springframework.test.web.servlet.get +import org.springframework.test.web.servlet.setup.DefaultMockMvcBuilder +import org.springframework.test.web.servlet.setup.MockMvcBuilders +import org.springframework.transaction.annotation.Transactional +import org.springframework.web.context.WebApplicationContext + +@SpringBootTest(classes = [SpringApplication::class]) +@AutoConfigureMockMvc +@Transactional +@Sql("/sql/actors.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_CLASS) +class WebFingerControllerTest { + @Autowired + private lateinit var context: WebApplicationContext + + private lateinit var mockMvc: MockMvc + + @BeforeEach + fun setUp() { + mockMvc = MockMvcBuilders.webAppContextSetup(context) + .apply(springSecurity()) + .build() + } + + @Test + fun webfinger() { + mockMvc + .get("/.well-known/webfinger?resource=acct:test@example.com") { + accept(MediaType.APPLICATION_JSON) + } + .asyncDispatch() + .andDo { print() } + .andExpect { status { isOk() } } + } + + @Test + fun `webfinger resourceが無いと400`() { + mockMvc + .get("/.well-known/webfinger") { + accept(MediaType.APPLICATION_JSON) + } + .andExpect { status { isBadRequest() } } + } +} \ No newline at end of file From d696494100ac9317be6093c7e81b325fd54d8615 Mon Sep 17 00:00:00 2001 From: usbharu Date: Wed, 19 Feb 2025 13:06:41 +0900 Subject: [PATCH 4/6] =?UTF-8?q?test:=20=E3=83=86=E3=82=B9=E3=83=88?= =?UTF-8?q?=E3=82=92=E8=BF=BD=E5=8A=A02?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hideout/hideout-activitypub/build.gradle.kts | 1 + .../activitypub/interfaces/wellknown/XRD.kt | 4 +- .../WebFingerApplicationServiceTest.kt | 98 +++++++++++++++++++ .../src/test/kotlin/util/TestTransaction.kt | 8 ++ 4 files changed, 109 insertions(+), 2 deletions(-) create mode 100644 hideout/hideout-activitypub/src/test/kotlin/dev/usbharu/hideout/activitypub/application/webfinger/WebFingerApplicationServiceTest.kt create mode 100644 hideout/hideout-activitypub/src/test/kotlin/util/TestTransaction.kt diff --git a/hideout/hideout-activitypub/build.gradle.kts b/hideout/hideout-activitypub/build.gradle.kts index 1791af68..68951ff6 100644 --- a/hideout/hideout-activitypub/build.gradle.kts +++ b/hideout/hideout-activitypub/build.gradle.kts @@ -52,6 +52,7 @@ dependencies { testImplementation(libs.coroutines.test) testImplementation(libs.h2db) testImplementation(libs.flyway.core) + testImplementation(libs.mockito.kotlin) } tasks.test { diff --git a/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/wellknown/XRD.kt b/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/wellknown/XRD.kt index 1f4827f4..e6617c3f 100644 --- a/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/wellknown/XRD.kt +++ b/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/wellknown/XRD.kt @@ -9,7 +9,7 @@ import java.net.URI @JacksonXmlRootElement(localName = "XRD", namespace = "http://docs.oasis-open.org/ns/xri/xrd-1.0") @JsonInclude(JsonInclude.Include.NON_NULL) -class XRD( +data class XRD( @JacksonXmlProperty(localName = "Link", namespace = "http://docs.oasis-open.org/ns/xri/xrd-1.0") @JacksonXmlElementWrapper(useWrapping = false) @JsonProperty("links") @@ -21,7 +21,7 @@ class XRD( ) @JsonInclude(JsonInclude.Include.NON_NULL) -class Link( +data class Link( @JacksonXmlProperty(localName = "rel", isAttribute = true) val rel: String, @JsonInclude(JsonInclude.Include.NON_NULL) @JacksonXmlProperty(localName = "template", isAttribute = true) val template: String?, diff --git a/hideout/hideout-activitypub/src/test/kotlin/dev/usbharu/hideout/activitypub/application/webfinger/WebFingerApplicationServiceTest.kt b/hideout/hideout-activitypub/src/test/kotlin/dev/usbharu/hideout/activitypub/application/webfinger/WebFingerApplicationServiceTest.kt new file mode 100644 index 00000000..cb341b90 --- /dev/null +++ b/hideout/hideout-activitypub/src/test/kotlin/dev/usbharu/hideout/activitypub/application/webfinger/WebFingerApplicationServiceTest.kt @@ -0,0 +1,98 @@ +package dev.usbharu.hideout.activitypub.application.webfinger + +import dev.usbharu.hideout.activitypub.external.activitystreams.TestActorFactory +import dev.usbharu.hideout.activitypub.interfaces.wellknown.Link +import dev.usbharu.hideout.activitypub.interfaces.wellknown.XRD +import dev.usbharu.hideout.core.config.ApplicationConfig +import dev.usbharu.hideout.core.domain.model.actor.ActorRepository +import dev.usbharu.hideout.core.domain.model.support.principal.Anonymous +import kotlinx.coroutines.test.runTest +import org.junit.jupiter.api.Test +import org.junit.jupiter.api.assertThrows +import org.junit.jupiter.api.extension.ExtendWith +import org.mockito.InjectMocks +import org.mockito.Mock +import org.mockito.Spy +import org.mockito.junit.jupiter.MockitoExtension +import org.mockito.kotlin.eq +import org.mockito.kotlin.times +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever +import util.TestTransaction +import java.net.URI +import kotlin.test.assertEquals + +@ExtendWith(MockitoExtension::class) +class WebFingerApplicationServiceTest { + @InjectMocks + lateinit var webFingerApplicationService: WebFingerApplicationService + + @Mock + lateinit var actorRepository: ActorRepository + + @Spy + val transaction = TestTransaction + + @Spy + val applicationConfig = ApplicationConfig(URI.create("https://example.com")) + + @Test + fun acctから始まらないとだめ() = runTest { + assertThrows { + webFingerApplicationService.execute("a", Anonymous) + } + } + + @Test + fun ドメインが自ドメインと一致しないとだめ() = runTest { + assertThrows { + webFingerApplicationService.execute("acct:test@remote.example.com", Anonymous) + } + } + + @Test + fun `acct@username@hostはだめ`() = runTest { + assertThrows { + webFingerApplicationService.execute("acct:@username@example.com", Anonymous) + } + } + + @Test + fun actorが存在しないとだめ() = runTest { + assertThrows { + webFingerApplicationService.execute("acct:test2@example.com", Anonymous) + } + + verify(actorRepository, times(1)).findByNameAndDomain(eq("test2"), eq("example.com")) + } + + @Test + fun actorが存在したら返す() = runTest { + whenever( + actorRepository.findByNameAndDomain( + eq("test"), eq("example.com") + ) + ).thenReturn( + TestActorFactory.create( + actorName = "test", + domain = "example.com", + uri = URI.create("https://example.com/users/test") + ) + ) + + val execute = webFingerApplicationService.execute("acct:test@example.com", Anonymous) + + val expected = XRD( + listOf( + Link( + rel = "self", + href = "https://example.com/users/test", + type = "application/activity+json", + template = null + ) + ), URI.create("acct:test@example.com") + ) + + assertEquals(expected, execute) + } +} \ No newline at end of file diff --git a/hideout/hideout-activitypub/src/test/kotlin/util/TestTransaction.kt b/hideout/hideout-activitypub/src/test/kotlin/util/TestTransaction.kt new file mode 100644 index 00000000..067d8758 --- /dev/null +++ b/hideout/hideout-activitypub/src/test/kotlin/util/TestTransaction.kt @@ -0,0 +1,8 @@ +package util + +import dev.usbharu.hideout.core.application.shared.Transaction + +object TestTransaction : Transaction { + override suspend fun transaction(block: suspend () -> T): T = block() + override suspend fun transaction(transactionLevel: Int, block: suspend () -> T): T = block() +} From 26f84da9640493e1e31f834ec5e7a12edcacdbc9 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Wed, 19 Feb 2025 04:12:13 +0000 Subject: [PATCH 5/6] style: fix lint (CI) --- .../application/webfinger/WebFingerApplicationService.kt | 4 +--- .../activitypub/interfaces/wellknown/WebFingerController.kt | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/application/webfinger/WebFingerApplicationService.kt b/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/application/webfinger/WebFingerApplicationService.kt index 3d10f4a1..a12bfdf3 100644 --- a/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/application/webfinger/WebFingerApplicationService.kt +++ b/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/application/webfinger/WebFingerApplicationService.kt @@ -19,7 +19,6 @@ class WebFingerApplicationService( private val actorRepository: ActorRepository, ) : AbstractApplicationService(transaction, logger) { - override suspend fun internalExecute(resource: String, principal: Principal): XRD { if (resource.startsWith("acct:").not()) { throw IllegalArgumentException("Parameter (resource) is invalid.") @@ -42,10 +41,9 @@ class WebFingerApplicationService( listOf(Link("self", null, "application/activity+json", actor.url.toString())), URI.create("acct:${actor.name.name}@${actor.domain.domain}") ) - } companion object { private val logger = LoggerFactory.getLogger(WebFingerApplicationService::class.java) } -} \ No newline at end of file +} diff --git a/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/wellknown/WebFingerController.kt b/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/wellknown/WebFingerController.kt index 2af12b52..30b892c2 100644 --- a/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/wellknown/WebFingerController.kt +++ b/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/wellknown/WebFingerController.kt @@ -15,4 +15,4 @@ class WebFingerController( @GetMapping("/webfinger", produces = ["application/json"]) suspend fun webfinger(@RequestParam(name = "resource", required = true) resource: String): XRD = webFingerApplicationService.execute(resource, Anonymous) -} \ No newline at end of file +} From 206b7fdbf534a3d30fded145cd3dc8d70900e766 Mon Sep 17 00:00:00 2001 From: usbharu Date: Wed, 19 Feb 2025 13:16:58 +0900 Subject: [PATCH 6/6] test: fix test --- .../test/kotlin/wellknown/HostMetaControllerTest.kt | 11 +++++++++++ .../test/kotlin/wellknown/WebFingerControllerTest.kt | 11 +++++++++++ 2 files changed, 22 insertions(+) diff --git a/hideout/hideout-activitypub/src/test/kotlin/wellknown/HostMetaControllerTest.kt b/hideout/hideout-activitypub/src/test/kotlin/wellknown/HostMetaControllerTest.kt index f34906a8..0d571c1e 100644 --- a/hideout/hideout-activitypub/src/test/kotlin/wellknown/HostMetaControllerTest.kt +++ b/hideout/hideout-activitypub/src/test/kotlin/wellknown/HostMetaControllerTest.kt @@ -1,6 +1,8 @@ package wellknown import dev.usbharu.hideout.SpringApplication +import org.flywaydb.core.Flyway +import org.junit.jupiter.api.AfterAll import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test import org.springframework.beans.factory.annotation.Autowired @@ -62,4 +64,13 @@ class HostMetaControllerTest { .andExpect { status { isOk() } } .andExpect { content { contentType(MediaType("application", "json")) } } } + + companion object { + @JvmStatic + @AfterAll + fun dropDatabase(@Autowired flyway: Flyway) { + flyway.clean() + flyway.migrate() + } + } } \ No newline at end of file diff --git a/hideout/hideout-activitypub/src/test/kotlin/wellknown/WebFingerControllerTest.kt b/hideout/hideout-activitypub/src/test/kotlin/wellknown/WebFingerControllerTest.kt index 783a7e74..5a04645f 100644 --- a/hideout/hideout-activitypub/src/test/kotlin/wellknown/WebFingerControllerTest.kt +++ b/hideout/hideout-activitypub/src/test/kotlin/wellknown/WebFingerControllerTest.kt @@ -1,6 +1,8 @@ package wellknown import dev.usbharu.hideout.SpringApplication +import org.flywaydb.core.Flyway +import org.junit.jupiter.api.AfterAll import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test import org.springframework.beans.factory.annotation.Autowired @@ -52,4 +54,13 @@ class WebFingerControllerTest { } .andExpect { status { isBadRequest() } } } + + companion object { + @JvmStatic + @AfterAll + fun dropDatabase(@Autowired flyway: Flyway) { + flyway.clean() + flyway.migrate() + } + } } \ No newline at end of file