Skip to content
Snippets Groups Projects
Commit ea37f9e1 authored by OZGCloud's avatar OZGCloud
Browse files

OZG-6432 Code verbessert

parent c6480788
No related branches found
No related tags found
No related merge requests found
......@@ -38,8 +38,6 @@ import java.util.Map;
import java.util.Optional;
import java.util.Set;
import jakarta.annotation.PostConstruct;
import org.opensaml.core.config.ConfigurationService;
import org.opensaml.core.config.InitializationService;
import org.opensaml.core.criterion.EntityIdCriterion;
......@@ -72,6 +70,7 @@ import org.springframework.security.saml2.Saml2Exception;
import org.springframework.security.saml2.core.Saml2X509Credential;
import org.springframework.util.Assert;
import jakarta.annotation.PostConstruct;
import lombok.Getter;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
......@@ -139,7 +138,7 @@ class BayernIdSamlConfiguration {
CredentialResolver credentialsResolver = new CollectionCredentialResolver(credentials);
return new ExplicitKeySignatureTrustEngine(credentialsResolver,
DefaultSecurityConfigurationBootstrap.buildBasicInlineKeyInfoCredentialResolver());
DefaultSecurityConfigurationBootstrap.buildBasicInlineKeyInfoCredentialResolver());
}
CriteriaSet getVerificationCriteria() {
......@@ -209,10 +208,10 @@ class BayernIdSamlConfiguration {
private Optional<EntityDescriptor> findEntityDescriptor(XMLObject metadata) {
Optional<EntityDescriptor> descriptor = Optional.empty();
if (metadata instanceof EntityDescriptor) {
descriptor = Optional.of((EntityDescriptor) metadata);
} else if (metadata instanceof EntitiesDescriptor) {
descriptor = ((EntitiesDescriptor) metadata).getEntityDescriptors().stream().findFirst();
if (metadata instanceof EntityDescriptor entityDescritor) {
descriptor = Optional.of(entityDescritor);
} else if (metadata instanceof EntitiesDescriptor entitiesDescriptor) {
descriptor = entitiesDescriptor.getEntityDescriptors().stream().findFirst();
}
return descriptor.filter(entityDescriptor -> entityDescriptor.getIDPSSODescriptor(SAMLConstants.SAML20P_NS) != null).stream().findFirst();
......@@ -234,7 +233,7 @@ class BayernIdSamlConfiguration {
}
if (verification.isEmpty()) {
throw new Saml2Exception(
"Metadata response is missing verification certificates, necessary for verifying SAML assertions");
"Metadata response is missing verification certificates, necessary for verifying SAML assertions");
}
return verification;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment