#111 Let initialize settings only checking SP data to be used on metadata

Author: pitbulk

core/src/main/java/com/onelogin/saml2/settings/Saml2Settings.java

@@ -70,7 +70,7 @@ public class Saml2Settings {
 	private String requestedAuthnContextComparison = "exact";
 	private Boolean wantXMLValidation = true;
 	private String signatureAlgorithm = Constants.RSA_SHA1;
-	private boolean rejectUnsolicitedResponsesWithInResponseTo = false;
+	private Boolean rejectUnsolicitedResponsesWithInResponseTo = false;
 
 	// Compress
 	private Boolean compressRequest = true;
@@ -80,7 +80,8 @@ public class Saml2Settings {
 	private List<Contact> contacts = new LinkedList<Contact>();
 	private Organization organization = null;
 
-
+    private boolean spValidationOnly = false;
+	
 	/**
 	 * @return the strict setting value
 	 */
@@ -744,7 +745,9 @@ protected final void setOrganization(Organization organization) {
 	 */
 	public List<String> checkSettings() {
 		List<String> errors = new ArrayList<String>(this.checkSPSettings());
-		errors.addAll(this.checkIdPSettings());
+		if (!spValidationOnly) { 
+			errors.addAll(this.checkIdPSettings());
+		}
 
 		return errors;
 	}
@@ -890,13 +893,32 @@ private boolean checkRequired(Object value) {
 		return true;
 	}
 
+	/**
+	 * Set the spValidationOnly value, used to check IdP data on checkSettings method
+	 *
+	 * @param spValidationOnly
+	 *            the spValidationOnly value to be set
+	 */
+	public void setSPValidationOnly(Boolean spValidationOnly)
+	{
+		this.spValidationOnly = spValidationOnly;
+	}
+
+	/**
+	 * @return the spValidationOnly value
+	 */
+	public boolean getSPValidationOnly()
+	{
+		return this.spValidationOnly;
+	}
+	
 	/**
 	 * Gets the SP metadata. The XML representation.
 	 *
 	 * @return the SP metadata (xml)
 	 *
 	 * @throws CertificateEncodingException
-	 */	
+	 */
 	public String getSPMetadata() throws CertificateEncodingException {
 		Metadata metadataObj = new Metadata(this);
 		String metadataString = metadataObj.getMetadataString();

core/src/test/java/com/onelogin/saml2/test/settings/Saml2SettingsTest.java

@@ -136,7 +136,7 @@ public void testCheckSPSettingsOk() throws IOException, Error {
 
 	/**
 	 * Tests the checkSettings method of the Saml2Settings
-	 * Case: Check that all possible IdP errors are found
+	 * Case: Check that all possible errors are found
 	 *
 	 * @throws IOException
 	 * @throws Error
@@ -159,6 +159,30 @@ public void testCheckSettingsAllErrors() throws IOException, Error {
 		assertThat(settingsErrors, hasItem("idp_cert_not_found_and_required"));
 	}
 
+	/**
+	 * Tests the checkSettings method of the Saml2Settings
+	 * Case: Check IdP errors
+	 *
+	 * @throws IOException
+	 * @throws Error
+	 *
+	 * @see com.onelogin.saml2.settings.Saml2Settings#checkSettings
+	 */
+	@Test
+	public void testCheckSettingsIdPErrors() throws IOException, Error {
+		Saml2Settings settings = new SettingsBuilder().fromFile("config/config.idperrors.properties").build();
+		List<String> settingsErrors = settings.checkSettings();
+		assertFalse(settingsErrors.isEmpty());
+		assertThat(settingsErrors, hasItem("idp_entityId_not_found"));
+		assertThat(settingsErrors, hasItem("idp_sso_url_invalid"));
+		assertThat(settingsErrors, hasItem("idp_cert_or_fingerprint_not_found_and_required"));
+		assertThat(settingsErrors, hasItem("idp_cert_not_found_and_required"));
+		
+		settings.setSPValidationOnly(true);
+		settingsErrors = settings.checkSettings();
+		assertTrue(settingsErrors.isEmpty());
+	}
+	
 	/**
 	 * Tests the checkSettings method of the Saml2Settings
 	 * Case: No SP Errors

samples/java-saml-tookit-jspsample/src/main/webapp/metadata.jsp

@@ -1,6 +1,7 @@
 <%@page import="java.util.*,com.onelogin.saml2.Auth,com.onelogin.saml2.settings.Saml2Settings" language="java" contentType="application/xhtml+xml"%><%
 Auth auth = new Auth();
 Saml2Settings settings = auth.getSettings();
+settings.setSPValidationOnly(true);
 String metadata = settings.getSPMetadata();
 List<String> errors = Saml2Settings.validateMetadata(metadata);
 if (errors.isEmpty()) {