Skip to content
Snippets Groups Projects
Commit b5a0a719 authored by Evgeny Bardin's avatar Evgeny Bardin
Browse files

OZG-7092 rename token validation service

parent f5f7a820
No related branches found
No related tags found
1 merge request!1OZG-7092 Anpassung TokenChecker
...@@ -59,7 +59,7 @@ import lombok.Builder; ...@@ -59,7 +59,7 @@ import lombok.Builder;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet; import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
@Builder @Builder
public class SamlTokenValidationService { public class SamlAttributeService {
private final SignatureTrustEngine signatureTrustEngine; private final SignatureTrustEngine signatureTrustEngine;
private final Decrypter decrypter; private final Decrypter decrypter;
......
...@@ -45,8 +45,8 @@ public class SamlConfiguration { ...@@ -45,8 +45,8 @@ public class SamlConfiguration {
return registryBuilder.build(); return registryBuilder.build();
} }
SamlTokenValidationService samlTokenService(TokenValidationProperty tokenValidationProperty) { SamlAttributeService samlTokenService(TokenValidationProperty tokenValidationProperty) {
return SamlTokenValidationService.builder() return SamlAttributeService.builder()
.signatureTrustEngine(samlTrustEngineFactory.buildSamlTrustEngine(tokenValidationProperty)) .signatureTrustEngine(samlTrustEngineFactory.buildSamlTrustEngine(tokenValidationProperty))
.decrypter(samlDecrypterFactory.buildDecrypter(tokenValidationProperty)) .decrypter(samlDecrypterFactory.buildDecrypter(tokenValidationProperty))
.profileValidator(samlSignatureProfileValidator()) .profileValidator(samlSignatureProfileValidator())
......
...@@ -30,9 +30,9 @@ import lombok.Singular; ...@@ -30,9 +30,9 @@ import lombok.Singular;
public class SamlServiceRegistry { public class SamlServiceRegistry {
@Singular @Singular
private final Map<String, SamlTokenValidationService> samlServices; private final Map<String, SamlAttributeService> samlServices;
public Optional<SamlTokenValidationService> getService(String idpEntityId) { public Optional<SamlAttributeService> getService(String idpEntityId) {
return Optional.ofNullable(samlServices.get(idpEntityId)); return Optional.ofNullable(samlServices.get(idpEntityId));
} }
} }
...@@ -78,7 +78,7 @@ public class SamlTokenService { ...@@ -78,7 +78,7 @@ public class SamlTokenService {
return getValidationService(tokenIssuer).validate(token); return getValidationService(tokenIssuer).validate(token);
} }
SamlTokenValidationService getValidationService(String tokenIssuer) { SamlAttributeService getValidationService(String tokenIssuer) {
return samlServiceRegistry.getService(tokenIssuer) return samlServiceRegistry.getService(tokenIssuer)
.orElseThrow(() -> new TechnicalException("No validation service found for issuer %s".formatted(tokenIssuer))); .orElseThrow(() -> new TechnicalException("No validation service found for issuer %s".formatted(tokenIssuer)));
} }
......
...@@ -69,11 +69,11 @@ import de.ozgcloud.token.common.errorhandling.TokenVerificationException; ...@@ -69,11 +69,11 @@ import de.ozgcloud.token.common.errorhandling.TokenVerificationException;
import lombok.SneakyThrows; import lombok.SneakyThrows;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet; import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
class SamlTokenValidationServiceTest { class SamlAttributeServiceTest {
@Spy @Spy
@InjectMocks @InjectMocks
private SamlTokenValidationService service; private SamlAttributeService service;
@Mock @Mock
private SignatureTrustEngine signatureTrustEngine; private SignatureTrustEngine signatureTrustEngine;
......
...@@ -65,7 +65,7 @@ class SamlConfigurationTest { ...@@ -65,7 +65,7 @@ class SamlConfigurationTest {
@Mock @Mock
private TokenValidationProperty tokenValidationProperty; private TokenValidationProperty tokenValidationProperty;
@Mock @Mock
private SamlTokenValidationService tokenValidationService; private SamlAttributeService tokenValidationService;
@BeforeEach @BeforeEach
void init() { void init() {
...@@ -175,7 +175,7 @@ class SamlConfigurationTest { ...@@ -175,7 +175,7 @@ class SamlConfigurationTest {
assertThat(result).extracting("verificationCriteria").isEqualTo(verificationCriteria); assertThat(result).extracting("verificationCriteria").isEqualTo(verificationCriteria);
} }
private SamlTokenValidationService samlTokenService() { private SamlAttributeService samlTokenService() {
return configuration.samlTokenService(tokenValidationProperty); return configuration.samlTokenService(tokenValidationProperty);
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment