Feedback. Part 3.

#436 (comment)

Author: fhanik

samples/service-provider/starter/src/main/java/org/springframework/security/config/annotation/web/configurers/Saml2ServiceProviderConfigurer.java

@@ -33,7 +33,6 @@
 import org.springframework.security.saml2.serviceprovider.registration.Saml2IdentityProviderDetails.Saml2IdentityProviderDetailsBuilder;
 import org.springframework.security.saml2.serviceprovider.registration.Saml2IdentityProviderRepository;
 import org.springframework.security.saml2.serviceprovider.registration.Saml2ServiceProviderRegistration;
-import org.springframework.security.saml2.serviceprovider.registration.Saml2ServiceProviderRegistration.Saml2ServiceProviderRegistrationBuilder;
 import org.springframework.security.saml2.credentials.Saml2X509Credential;
 import org.springframework.security.saml2.serviceprovider.servlet.filter.Saml2AuthenticationFailureHandler;
 import org.springframework.security.saml2.serviceprovider.servlet.filter.Saml2WebSsoAuthenticationFilter;
@@ -46,7 +45,8 @@ public static Saml2ServiceProviderConfigurer saml2Login() {
 		return new Saml2ServiceProviderConfigurer();
 	}
 
-	private Saml2ServiceProviderRegistrationBuilder serviceProvider = Saml2ServiceProviderRegistration.builder();
+	private String spEntityId = null;
+	private List<Saml2X509Credential> spCredentials = new LinkedList<>();
 	private List<Saml2IdentityProviderDetails> idps = new LinkedList<>();
 	private AuthenticationProvider authenticationProvider;
 
@@ -55,12 +55,12 @@ public Saml2ServiceProviderConfigurer() {
 	}
 
 	public Saml2ServiceProviderConfigurer serviceProviderEntityId(String entityId) {
-		this.serviceProvider.entityId(entityId);
+		this.spEntityId = entityId;
 		return this;
 	}
 
 	public Saml2ServiceProviderConfigurer addServiceProviderKey(Saml2X509Credential key) {
-		this.serviceProvider.credential(key);
+		this.spCredentials.add(key);
 		return this;
 	}
 
@@ -94,7 +94,7 @@ public void init(HttpSecurity builder) throws Exception {
 				);
 
 			authenticationProvider = new Saml2AuthenticationProvider(
-				serviceProvider.build(),
+				new Saml2ServiceProviderRegistration(spEntityId, spCredentials),
 				identityProviderRepository
 			);
 		}

samples/service-provider/starter/src/main/java/org/springframework/security/saml2/serviceprovider/registration/Saml2ServiceProviderRegistration.java

@@ -22,6 +22,9 @@
 
 import org.springframework.security.saml2.credentials.Saml2X509Credential;
 
+import static org.springframework.util.Assert.notEmpty;
+import static org.springframework.util.Assert.notNull;
+
 
 /**
  * Configuration object that represents a local(hosted) service provider
@@ -31,18 +34,14 @@ public class Saml2ServiceProviderRegistration {
 	private final String entityId;
 	private final List<Saml2X509Credential> credentials = new LinkedList<>();
 
-	public static Saml2ServiceProviderRegistrationBuilder builder() {
-		return new Saml2ServiceProviderRegistrationBuilder();
-	}
-
-	public static Saml2ServiceProviderRegistrationBuilder builder(Saml2ServiceProviderRegistration registration) {
-		return builder()
-			.credentials(registration.getSaml2Credentials())
-			.entityId(registration.getEntityId());
-	}
-
-	private Saml2ServiceProviderRegistration(String entityId,
+	public Saml2ServiceProviderRegistration(String entityId,
 											List<Saml2X509Credential> credentials) {
+		notNull(entityId, "entityId is required");
+		notEmpty(credentials, "at least one private key and certificate is required for signed and encrypted messages");
+		credentials.stream().forEach(c -> {
+			notNull(c.getPrivateKey(), "private key required in all credentials");
+			notNull(c.getCertificate(), "certificate required in all credentials");
+		});
 		this.entityId = entityId;
 		this.credentials.addAll(credentials);
 	}
@@ -55,34 +54,4 @@ public String getEntityId() {
 		return entityId;
 	}
 
-	public static final class Saml2ServiceProviderRegistrationBuilder {
-		private String entityId;
-		private List<Saml2X509Credential> credentials = new LinkedList<>();
-
-		private Saml2ServiceProviderRegistrationBuilder() {
-		}
-
-		public Saml2ServiceProviderRegistrationBuilder entityId(String entityId) {
-			this.entityId = entityId;
-			return this;
-		}
-
-		public Saml2ServiceProviderRegistrationBuilder credentials(List<Saml2X509Credential> keys) {
-			this.credentials = keys;
-			return this;
-		}
-
-		public void credential(Saml2X509Credential key) {
-			this.credentials.add(key);
-		}
-
-		public Saml2ServiceProviderRegistration build() {
-			Saml2ServiceProviderRegistration saml2ServiceProviderRegistration = new Saml2ServiceProviderRegistration(
-				entityId,
-				credentials
-			);
-			return saml2ServiceProviderRegistration;
-		}
-	}
-
 }