From 9dec8f380ea2be619166857798237ad30e55c7bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Reynard?= Date: Fri, 17 May 2024 18:05:01 +0200 Subject: [PATCH 1/2] Fix Api key filter returning double response for every endpoint --- .../api/security/filters/ApiKeyAuthenticationFilter.kt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/kotlin/com/cosmotech/api/security/filters/ApiKeyAuthenticationFilter.kt b/src/main/kotlin/com/cosmotech/api/security/filters/ApiKeyAuthenticationFilter.kt index 5cd06807..c3fd6192 100644 --- a/src/main/kotlin/com/cosmotech/api/security/filters/ApiKeyAuthenticationFilter.kt +++ b/src/main/kotlin/com/cosmotech/api/security/filters/ApiKeyAuthenticationFilter.kt @@ -24,7 +24,6 @@ class ApiKeyAuthenticationFilter(val csmPlatformProperties: CsmPlatformPropertie ) { logger.trace("API-Key filter starts") val allowedApiKeyConsumers = csmPlatformProperties.authorization.allowedApiKeyConsumers - if (allowedApiKeyConsumers.isEmpty()) chain.doFilter(request, response) val matchingApiKeyConsumer = allowedApiKeyConsumers.firstOrNull { apiKeyConsumer -> @@ -86,8 +85,12 @@ class ApiKeyAuthenticationFilter(val csmPlatformProperties: CsmPlatformPropertie true } else { val requestUriSplitted = requestUri.split(securedUriSplitted[0]) - val uriSuffix = securedUriSplitted[0] + requestUriSplitted[1] - securedUri.toRegex().matches(uriSuffix) + if (requestUriSplitted.size < 2) { + false + } else { + val uriSuffix = securedUriSplitted[0] + requestUriSplitted[1] + securedUri.toRegex().matches(uriSuffix) + } } } From 5914b74c6242f8f655ae98176a58d49699788914 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Reynard?= Date: Fri, 17 May 2024 18:06:35 +0200 Subject: [PATCH 2/2] Upgrades - redis-om-spring from 0.9.0 to 0.9.1 - springdoc-openapi-starter-webmvc-ui from 2.2.0 to 2.5.0 - swagger-parser-v3 from 2.1.16 to 2.1.22 --- build.gradle.kts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index e7db64d2..868342f1 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -152,17 +152,17 @@ val springWebVersion = "6.1.4" val springBootVersion = "3.2.5" // Implementation -val swaggerParserVersion = "2.1.16" +val swaggerParserVersion = "2.1.22" val hashidsVersion = "1.0.3" val springOauthAutoConfigureVersion = "2.6.8" val springSecurityJwtVersion = "1.1.1.RELEASE" -val springDocVersion = "2.2.0" +val springDocVersion = "2.5.0" val springOauthVersion = "6.2.2" val servletApiVersion = "6.0.0" val oktaSpringBootVersion = "3.0.5" val tikaVersion = "2.9.1" val kubernetesClientVersion = "19.0.0" -val redisOMVersion = "0.9.0" +val redisOMVersion = "0.9.1" val kotlinCoroutinesCoreVersion = "1.7.3" // Checks