From c2957a3a2cc443b673b556ac7840f5d335bb0f2b Mon Sep 17 00:00:00 2001 From: Josh Cummings Date: Tue, 28 Feb 2023 10:06:34 -0700 Subject: [PATCH] Format Federation Example Issue gh-122 --- ...ityIdRelyingPartyRegistrationResolver.java | 4 +++- .../java/example/SecurityConfiguration.java | 19 +++++++++---------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/servlet/spring-boot/java/saml2/saml-extension-federation/src/main/java/example/EntityIdRelyingPartyRegistrationResolver.java b/servlet/spring-boot/java/saml2/saml-extension-federation/src/main/java/example/EntityIdRelyingPartyRegistrationResolver.java index de44860..d3e4fb6 100644 --- a/servlet/spring-boot/java/saml2/saml-extension-federation/src/main/java/example/EntityIdRelyingPartyRegistrationResolver.java +++ b/servlet/spring-boot/java/saml2/saml-extension-federation/src/main/java/example/EntityIdRelyingPartyRegistrationResolver.java @@ -29,7 +29,6 @@ import org.opensaml.saml.saml2.core.impl.ResponseUnmarshaller; import org.w3c.dom.Document; import org.w3c.dom.Element; -import org.springframework.lang.NonNull; import org.springframework.security.saml2.core.OpenSamlInitializationService; import org.springframework.security.saml2.core.Saml2Error; import org.springframework.security.saml2.core.Saml2ErrorCodes; @@ -40,11 +39,13 @@ import org.springframework.security.saml2.provider.service.registration.RelyingP import org.springframework.security.saml2.provider.service.web.RelyingPartyRegistrationResolver; public class EntityIdRelyingPartyRegistrationResolver implements RelyingPartyRegistrationResolver { + static { OpenSamlInitializationService.initialize(); } private final ResponseUnmarshaller responseUnmarshaller; + private final ParserPool parserPool; private final InMemoryRelyingPartyRegistrationRepository registrations; @@ -96,4 +97,5 @@ public class EntityIdRelyingPartyRegistrationResolver implements RelyingPartyReg throw new Saml2AuthenticationException(error, ex.getMessage()); } } + } diff --git a/servlet/spring-boot/java/saml2/saml-extension-federation/src/main/java/example/SecurityConfiguration.java b/servlet/spring-boot/java/saml2/saml-extension-federation/src/main/java/example/SecurityConfiguration.java index d8cb628..a81fa8c 100644 --- a/servlet/spring-boot/java/saml2/saml-extension-federation/src/main/java/example/SecurityConfiguration.java +++ b/servlet/spring-boot/java/saml2/saml-extension-federation/src/main/java/example/SecurityConfiguration.java @@ -65,7 +65,6 @@ public class SecurityConfiguration { return http.build(); } - @Bean Saml2AuthenticationTokenConverter usingEntityId(InMemoryRelyingPartyRegistrationRepository repository) { var registrations = new EntityIdRelyingPartyRegistrationResolver(repository); @@ -82,28 +81,28 @@ public class SecurityConfiguration { @Bean InMemoryRelyingPartyRegistrationRepository repository(Saml2RelyingPartyProperties properties, - @Value("classpath:credentials/rp-private.key") RSAPrivateKey key, - @Value("classpath:credentials/rp-certificate.crt") File cert) { + @Value("classpath:credentials/rp-private.key") RSAPrivateKey key, + @Value("classpath:credentials/rp-certificate.crt") File cert) { Saml2X509Credential signing = Saml2X509Credential.signing(key, x509Certificate(cert)); Registration registration = properties.getRegistration().values().iterator().next(); return new InMemoryRelyingPartyRegistrationRepository(RelyingPartyRegistrations - .collectionFromMetadataLocation(registration.getAssertingparty().getMetadataUri()) - .stream().map((builder) -> builder - .registrationId(UUID.randomUUID().toString()) + .collectionFromMetadataLocation(registration.getAssertingparty().getMetadataUri()).stream() + .map((builder) -> builder.registrationId(UUID.randomUUID().toString()) .entityId(registration.getEntityId()) .assertionConsumerServiceLocation(registration.getAcs().getLocation()) .singleLogoutServiceLocation(registration.getSinglelogout().getUrl()) .singleLogoutServiceResponseLocation(registration.getSinglelogout().getResponseUrl()) - .signingX509Credentials(credentials -> credentials.add(signing)) - .build() - ).collect(Collectors.toList())); + .signingX509Credentials((credentials) -> credentials.add(signing)).build()) + .collect(Collectors.toList())); } X509Certificate x509Certificate(File location) { try (InputStream source = new FileInputStream(location)) { return (X509Certificate) CertificateFactory.getInstance("X.509").generateCertificate(source); - } catch (CertificateException | IOException ex) { + } + catch (CertificateException | IOException ex) { throw new IllegalArgumentException(ex); } } + }