Compare commits

..

No commits in common. "main" and "0.27.0" have entirely different histories.
main ... 0.27.0

3 changed files with 7 additions and 16 deletions

1
.gitignore vendored
View File

@ -39,4 +39,3 @@ gradle/
**/.gradle **/.gradle
**/build **/build
.DS_Store

View File

@ -1,6 +1,7 @@
plugins { plugins {
`java-library` `java-library`
`maven-publish` `maven-publish`
`kotlin-dsl`
pmd pmd
checkstyle checkstyle
jacoco jacoco
@ -11,11 +12,12 @@ plugins {
val springVersion = "3.2.2"; val springVersion = "3.2.2";
dependencies { dependencies {
api("com.knecon.fforesight:tenant-commons:0.31.0") api("com.knecon.fforesight:tenant-commons:0.23.0")
api("org.springframework.boot:spring-boot-starter-oauth2-resource-server:${springVersion}") api("org.springframework.boot:spring-boot-starter-oauth2-resource-server:${springVersion}")
api("org.springframework.boot:spring-boot-starter-security:${springVersion}") api("org.springframework.boot:spring-boot-starter-security:${springVersion}")
api("org.springframework.boot:spring-boot-starter-web:${springVersion}") api("org.springframework.boot:spring-boot-starter-web:${springVersion}")
api("org.springframework.boot:spring-boot-configuration-processor:${springVersion}") api("org.springframework.boot:spring-boot-configuration-processor:${springVersion}")
api("org.projectlombok:lombok:1.18.30")
testImplementation("org.springframework.boot:spring-boot-starter-test:${springVersion}") testImplementation("org.springframework.boot:spring-boot-starter-test:${springVersion}")
} }
@ -79,7 +81,7 @@ tasks.named<Test>("test") {
sonarqube { sonarqube {
properties { properties {
providers.gradleProperty("sonarToken").getOrNull()?.let { property("sonar.login", it) } property("sonar.login", providers.gradleProperty("sonarToken").getOrNull())
property("sonar.host.url", "https://sonarqube.knecon.com") property("sonar.host.url", "https://sonarqube.knecon.com")
} }
} }

View File

@ -1,5 +1,6 @@
package com.knecon.fforesight.keycloakcommons.security; package com.knecon.fforesight.keycloakcommons.security;
import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.Optional; import java.util.Optional;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
@ -7,6 +8,7 @@ import java.util.concurrent.ConcurrentHashMap;
import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.authentication.AuthenticationManagerResolver; import org.springframework.security.authentication.AuthenticationManagerResolver;
import org.springframework.security.oauth2.jwt.JwtDecoder; import org.springframework.security.oauth2.jwt.JwtDecoder;
import org.springframework.security.oauth2.jwt.JwtDecoders;
import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationConverter; import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationConverter;
import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationProvider; import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationProvider;
import org.springframework.security.oauth2.server.resource.web.BearerTokenResolver; import org.springframework.security.oauth2.server.resource.web.BearerTokenResolver;
@ -35,18 +37,6 @@ public class TenantAuthenticationManagerResolver implements AuthenticationManage
} }
public AuthenticationManager resolve(String token) {
return this.authenticationManagers.computeIfAbsent(toTenant(token), this::fromTenant);
}
private String toTenant(String token) {
return TokenUtils.toTenant(token);
}
private String toTenant(HttpServletRequest request) { private String toTenant(HttpServletRequest request) {
return TokenUtils.toTenant(this.resolver.resolve(request)); return TokenUtils.toTenant(this.resolver.resolve(request));