Merge branch 'feature/hsmfacade' into nightlyBuild

# Conflicts:
#	eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/metadata/AbstractChainingMetadataProvider.java
#	eaaf_modules/eaaf_module_pvp2_idp/src/test/resources/spring/test_eaaf_core.beans.xml

2 files changed, 63 insertions, 35 deletions

diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/test/java/at/gv/egiz/eaaf/modules/pvp2/test/CredentialProviderTest.java b/eaaf_modules/eaaf_module_pvp2_core/src/test/java/at/gv/egiz/eaaf/modules/pvp2/test/CredentialProviderTest.java
index b6171e97..22ee389f 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/src/test/java/at/gv/egiz/eaaf/modules/pvp2/test/CredentialProviderTest.java
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/test/java/at/gv/egiz/eaaf/modules/pvp2/test/CredentialProviderTest.java
@@ -3,14 +3,8 @@ package at.gv.egiz.eaaf.modules.pvp2.test;
 import java.security.cert.X509Certificate;
 import java.util.List;
 
-import at.gv.egiz.eaaf.core.exceptions.EaafConfigurationException;
-import at.gv.egiz.eaaf.core.impl.idp.module.test.DummyAuthConfigMap;
-import at.gv.egiz.eaaf.modules.pvp2.PvpConstants;
-import at.gv.egiz.eaaf.modules.pvp2.api.credential.EaafX509Credential;
-import at.gv.egiz.eaaf.modules.pvp2.exception.CredentialsNotAvailableException;
-import at.gv.egiz.eaaf.modules.pvp2.test.dummy.DummyCredentialProvider;
-
 import org.apache.commons.lang3.RandomStringUtils;
+import org.apache.xml.security.algorithms.JCEMapper;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -23,6 +17,14 @@ import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
+import at.gv.egiz.eaaf.core.exceptions.EaafConfigurationException;
+import at.gv.egiz.eaaf.core.exceptions.EaafFactoryException;
+import at.gv.egiz.eaaf.core.impl.idp.module.test.DummyAuthConfigMap;
+import at.gv.egiz.eaaf.modules.pvp2.PvpConstants;
+import at.gv.egiz.eaaf.modules.pvp2.api.credential.EaafX509Credential;
+import at.gv.egiz.eaaf.modules.pvp2.exception.CredentialsNotAvailableException;
+import at.gv.egiz.eaaf.modules.pvp2.test.dummy.DummyCredentialProvider;
+
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration({
@@ -34,9 +36,14 @@ public class CredentialProviderTest {
 
   private static final String PATH_JKS_WITH_TRUST_CERTS = "src/test/resources/data/junit.jks";
   private static final String PATH_JKS_WITHOUT_TRUST_CERTS = "src/test/resources/data/junit_without_trustcerts.jks";
+  //private static final String HSMF_ALIAS_METADATA = "shibboleth-sign";
+  //private static final String HSMF_ALIAS_SIGN = "shibboleth-sign";
+  //private static final String HSMF_ALIAS_ENC = "shibboleth-sign";
+  
   private static final String ALIAS_METADATA = "meta";
   private static final String ALIAS_SIGN = "sig";
   private static final String ALIAS_ENC = "meta";
+  
   private static final String PASSWORD = "password";
 
 
@@ -59,6 +66,8 @@ public class CredentialProviderTest {
 
     config.removeConfigValue(DummyCredentialProvider.KEY_ENCRYPTION_ALIAS);
     config.removeConfigValue(DummyCredentialProvider.KEY_ENCRYPTION_PASSWORD);
+    
+    JCEMapper.setProviderId(null);
 
   }
 
@@ -86,7 +95,7 @@ public class CredentialProviderTest {
       Assert.fail("No KeyStore not detected");
 
     } catch (final BeansException e) {
-      org.springframework.util.Assert.isInstanceOf(java.io.FileNotFoundException.class,
+      org.springframework.util.Assert.isInstanceOf(EaafConfigurationException.class,
           e.getCause(), "Wrong exception");
     }
 
@@ -101,7 +110,7 @@ public class CredentialProviderTest {
       Assert.fail("No KeyStore not detected");
 
     } catch (final BeansException e) {
-      org.springframework.util.Assert.isInstanceOf(EaafConfigurationException.class,
+      org.springframework.util.Assert.isInstanceOf(EaafFactoryException.class,
           e.getCause(), "Wrong exception");
 
     }
@@ -384,6 +393,33 @@ public class CredentialProviderTest {
 
   @Test
   @DirtiesContext
+  public void otherKeyStoreTypeAlreadyLoaded() throws CredentialsNotAvailableException {
+    config.putConfigValue(DummyCredentialProvider.KEYSTORE_PATH, PATH_JKS_WITHOUT_TRUST_CERTS);
+
+    config.putConfigValue(PvpConstants.CONFIG_PROP_SEC_SIGNING_RSA_ALG,
+        "RSA-SIG_" + RandomStringUtils.randomAlphabetic(10));
+    config.putConfigValue(PvpConstants.CONFIG_PROP_SEC_SIGNING_EC_ALG,
+        "EC-SIG_" + RandomStringUtils.randomAlphabetic(10));
+    config.putConfigValue(PvpConstants.CONFIG_PROP_SEC_ENCRYPTION_KEY_RSA_ALG,
+        "RSA_ENC_" + RandomStringUtils.randomAlphabetic(10));
+    config.putConfigValue(PvpConstants.CONFIG_PROP_SEC_ENCRYPTION_KEY_EC_ALG,
+        "EC-ENC_" + RandomStringUtils.randomAlphabetic(10));
+    
+    try {
+      JCEMapper.setProviderId(RandomStringUtils.randomAlphabetic(5));
+      
+      context.getBean(DummyCredentialProvider.class);
+
+    } catch (final BeansException e) {
+      org.springframework.util.Assert.isInstanceOf(EaafConfigurationException.class,
+          e.getCause(), "Wrong exception");
+
+    }
+
+  }
+  
+  @Test
+  @DirtiesContext
   public void notKeyConfiguration() {
     final DummyCredentialProvider credential = context.getBean(DummyCredentialProvider.class);
 
diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/test/java/at/gv/egiz/eaaf/modules/pvp2/test/dummy/DummyCredentialProvider.java b/eaaf_modules/eaaf_module_pvp2_core/src/test/java/at/gv/egiz/eaaf/modules/pvp2/test/dummy/DummyCredentialProvider.java
index b9f1326d..0f8eff72 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/src/test/java/at/gv/egiz/eaaf/modules/pvp2/test/dummy/DummyCredentialProvider.java
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/test/java/at/gv/egiz/eaaf/modules/pvp2/test/dummy/DummyCredentialProvider.java
@@ -1,15 +1,12 @@
 package at.gv.egiz.eaaf.modules.pvp2.test.dummy;
 
-import java.net.MalformedURLException;
+import org.springframework.beans.factory.annotation.Autowired;
 
 import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
-import at.gv.egiz.eaaf.core.exceptions.EaafConfigurationException;
-import at.gv.egiz.eaaf.core.exceptions.EaafException;
-import at.gv.egiz.eaaf.core.impl.utils.FileUtils;
+import at.gv.egiz.eaaf.core.impl.credential.KeyStoreConfiguration;
+import at.gv.egiz.eaaf.core.impl.credential.KeyStoreConfiguration.KeyStoreType;
 import at.gv.egiz.eaaf.modules.pvp2.impl.utils.AbstractCredentialProvider;
 
-import org.springframework.beans.factory.annotation.Autowired;
-
 public class DummyCredentialProvider extends AbstractCredentialProvider {
 
   @Autowired IConfiguration basicConfig;
@@ -26,32 +23,26 @@ public class DummyCredentialProvider extends AbstractCredentialProvider {
   public static final String KEY_ENCRYPTION_ALIAS = "key.enc.alias";
   public static final String KEY_ENCRYPTION_PASSWORD = "key.enc.pass";
 
+  private static final String KEYSTORENAME = "jUnit test credential provider";
+  
   @Override
-  public String getFriendlyName() {
-    return "jUnit test credential provider";
+  public KeyStoreConfiguration getBasicKeyStoreConfig() {
+    KeyStoreConfiguration keyStoreConfig = new KeyStoreConfiguration();
+    keyStoreConfig.setKeyStoreType(KeyStoreType.JKS);
+    keyStoreConfig.setFriendlyName(KEYSTORENAME);
+    
+    keyStoreConfig.setSoftKeyStoreFilePath(getKeyStoreFilePath());
+    keyStoreConfig.setSoftKeyStorePassword(getKeyStorePassword());
+    
+    return keyStoreConfig;
   }
 
-  @Override
-  public String getKeyStoreFilePath() throws EaafException {
+  public String getKeyStoreFilePath() {
     final String path = basicConfig.getBasicConfiguration(KEYSTORE_PATH);
-
-    if (path != null) {
-      try {
-        return FileUtils.makeAbsoluteUrl(
-            path,
-            basicConfig.getConfigurationRootDirectory());
-
-      } catch (final MalformedURLException e) {
-        throw new EaafConfigurationException("internel test error", null, e);
-
-      }
-    }
-
-    throw new EaafConfigurationException("No keyStore path", null);
-
+    return path;
+   
   }
 
-  @Override
   public String getKeyStorePassword() {
     return basicConfig.getBasicConfiguration(KEYSTORE_PASSWORD);
   }
@@ -86,4 +77,5 @@ public class DummyCredentialProvider extends AbstractCredentialProvider {
     return basicConfig.getBasicConfiguration(KEY_ENCRYPTION_PASSWORD);
   }
 
+
 }