Feedback. Part 2.

#436 (comment)

Author: fhanik

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

@@ -34,7 +34,7 @@
 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.serviceprovider.registration.Saml2X509Credential;
+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;
 import org.springframework.security.web.header.HeaderWriterFilter;

samples/service-provider/starter/src/main/java/org/springframework/security/saml2/serviceprovider/registration/Saml2X509Credential.java renamed to samples/service-provider/starter/src/main/java/org/springframework/security/saml2/credentials/Saml2X509Credential.java

@@ -15,18 +15,26 @@
  *
  */
 
-package org.springframework.security.saml2.serviceprovider.registration;
+package org.springframework.security.saml2.credentials;
 
 import java.security.PrivateKey;
 import java.security.cert.X509Certificate;
 
+import static org.springframework.util.Assert.notNull;
+
+/**
+ * Saml2X509Credential is meant to hold an X509 certificate, or an X509 certificate and a private key.
+ * Per: https://www.oasis-open.org/committees/download.php/8958/sstc-saml-implementation-guidelines-draft-01.pdf
+ * Line: 584, Section 4.3 Credentials
+ */
 public class Saml2X509Credential {
 
 	private final PrivateKey privateKey;
 	private final X509Certificate certificate;
 
 	public Saml2X509Credential(PrivateKey privateKey,
 							   X509Certificate certificate) {
+		notNull(certificate, "certificate is required");
 		this.privateKey = privateKey;
 		this.certificate = certificate;
 	}

samples/service-provider/starter/src/main/java/org/springframework/security/saml2/serviceprovider/authentication/Saml2AuthenticationProvider.java

@@ -40,7 +40,7 @@
 import org.springframework.security.saml2.serviceprovider.registration.Saml2IdentityProviderDetails;
 import org.springframework.security.saml2.serviceprovider.registration.Saml2IdentityProviderRepository;
 import org.springframework.security.saml2.serviceprovider.registration.Saml2ServiceProviderRegistration;
-import org.springframework.security.saml2.serviceprovider.registration.Saml2X509Credential;
+import org.springframework.security.saml2.credentials.Saml2X509Credential;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

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

@@ -20,6 +20,8 @@
 import java.util.LinkedList;
 import java.util.List;
 
+import org.springframework.security.saml2.credentials.Saml2X509Credential;
+
 
 /**
  * Configuration object that represents a local(hosted) service provider

samples/service-provider/starter/src/main/java/sample/SecurityConfig.java

@@ -28,7 +28,7 @@
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.config.annotation.web.configurers.Saml2ServiceProviderConfigurer;
-import org.springframework.security.saml2.serviceprovider.registration.Saml2X509Credential;
+import org.springframework.security.saml2.credentials.Saml2X509Credential;
 
 import org.bouncycastle.openssl.PEMDecryptorProvider;
 import org.bouncycastle.openssl.PEMEncryptedKeyPair;