Skip to content

Jrey/fix api key filter #175

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jreynard-code merged 2 commits into from
May 20, 2024
Merged

Jrey/fix api key filter #175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9dec8f3
Fix Api key filter returning double response for every endpoint
jreynard-code May 17, 2024
5914b74
Upgrades
jreynard-code May 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 6 additions & 3 deletions src/main/kotlin/com/cosmotech/api/security/filters/ApiKeyAuthenticationFilter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ->
Expand Down Expand Up @@ -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)
}
}
}

Expand Down