Add Test for KeyStore support

Author: Chandra158

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

@@ -8,10 +8,16 @@
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.net.URL;
+import java.security.Key;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
 import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.LinkedHashMap;
@@ -58,6 +64,36 @@ public void testLoadFromFileNotExist() throws IOException, SettingsException, Er
 
 		new SettingsBuilder().fromFile("config/config.notfound.properties").build();
 	}
+	
+	/**
+	 * Tests SettingsBuilder fromFile method
+	 * Case: Config file with KeyStore
+	 *
+	 * @throws IOException 
+	 * @throws CertificateException 
+	 * @throws URISyntaxException 
+	 * @throws SettingsException
+	 * @throws Error
+	 * @throws KeyStoreException 
+	 * @throws NoSuchAlgorithmException 
+	 *
+	 * @see {@link com.onelogin.saml2.settings.SettingsBuilder#fromFile(String, java.security.KeyStore, String, String)}
+	 */
+	@Test
+	public void testLoadFromFileAndKeyStore() throws IOException, CertificateException, URISyntaxException, SettingsException, Error, KeyStoreException, NoSuchAlgorithmException {
+		
+		String password = "changeit";
+        String keyStoreFile = "src/test/resources/keystore/oneloginTestKeystore.jks";
+        String alias = "onelogintest";
+        
+        KeyStore ks = KeyStore.getInstance("JKS");
+        ks.load(new FileInputStream(keyStoreFile), password.toCharArray());
+        
+		Saml2Settings setting = new SettingsBuilder().fromFile("config/config.empty.properties", ks, alias, password).build();
+		assertNotNull(setting.getSPcert() instanceof X509Certificate);
+		assertNotNull(setting.getSPkey() instanceof Key);
+	}
+	
 
 	/**
 	 * Tests SettingsBuilder fromFile method

core/src/test/resources/keystore/oneloginTestKeystore.jks

@@ -149,13 +149,12 @@ public void testConstructorWithFilenameAndKeyStore() throws IOException, Setting
 
         Auth auth = new Auth("config/config.min.properties", ks, alias, password);
         assertTrue(auth.getSettings() != null);
-        
         assertTrue(auth.getSettings().getSPcert() != null);
         assertTrue(auth.getSettings().getSPkey() != null);
 
-        Saml2Settings settings = new SettingsBuilder().fromFile("config/config.min.properties").build();
-        assertEquals(settings.getIdpEntityId(), auth.getSettings().getIdpEntityId());
-        assertEquals(settings.getSpEntityId(), auth.getSettings().getSpEntityId());
+        Saml2Settings settings = new SettingsBuilder().fromFile("config/config.min.properties", ks, alias, password).build();
+        assertEquals(settings.getSPcert(), auth.getSettings().getSPcert());
+        assertEquals(settings.getSPkey(), auth.getSettings().getSPkey());
     }
 
 	/**
@@ -183,7 +182,43 @@ public void testConstructorWithReqRes() throws IOException, SettingsException, U
 		assertEquals(settings.getIdpEntityId(), auth.getSettings().getIdpEntityId());
 		assertEquals(settings.getSpEntityId(), auth.getSettings().getSpEntityId());
 	}
-
+	
+	/**
+	 * Tests the constructor of Auth
+	 * Case: KeyStore and HttpServletRequest and HttpServletResponse provided
+	 *
+	 * @throws SettingsException
+	 * @throws IOException
+	 * @throws URISyntaxException
+	 * @throws Error
+	 * @throws KeyStoreException 
+	 * @throws CertificateException 
+	 * @throws NoSuchAlgorithmException 
+	 *
+	 * @see com.onelogin.saml2.Auth
+	 */
+	@Test
+	public void testConstructorWithReqResAndKeyStore() throws IOException, SettingsException, URISyntaxException, Error, KeyStoreException, NoSuchAlgorithmException, CertificateException {
+		HttpServletRequest request = mock(HttpServletRequest.class);
+		HttpServletResponse response = mock(HttpServletResponse.class);
+		
+        String password = "changeit";
+        String keyStoreFile = "src/test/resources/keystore/oneloginTestKeystore.jks";
+        String alias = "onelogintest";
+        
+        KeyStore ks = KeyStore.getInstance("JKS");
+        ks.load(new FileInputStream(keyStoreFile), password.toCharArray());
+        
+        Auth auth = new Auth(ks, alias, password, request, response);
+        assertTrue(auth.getSettings() != null);
+        assertTrue(auth.getSettings().getSPcert() != null);
+        assertTrue(auth.getSettings().getSPkey() != null);
+        
+        Saml2Settings settings = new SettingsBuilder().fromFile("onelogin.saml.properties", ks, alias, password).build();
+        assertEquals(settings.getSPkey(), auth.getSettings().getSPkey());
+        assertEquals(settings.getSPcert(), auth.getSettings().getSPcert());
+	}
+	
 	/**
 	 * Tests the constructor of Auth
 	 * Case: filename, HttpServletRequest and HttpServletResponse provided