recaptcha filter

susimsek · Aug 29, 2023 · a3fd078 · a3fd078
1 parent e31d75a
commit a3fd078
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 5 deletions.
diff --git a/src/main/kotlin/io/github/susimsek/springgraphqlsamples/config/SecurityConfig.kt b/src/main/kotlin/io/github/susimsek/springgraphqlsamples/config/SecurityConfig.kt
@@ -163,7 +163,7 @@ class SecurityConfig {
                     .authenticationEntryPoint(securityExceptionResolver)
                     .accessDeniedHandler(securityExceptionResolver)
             }
-            .addFilterBefore(XSSFilter(), SecurityWebFiltersOrder.AUTHENTICATION)
+            .addFilterAt(XSSFilter(), SecurityWebFiltersOrder.HTTP_HEADERS_WRITER)
             .addFilterBefore(RecaptchaFilter(recaptchaService), SecurityWebFiltersOrder.AUTHENTICATION)
         // @formatter:on
         return http.build()

diff --git a/...main/kotlin/io/github/susimsek/springgraphqlsamples/security/recaptcha/RecaptchaFilter.kt b/...main/kotlin/io/github/susimsek/springgraphqlsamples/security/recaptcha/RecaptchaFilter.kt
@@ -4,8 +4,6 @@ import io.github.susimsek.springgraphqlsamples.exception.InvalidCaptchaException
 import io.github.susimsek.springgraphqlsamples.exception.RECAPTCHA_INVALID_MSG_CODE
 import io.github.susimsek.springgraphqlsamples.graphql.RECAPTCHA_HEADER_NAME
 import kotlinx.coroutines.reactor.awaitSingleOrNull
-import org.springframework.boot.autoconfigure.security.SecurityProperties
-import org.springframework.core.annotation.Order
 import org.springframework.web.server.CoWebFilter
 import org.springframework.web.server.CoWebFilterChain
 import org.springframework.web.server.ServerWebExchange
@@ -16,7 +14,6 @@ import reactor.core.publisher.Mono
 
 
 
-@Order(SecurityProperties.DEFAULT_FILTER_ORDER-1)
 class RecaptchaFilter(
     private val recaptchaService: RecaptchaService,
 ): CoWebFilter() {

diff --git a/src/main/kotlin/io/github/susimsek/springgraphqlsamples/security/xss/XSSFilter.kt b/src/main/kotlin/io/github/susimsek/springgraphqlsamples/security/xss/XSSFilter.kt
@@ -6,7 +6,6 @@ import org.springframework.web.server.CoWebFilter
 import org.springframework.web.server.CoWebFilterChain
 import org.springframework.web.server.ServerWebExchange
 
-@Order(SecurityProperties.DEFAULT_FILTER_ORDER-2)
 class XSSFilter: CoWebFilter() {
 
     override suspend fun filter(exchange: ServerWebExchange, chain: CoWebFilterChain) {