Merge branch 'feature/springboot' into 'nightlybuild'

Feature/springboot

See merge request egiz/eidas_at_proxy!7

14 files changed, 846 insertions, 4 deletions

diff --git a/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/MsConnectorEventCodes.java b/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/MsConnectorEventCodes.java
index 9c80f4ad..cfc434c4 100644
--- a/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/MsConnectorEventCodes.java
+++ b/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/MsConnectorEventCodes.java
@@ -38,8 +38,15 @@ public class MsConnectorEventCodes {
 
   public static final int SZR_IDL_RECEIVED = 6200;
   public static final int SZR_BPK_RECEIVED = 6201;
+  public static final int SZR_VSZ_RECEIVED = 6202;
+  public static final int SZR_EIDASBIND_RECEIVED = 6203;
+  public static final int TECH_AUCHBLOCK_CREATED = 6204;
 
   public static final int SZR_ERNB_EIDAS_RAW_ID = 6210;
   public static final int SZR_ERNB_EIDAS_ERNB_ID = 6211;
 
+  
+  private MsConnectorEventCodes() {
+    // hidden constructor for class with static values only.
+  }
 }
diff --git a/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/MsEidasNodeConstants.java b/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/MsEidasNodeConstants.java
index b1ef799f..133f104d 100644
--- a/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/MsEidasNodeConstants.java
+++ b/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/MsEidasNodeConstants.java
@@ -103,7 +103,7 @@ public class MsEidasNodeConstants {
   
   
 
-  public static final String PROP_CONFIG_SP_LIST_PREFIX = "sp.";
+  public static final String PROP_CONFIG_SP_LIST_PREFIX = "sp";
   public static final String PROP_CONFIG_SP_UNIQUEIDENTIFIER = EaafConfigConstants.SERVICE_UNIQUEIDENTIFIER;
   public static final String PROP_CONFIG_SP_FRIENDLYNAME = "friendlyName";
   public static final String PROP_CONFIG_SP_PVP2_METADATA_URL = "pvp2.metadata.url";
@@ -169,4 +169,8 @@ public class MsEidasNodeConstants {
   public static final List<String> COUNTRY_SELECTION_PARAM_WHITELIST =
       Arrays.asList(REQ_PARAM_SELECTED_COUNTRY, REQ_PARAM_SELECTED_ENVIRONMENT);
 
+  private MsEidasNodeConstants() {
+    //hidden Constructor for class with static values only.
+  }
+  
 }
diff --git a/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/config/BasicConfigurationProvider.java b/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/config/BasicConfigurationProvider.java
index 355c63f2..89ccdfe7 100644
--- a/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/config/BasicConfigurationProvider.java
+++ b/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/config/BasicConfigurationProvider.java
@@ -31,6 +31,7 @@ import java.util.Map.Entry;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Service;
 
 import at.asitplus.eidas.specific.connector.MsEidasNodeConstants;
@@ -41,6 +42,7 @@ import at.gv.egiz.eaaf.core.impl.idp.conf.AbstractConfigurationImpl;
 import at.gv.egiz.eaaf.core.impl.utils.KeyValueUtils;
 
 @Service("BasicMSSpecificNodeConfig")
+@Profile("deprecatedConfig")
 public class BasicConfigurationProvider extends AbstractConfigurationImpl {
   private static final Logger log = LoggerFactory.getLogger(BasicConfigurationProvider.class);
 
@@ -56,7 +58,7 @@ public class BasicConfigurationProvider extends AbstractConfigurationImpl {
     if (!spConfigCache.containsKey(entityId)) {
       log.debug("SP: " + entityId + " is NOT cached. Starting load operation ...  ");
       final Map<String, String> allSPs = getBasicConfigurationWithPrefix(
-          MsEidasNodeConstants.PROP_CONFIG_SP_LIST_PREFIX);
+          MsEidasNodeConstants.PROP_CONFIG_SP_LIST_PREFIX + KeyValueUtils.KEY_DELIMITER);
       for (Entry<String, String> entry : allSPs.entrySet()) {
         if (entry.getKey().endsWith(MsEidasNodeConstants.PROP_CONFIG_SP_UNIQUEIDENTIFIER) 
             && entry.getValue().equals(entityId)) {
diff --git a/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/config/SpringBootBasicConfigurationProvider.java b/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/config/SpringBootBasicConfigurationProvider.java
new file mode 100644
index 00000000..76e2c01f
--- /dev/null
+++ b/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/config/SpringBootBasicConfigurationProvider.java
@@ -0,0 +1,122 @@
+package at.asitplus.eidas.specific.connector.config;
+
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.apache.commons.lang3.StringUtils;
+
+import at.asitplus.eidas.specific.connector.MsEidasNodeConstants;
+import at.gv.egiz.eaaf.core.api.idp.ISpConfiguration;
+import at.gv.egiz.eaaf.core.exceptions.EaafConfigurationException;
+import at.gv.egiz.eaaf.core.exceptions.EaafException;
+import at.gv.egiz.eaaf.core.impl.idp.conf.AbstractSpringBootConfigurationImpl;
+import at.gv.egiz.eaaf.core.impl.utils.KeyValueUtils;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class SpringBootBasicConfigurationProvider extends AbstractSpringBootConfigurationImpl {
+
+  private final Map<String, ISpConfiguration> spConfigCache = new HashMap<>();
+  
+  @Override
+  public ISpConfiguration getServiceProviderConfiguration(String entityId) throws EaafConfigurationException {
+    if (!spConfigCache.containsKey(entityId)) {
+      log.debug("SP: " + entityId + " is NOT cached. Starting load operation ...  ");
+      final Map<String, String> allSPs = getBasicConfigurationWithPrefix(
+          MsEidasNodeConstants.PROP_CONFIG_SP_LIST_PREFIX);
+      for (Entry<String, String> entry : allSPs.entrySet()) {
+        if (entry.getKey().endsWith(MsEidasNodeConstants.PROP_CONFIG_SP_UNIQUEIDENTIFIER) 
+            && entry.getValue().equals(entityId)) {
+          final String listId = KeyValueUtils.getParentKey(entry.getKey());
+          log.trace("Find SP configuration with list-Id: " + listId
+              + ". Extracting configuration elements ... ");
+          final Map<String, String> spConfig = KeyValueUtils.getSubSetWithPrefix(allSPs, listId
+              + KeyValueUtils.KEY_DELIMITER);
+          spConfigCache.put(entityId,
+              new ServiceProviderConfiguration(spConfig, this));
+          break;
+        }
+      }
+
+      if (spConfigCache.containsKey(entityId)) {
+        log.info("SP: " + entityId + " is loaded. Continuing auth. process ... ");
+      } else {
+        log.warn("SP: " + entityId + " is NOT found in configuration. Stopping auth. process ... ");
+        return null;
+
+      }
+
+    } else {
+      log.trace("SP: " + entityId + " is already cached. Use configuration from there ... ");
+    }
+
+    return spConfigCache.get(entityId);
+  }
+
+  @Override
+  public <T> T getServiceProviderConfiguration(String entityId, Class<T> decorator)
+      throws EaafConfigurationException {
+    final ISpConfiguration spConfig = getServiceProviderConfiguration(entityId);
+    if (spConfig != null && decorator != null) {
+      if (decorator.isInstance(spConfig)) {
+        return (T) spConfig;
+      } else {
+        log.error("SPConfig: " + spConfig.getClass().getName() + " is NOT instance of: " + decorator
+            .getName());
+      }
+
+    }
+
+    return null;
+
+  }
+
+  @Override
+  public String validateIdpUrl(URL url) throws EaafException {
+    log.trace("Validate requested URL: " + url);
+    String urlPrefixFromConfig = getBasicConfiguration(
+        MsEidasNodeConstants.PROP_CONFIG_APPLICATION_PUBLIC_URL_PREFIX);
+    if (StringUtils.isEmpty(urlPrefixFromConfig)) {
+      log.warn("Application config containts NO URL prefix");
+      throw new EaafConfigurationException("config.27",
+          new Object[] { "Application config containts NO "
+              + getApplicationSpecificKeyPrefix()
+              + MsEidasNodeConstants.PROP_CONFIG_APPLICATION_PUBLIC_URL_PREFIX });
+
+    }
+
+    // remove last slash
+    if (urlPrefixFromConfig.endsWith("/")) {
+      urlPrefixFromConfig = urlPrefixFromConfig.substring(0, urlPrefixFromConfig.length() - 1);
+    }
+
+    if (getBasicConfigurationBoolean(
+        MsEidasNodeConstants.PROP_CONFIG_APPLICATION_PUBLIC_URL_REQUEST_VALIDATION, false)) {
+      if (url != null && url.toExternalForm().startsWith(urlPrefixFromConfig)) {
+        return urlPrefixFromConfig;
+      }
+
+      log.info("URL: " + url + " does NOT match to allowed application prefix: " + urlPrefixFromConfig);
+      return null;
+
+    } else {
+      return urlPrefixFromConfig;
+
+    }
+  }
+
+  @Override
+  public String getApplicationSpecificKeyPrefix() {
+    return MsEidasNodeConstants.PROP_CONFIG_APPLICATION_PREFIX;
+
+  }
+
+  @Override
+  protected String getBackupConfigPath() {
+    return null;
+
+  }
+
+}
diff --git a/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/gui/DefaultVelocityGuiBuilderImpl.java b/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/gui/DefaultVelocityGuiBuilderImpl.java
index 7abc6fcb..e7ebc92f 100644
--- a/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/gui/DefaultVelocityGuiBuilderImpl.java
+++ b/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/gui/DefaultVelocityGuiBuilderImpl.java
@@ -33,7 +33,7 @@ import at.gv.egiz.eaaf.core.api.gui.IVelocityGuiBuilderConfiguration;
 import at.gv.egiz.eaaf.core.exceptions.GuiBuildException;
 import at.gv.egiz.eaaf.core.impl.gui.AbstractVelocityGuiFormBuilderImpl;
 
-@Service("DefaultVelocityGUIBuilderImpl")
+@Service("velocityGUIBuilderImpl")
 public class DefaultVelocityGuiBuilderImpl extends AbstractVelocityGuiFormBuilderImpl {
   private static final Logger log = LoggerFactory.getLogger(DefaultVelocityGuiBuilderImpl.class);
 
diff --git a/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/gui/StaticGuiBuilderConfiguration.java b/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/gui/StaticGuiBuilderConfiguration.java
index 65000ffa..25f5beda 100644
--- a/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/gui/StaticGuiBuilderConfiguration.java
+++ b/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/gui/StaticGuiBuilderConfiguration.java
@@ -117,7 +117,7 @@ public class StaticGuiBuilderConfiguration extends AbstractGuiFormBuilderConfigu
 
   @Override
   public void putCustomParameterWithOutEscaption(GroupDefinition group, String key, Object value) {
-    log.info("Add GUI-Template parameters WITHOUT escaption ARE NOT supported!!!!!");
+    setViewParameter(getFromGroup(), key, value);
 
   }
 
diff --git a/connector_lib/src/main/resources/common_gui.beans.xml b/connector_lib/src/main/resources/common_gui.beans.xml
new file mode 100644
index 00000000..969a40f7
--- /dev/null
+++ b/connector_lib/src/main/resources/common_gui.beans.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:context="http://www.springframework.org/schema/context"
+  xmlns:tx="http://www.springframework.org/schema/tx"
+  xmlns:aop="http://www.springframework.org/schema/aop"
+  xmlns:task="http://www.springframework.org/schema/task"
+  xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.1.xsd
+    http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+    http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd
+    http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd 
+    http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-3.0.xsd">
+
+  <bean id="contentNegotiationManager"
+    class="org.springframework.web.accept.ContentNegotiationManagerFactoryBean"
+    primary="true">
+    <property name="parameterName" value="mediaType" />
+    <property name="defaultContentType" value="application/json" />
+    <property name="useRegisteredExtensionsOnly" value="false" />
+    <property name="mediaTypes">
+      <map>
+        <entry key="json" value="application/json" />
+        <entry key="html" value="text/html" />
+      </map>
+    </property>
+  </bean>
+
+  <bean
+    class="org.springframework.web.servlet.view.ContentNegotiatingViewResolver">
+    <property name="order" value="1" />
+    <property name="defaultViews">
+      <list>
+        <!-- JSON View -->
+        <bean
+          class="org.springframework.web.servlet.view.json.MappingJackson2JsonView">
+          <property name="contentType" value="application/json" />
+        </bean>
+      </list>
+    </property>
+  </bean>
+
+
+  <bean id="templateEngine"
+    class="org.thymeleaf.spring5.SpringTemplateEngine">
+    <property name="templateResolver" ref="templateResolver" />
+  </bean>
+
+  <bean class="org.thymeleaf.spring5.view.ThymeleafViewResolver">
+    <property name="order" value="2" />
+    <property name="templateEngine" ref="templateEngine" />
+    <property name="characterEncoding" value="UTF-8" />
+  </bean>
+
+  <bean id="valitatorWithI18nSupport"
+    class="org.springframework.validation.beanvalidation.LocalValidatorFactoryBean">
+    <property name="validationMessageSource"
+      ref="messageSource" />
+  </bean>
+
+</beans>
\ No newline at end of file
diff --git a/connector_lib/src/test/java/at/asitplus/eidas/specific/connector/test/config/BasicConfigProviderTest.java b/connector_lib/src/test/java/at/asitplus/eidas/specific/connector/test/config/BasicConfigProviderTest.java
new file mode 100644
index 00000000..d1623b00
--- /dev/null
+++ b/connector_lib/src/test/java/at/asitplus/eidas/specific/connector/test/config/BasicConfigProviderTest.java
@@ -0,0 +1,156 @@
+package at.asitplus.eidas.specific.connector.test.config;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Map;
+
+import org.apache.commons.lang3.RandomStringUtils;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.annotation.DirtiesContext.ClassMode;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import at.asitplus.eidas.specific.connector.MsEidasNodeConstants;
+import at.asitplus.eidas.specific.connector.config.ServiceProviderConfiguration;
+import at.gv.egiz.eaaf.core.api.idp.IConfigurationWithSP;
+import at.gv.egiz.eaaf.core.api.idp.ISpConfiguration;
+import at.gv.egiz.eaaf.core.exceptions.EaafConfigurationException;
+import at.gv.egiz.eaaf.core.exceptions.EaafException;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = {
+    "/SpringTest-context_basic_realConfig.xml"})
+@DirtiesContext(classMode = ClassMode.BEFORE_CLASS)
+public class BasicConfigProviderTest {
+
+  @Autowired private IConfigurationWithSP basicConfig;
+  
+  /**
+   * jUnit class initializer.
+   * 
+   */
+  @BeforeClass
+  public static void classInitializer() {
+    final String current = new java.io.File(".").toURI().toString();
+    System.setProperty("eidas.ms.configuration", current + "src/test/resources/config/junit_config_1.properties");
+    
+  }
+  
+  @Test
+  public void configPropInfos() {
+    Assert.assertEquals("size", 2, MsEidasNodeConstants.COUNTRY_SELECTION_PARAM_WHITELIST.size());
+    
+  }
+  
+  @Test
+  public void loadSpNoExist() throws EaafConfigurationException {
+    ISpConfiguration spConfig = basicConfig.getServiceProviderConfiguration(
+        RandomStringUtils.randomAlphabetic(5));
+    Assert.assertNull("spConfig", spConfig);
+    
+  }
+  
+  @Test
+  public void loadSpConfigBasicMode() throws EaafConfigurationException {
+    ISpConfiguration spConfig = basicConfig.getServiceProviderConfiguration("jUnitTest1");
+    
+    Assert.assertNotNull("spConfig", spConfig);
+    Assert.assertEquals("uniqueId", "jUnitTest1", spConfig.getUniqueIdentifier());
+    Assert.assertEquals("friendlyName", "NO FRIENDLYNAME SET", spConfig.getFriendlyName());
+    Assert.assertEquals("pvp2.truststore", "", spConfig.getConfigurationValue("pvp2.metadata.truststore"));
+    String test = RandomStringUtils.randomAlphabetic(5);
+    Assert.assertEquals("pvp2.password", "1234pass", 
+        spConfig.getConfigurationValue("pvp2.metadata.truststore.password", test));
+    Assert.assertEquals("eidMode", true, spConfig.isConfigurationValue("newEidMode"));
+    Assert.assertEquals("notexistflag", false, spConfig.isConfigurationValue("notexist", false));
+    Assert.assertNotNull("fullConfig", spConfig.getFullConfiguration());
+    Assert.assertEquals("fullConfig", 4, spConfig.getFullConfiguration().size());
+    
+  }
+  
+  @Test
+  public void loadSpConfigAdvancedMode() throws EaafConfigurationException {
+    ISpConfiguration spConfig = basicConfig.getServiceProviderConfiguration(
+        "jUnitTest2", ServiceProviderConfiguration.class);
+    
+    Assert.assertNotNull("spConfig", spConfig);
+    Assert.assertEquals("uniqueId", "jUnitTest2", spConfig.getUniqueIdentifier());
+    Assert.assertEquals("friendlyName", "jUnit tester 2", spConfig.getFriendlyName());
+    Assert.assertEquals("pvp2.truststore", "", spConfig.getConfigurationValue("pvp2.metadata.truststore"));
+    String test = RandomStringUtils.randomAlphabetic(5);
+    Assert.assertEquals("pvp2.password", test, 
+        spConfig.getConfigurationValue("pvp2.metadata.truststore.notexist", test));
+    Assert.assertEquals("eidMode", false, spConfig.isConfigurationValue("newEidMode"));
+    Assert.assertEquals("notexistflag", false, spConfig.isConfigurationValue("notexist", false));
+    Assert.assertNotNull("fullConfig", spConfig.getFullConfiguration());
+    Assert.assertEquals("fullConfig", 5, spConfig.getFullConfiguration().size());
+    Assert.assertFalse("baseIdInternal", spConfig.hasBaseIdInternalProcessingRestriction());
+    Assert.assertTrue("baseIdTransfer", spConfig.hasBaseIdTransferRestriction());
+    
+  }
+  
+  @Test
+  public void loadSpConfigAdvancedModeWrongDecorator() throws EaafConfigurationException {
+    ISpConfiguration spConfig1 = basicConfig.getServiceProviderConfiguration(
+        "jUnitTest2", null);    
+    Assert.assertNull("spConfig", spConfig1);
+
+    String spConfig2 = basicConfig.getServiceProviderConfiguration(
+        "jUnitTest2", String.class);    
+    Assert.assertNull("spConfig", spConfig2);
+    
+  }
+  
+  @Test
+  public void loadConfigValuesString() {
+    Assert.assertEquals("without default", "ownSpecificConnector", 
+        basicConfig.getBasicConfiguration("auth.eIDAS.node_v2.entityId"));
+    
+    Assert.assertEquals("with default", "", 
+        basicConfig.getBasicConfiguration("auth.eIDAS.szrclient.endpoint.prod", 
+            RandomStringUtils.randomAlphabetic(5)));
+    
+    String rand1 = RandomStringUtils.randomAlphanumeric(5);
+    Assert.assertEquals("unknown with default", rand1, 
+        basicConfig.getBasicConfiguration("notexist", rand1));
+    
+  }
+  
+  @Test
+  public void loadConfigValuesBoolean() {
+    Assert.assertEquals("without default", true, 
+        basicConfig.getBasicConfigurationBoolean("auth.eIDAS.szrclient.useTestService"));
+    
+    Assert.assertEquals("with default", false, 
+        basicConfig.getBasicConfigurationBoolean("auth.notexist", 
+            false));
+    
+    Assert.assertEquals("unknown with default", false, 
+        basicConfig.getBasicConfigurationBoolean("auth.eIDAS.szrclient.params.vkz", true));
+    
+  }
+  
+  @Test
+  public void loadConfigMap() {
+    Map<String, String> entries = basicConfig.getBasicConfigurationWithPrefix("auth.eIDAS.szrclient");
+    Assert.assertEquals("wrong size", 16, entries.size());
+    Assert.assertTrue("missing element", entries.containsKey("endpoint.test"));
+    Assert.assertEquals("wrong entry", "http://localhost:1234/demoszr", entries.get("endpoint.test"));
+    
+  }
+  
+  @Test
+  public void validateUrl() throws MalformedURLException, EaafException {
+    Assert.assertEquals("wrong URL", "http://localhost/test", 
+        basicConfig.validateIdpUrl(new URL("http://localhost/test/" + RandomStringUtils.randomAlphabetic(5))));
+   
+    Assert.assertNull("wrong URL",
+        basicConfig.validateIdpUrl(new URL("http://localhost/wrong/" + RandomStringUtils.randomAlphabetic(5))));
+    
+  }
+}
diff --git a/connector_lib/src/test/java/at/asitplus/eidas/specific/connector/test/config/ServiceProviderConfigurationTest.java b/connector_lib/src/test/java/at/asitplus/eidas/specific/connector/test/config/ServiceProviderConfigurationTest.java
new file mode 100644
index 00000000..d95e2882
--- /dev/null
+++ b/connector_lib/src/test/java/at/asitplus/eidas/specific/connector/test/config/ServiceProviderConfigurationTest.java
@@ -0,0 +1,54 @@
+package at.asitplus.eidas.specific.connector.test.config;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.lang3.RandomStringUtils;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.BlockJUnit4ClassRunner;
+
+import at.asitplus.eidas.specific.connector.config.ServiceProviderConfiguration;
+import at.asitplus.eidas.specific.connector.test.config.dummy.MsConnectorDummyConfigMap;
+import at.gv.egiz.eaaf.core.api.data.EaafConstants;
+import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
+import at.gv.egiz.eaaf.core.exceptions.EaafException;
+
+@RunWith(BlockJUnit4ClassRunner.class)
+public class ServiceProviderConfigurationTest {
+
+  
+  
+  @Test
+  public void spConfigLoad() throws EaafException {
+    IConfiguration authConfig = new MsConnectorDummyConfigMap();
+    
+    Map<String, String> map = new HashMap<>();
+    map.put("uniqueID", RandomStringUtils.randomAlphabetic(10));
+    map.put("policy.allowed.requested.targets", "urn:publicid:gv.at:cdid\\+.*");
+
+    ServiceProviderConfiguration spConfig = new ServiceProviderConfiguration(map, authConfig);
+    
+    spConfig.setRequiredLoA(Arrays.asList(EaafConstants.EIDAS_LOA_LOW));
+    Assert.assertEquals("LoA", 1, spConfig.getRequiredLoA().size());
+    Assert.assertEquals("LoA", "http://eidas.europa.eu/LoA/low", spConfig.getRequiredLoA().get(0));
+    
+    spConfig.setLoAMachtingMode("exact");
+    Assert.assertEquals("wrong machtingMode", "exact", spConfig.getLoAMatchingMode());
+    
+    String bpkTarget = EaafConstants.URN_PREFIX_CDID + RandomStringUtils.randomAlphabetic(2);
+    spConfig.setBpkTargetIdentifier(bpkTarget);
+    Assert.assertEquals("wrong bPK", bpkTarget, spConfig.getAreaSpecificTargetIdentifier());
+    
+    
+    try {
+      spConfig.setBpkTargetIdentifier(EaafConstants.URN_PREFIX_WBPK + RandomStringUtils.randomAlphabetic(2));
+      
+    } catch (EaafException e) {
+      Assert.assertEquals("ErrorId", "auth.37", e.getErrorId());
+    }
+    
+  }
+}
diff --git a/connector_lib/src/test/java/at/asitplus/eidas/specific/connector/test/config/SpringBootBasicConfigurationProviderTest.java b/connector_lib/src/test/java/at/asitplus/eidas/specific/connector/test/config/SpringBootBasicConfigurationProviderTest.java
new file mode 100644
index 00000000..4e7e7dd2
--- /dev/null
+++ b/connector_lib/src/test/java/at/asitplus/eidas/specific/connector/test/config/SpringBootBasicConfigurationProviderTest.java
@@ -0,0 +1,148 @@
+package at.asitplus.eidas.specific.connector.test.config;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Map;
+
+import org.apache.commons.lang3.RandomStringUtils;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.annotation.DirtiesContext.ClassMode;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import at.asitplus.eidas.specific.connector.MsEidasNodeConstants;
+import at.asitplus.eidas.specific.connector.config.ServiceProviderConfiguration;
+import at.gv.egiz.eaaf.core.api.idp.IConfigurationWithSP;
+import at.gv.egiz.eaaf.core.api.idp.ISpConfiguration;
+import at.gv.egiz.eaaf.core.exceptions.EaafConfigurationException;
+import at.gv.egiz.eaaf.core.exceptions.EaafException;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = {
+    "/SpringTest-context_basic_realConfig.xml"})
+@TestPropertySource(locations = { "/config/junit_config_1.properties" })
+@ActiveProfiles("springBoot")
+@DirtiesContext(classMode = ClassMode.BEFORE_CLASS)
+public class SpringBootBasicConfigurationProviderTest {
+
+ @Autowired private IConfigurationWithSP basicConfig;
+ 
+  @Test
+  public void configPropInfos() {
+    Assert.assertEquals("size", 2, MsEidasNodeConstants.COUNTRY_SELECTION_PARAM_WHITELIST.size());
+    
+  }
+  
+  @Test
+  public void loadSpNoExist() throws EaafConfigurationException {
+    ISpConfiguration spConfig = basicConfig.getServiceProviderConfiguration(
+        RandomStringUtils.randomAlphabetic(5));
+    Assert.assertNull("spConfig", spConfig);
+    
+  }
+  
+  @Test
+  public void loadSpConfigBasicMode() throws EaafConfigurationException {
+    ISpConfiguration spConfig = basicConfig.getServiceProviderConfiguration("jUnitTest1");
+    
+    Assert.assertNotNull("spConfig", spConfig);
+    Assert.assertEquals("uniqueId", "jUnitTest1", spConfig.getUniqueIdentifier());
+    Assert.assertEquals("friendlyName", "NO FRIENDLYNAME SET", spConfig.getFriendlyName());
+    Assert.assertEquals("pvp2.truststore", "", spConfig.getConfigurationValue("pvp2.metadata.truststore"));
+    String test = RandomStringUtils.randomAlphabetic(5);
+    Assert.assertEquals("pvp2.password", "1234pass", 
+        spConfig.getConfigurationValue("pvp2.metadata.truststore.password", test));
+    Assert.assertEquals("eidMode", true, spConfig.isConfigurationValue("newEidMode"));
+    Assert.assertEquals("notexistflag", false, spConfig.isConfigurationValue("notexist", false));
+    Assert.assertNotNull("fullConfig", spConfig.getFullConfiguration());
+    Assert.assertEquals("fullConfig", 4, spConfig.getFullConfiguration().size());
+    
+  }
+  
+  @Test
+  public void loadSpConfigAdvancedMode() throws EaafConfigurationException {
+    ISpConfiguration spConfig = basicConfig.getServiceProviderConfiguration(
+        "jUnitTest2", ServiceProviderConfiguration.class);
+    
+    Assert.assertNotNull("spConfig", spConfig);
+    Assert.assertEquals("uniqueId", "jUnitTest2", spConfig.getUniqueIdentifier());
+    Assert.assertEquals("friendlyName", "jUnit tester 2", spConfig.getFriendlyName());
+    Assert.assertEquals("pvp2.truststore", "", spConfig.getConfigurationValue("pvp2.metadata.truststore"));
+    String test = RandomStringUtils.randomAlphabetic(5);
+    Assert.assertEquals("pvp2.password", test, 
+        spConfig.getConfigurationValue("pvp2.metadata.truststore.notexist", test));
+    Assert.assertEquals("eidMode", false, spConfig.isConfigurationValue("newEidMode"));
+    Assert.assertEquals("notexistflag", false, spConfig.isConfigurationValue("notexist", false));
+    Assert.assertNotNull("fullConfig", spConfig.getFullConfiguration());
+    Assert.assertEquals("fullConfig", 5, spConfig.getFullConfiguration().size());
+    Assert.assertFalse("baseIdInternal", spConfig.hasBaseIdInternalProcessingRestriction());
+    Assert.assertTrue("baseIdTransfer", spConfig.hasBaseIdTransferRestriction());
+    
+  }
+  
+  @Test
+  public void loadSpConfigAdvancedModeWrongDecorator() throws EaafConfigurationException {
+    ISpConfiguration spConfig1 = basicConfig.getServiceProviderConfiguration(
+        "jUnitTest2", null);    
+    Assert.assertNull("spConfig", spConfig1);
+
+    String spConfig2 = basicConfig.getServiceProviderConfiguration(
+        "jUnitTest2", String.class);    
+    Assert.assertNull("spConfig", spConfig2);
+    
+  }
+  
+  @Test
+  public void loadConfigValuesString() {
+    Assert.assertEquals("without default", "ownSpecificConnector", 
+        basicConfig.getBasicConfiguration("auth.eIDAS.node_v2.entityId"));
+    
+    Assert.assertEquals("with default", "", 
+        basicConfig.getBasicConfiguration("auth.eIDAS.szrclient.endpoint.prod", 
+            RandomStringUtils.randomAlphabetic(5)));
+    
+    String rand1 = RandomStringUtils.randomAlphanumeric(5);
+    Assert.assertEquals("unknown with default", rand1, 
+        basicConfig.getBasicConfiguration("notexist", rand1));
+    
+  }
+  
+  @Test
+  public void loadConfigValuesBoolean() {
+    Assert.assertEquals("without default", true, 
+        basicConfig.getBasicConfigurationBoolean("auth.eIDAS.szrclient.useTestService"));
+    
+    Assert.assertEquals("not exist with default", false, 
+        basicConfig.getBasicConfigurationBoolean("auth.notexist", 
+            false));
+    
+    Assert.assertEquals("exist but empty with default", true, 
+        basicConfig.getBasicConfigurationBoolean("auth.eIDAS.szrclient.params.vkz", true));
+    
+  }
+  
+  @Test
+  public void loadConfigMap() {
+    Map<String, String> entries = basicConfig.getBasicConfigurationWithPrefix("auth.eIDAS.szrclient");
+    Assert.assertEquals("wrong size", 16, entries.size());
+    Assert.assertTrue("missing element", entries.containsKey("endpoint.test"));
+    Assert.assertEquals("wrong entry", "http://localhost:1234/demoszr", entries.get("endpoint.test"));
+    
+  }
+  
+  @Test
+  public void validateUrl() throws MalformedURLException, EaafException {
+    Assert.assertEquals("wrong URL", "http://localhost/test", 
+        basicConfig.validateIdpUrl(new URL("http://localhost/test/" + RandomStringUtils.randomAlphabetic(5))));
+   
+    Assert.assertNull("wrong URL",
+        basicConfig.validateIdpUrl(new URL("http://localhost/wrong/" + RandomStringUtils.randomAlphabetic(5))));
+    
+  }
+}
diff --git a/connector_lib/src/test/java/at/asitplus/eidas/specific/connector/test/config/dummy/MsConnectorDummyConfigMap.java b/connector_lib/src/test/java/at/asitplus/eidas/specific/connector/test/config/dummy/MsConnectorDummyConfigMap.java
new file mode 100644
index 00000000..42e31377
--- /dev/null
+++ b/connector_lib/src/test/java/at/asitplus/eidas/specific/connector/test/config/dummy/MsConnectorDummyConfigMap.java
@@ -0,0 +1,112 @@
+package at.asitplus.eidas.specific.connector.test.config.dummy;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.commons.lang3.StringUtils;
+
+import at.gv.egiz.eaaf.core.test.dummy.DummyAuthConfigMap;
+import lombok.Setter;
+
+/**
+ * MS-Connector specific dummy basic-config implementation.
+ * 
+ * @author tlenz
+ *
+ */
+public class MsConnectorDummyConfigMap extends DummyAuthConfigMap {
+
+  private static final String CONFIG_PREFIX = "eidas.ms.";
+  
+  @Setter
+  private String configRootDirSufix;
+  
+  /**
+   * Creates an emptry configuration.
+   *
+   */
+  public MsConnectorDummyConfigMap() {
+
+  }
+
+  /**
+   * Dummy Application-configuration.
+   *
+   * @param configIs Property based configuration
+   * @throws IOException In case of an configuration read error
+   */
+  public MsConnectorDummyConfigMap(final InputStream configIs) throws IOException {
+    super(configIs);
+
+  }
+
+  /**
+   * Dummy Application-configuration.
+   *
+   * @param path Path to property based configuration
+   * @throws IOException In case of an configuration read error
+   */
+  public MsConnectorDummyConfigMap(final String path) throws IOException {
+    super(path);
+
+  }
+  
+  
+  @Override
+  public String getBasicConfiguration(final String key) {
+    return super.getBasicConfiguration(addPrefixToKey(key));
+
+  }
+  
+  @Override
+  public Map<String, String> getBasicConfigurationWithPrefix(final String prefix) {
+    return super.getBasicConfigurationWithPrefix(addPrefixToKey(prefix));
+
+  }
+  
+  @Override
+  public void putConfigValue(final String key, final String value) {
+    super.putConfigValue(addPrefixToKey(key), value);
+  }
+
+  @Override
+  public void removeConfigValue(final String key) {
+    super.removeConfigValue(addPrefixToKey(key));
+
+  }
+  
+  @Override
+  public URI getConfigurationRootDirectory() {
+    URI basePath = super.getConfigurationRootDirectory();
+    if (StringUtils.isNotEmpty(configRootDirSufix)) {
+     try {
+      return new URI(basePath.toString() + configRootDirSufix);
+            
+    } catch (URISyntaxException e) {
+      throw new RuntimeException("Wrong Dummyconfig", e);
+      
+    } 
+      
+    } else {    
+      return basePath;
+      
+    }
+    
+
+  }
+  
+  private String addPrefixToKey(final String key) {
+    if (key.startsWith(CONFIG_PREFIX)) {
+      return key;
+      
+    }  else {
+      return CONFIG_PREFIX + key;
+      
+    }
+  }
+
+         
+}
diff --git a/connector_lib/src/test/java/at/asitplus/eidas/specific/connector/test/config/dummy/MsConnectorDummySpConfiguration.java b/connector_lib/src/test/java/at/asitplus/eidas/specific/connector/test/config/dummy/MsConnectorDummySpConfiguration.java
new file mode 100644
index 00000000..b379080d
--- /dev/null
+++ b/connector_lib/src/test/java/at/asitplus/eidas/specific/connector/test/config/dummy/MsConnectorDummySpConfiguration.java
@@ -0,0 +1,28 @@
+package at.asitplus.eidas.specific.connector.test.config.dummy;
+
+import java.util.List;
+import java.util.Map;
+
+import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
+import at.gv.egiz.eaaf.core.impl.idp.module.test.DummySpConfiguration;
+import lombok.Setter;
+
+public class MsConnectorDummySpConfiguration extends DummySpConfiguration {
+  
+  private static final long serialVersionUID = -3249018889871026127L;
+
+  @Setter
+  private List<String> loa;
+  
+  public MsConnectorDummySpConfiguration(Map<String, String> spConfig, IConfiguration authConfig) {
+    super(spConfig, authConfig);
+
+  }
+  
+  @Override
+  public List<String> getRequiredLoA() {
+    return loa;
+    
+  }
+
+}
diff --git a/connector_lib/src/test/resources/SpringTest-context_basic_realConfig.xml b/connector_lib/src/test/resources/SpringTest-context_basic_realConfig.xml
new file mode 100644
index 00000000..fbc4640a
--- /dev/null
+++ b/connector_lib/src/test/resources/SpringTest-context_basic_realConfig.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:context="http://www.springframework.org/schema/context"
+  xmlns:tx="http://www.springframework.org/schema/tx"
+  xmlns:aop="http://www.springframework.org/schema/aop"
+  xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.1.xsd
+    http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+    http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd
+    http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd">
+
+  <context:annotation-config />
+
+  <beans profile="!springBoot">
+  <bean id="BasicMSSpecificNodeConfig"
+    class="at.asitplus.eidas.specific.connector.config.BasicConfigurationProvider">
+    <constructor-arg value="#{systemProperties['eidas.ms.configuration']}" />
+  </bean>
+  </beans>
+  <beans profile="springBoot">
+    <bean id="springBootMsSpecificNodeConfig"
+          class="at.asitplus.eidas.specific.connector.config.SpringBootBasicConfigurationProvider" />
+  </beans>
+
+</beans>
\ No newline at end of file
diff --git a/connector_lib/src/test/resources/config/junit_config_1.properties b/connector_lib/src/test/resources/config/junit_config_1.properties
new file mode 100644
index 00000000..160725d4
--- /dev/null
+++ b/connector_lib/src/test/resources/config/junit_config_1.properties
@@ -0,0 +1,124 @@
+## Basic service configuration
+eidas.ms.context.url.prefix=http://localhost/test/
+eidas.ms.context.url.request.validation=true
+eidas.ms.core.configRootDir=file:./src/test/resources/config/
+
+eidas.ms.context.use.clustermode=true
+
+##Monitoring
+eidas.ms.monitoring.eIDASNode.metadata.url=
+
+
+##Specific logger configuration
+eidas.ms.technicallog.write.MDS.into.techlog=true
+eidas.ms.revisionlog.write.MDS.into.revisionlog=true
+eidas.ms.revisionlog.logIPAddressOfUser=true
+
+##Directory for static Web content
+eidas.ms.webcontent.static.directory=webcontent/
+eidas.ms.webcontent.templates=templates/
+eidas.ms.webcontent.properties=properties/messages
+
+## extended validation of pending-request Id's
+eidas.ms.core.pendingrequestid.maxlifetime=300
+eidas.ms.core.pendingrequestid.digist.algorithm=HmacSHA256
+eidas.ms.core.pendingrequestid.digist.secret=pendingReqIdSecret
+
+## eIDAS Ref. Implementation connector ###
+eidas.ms.auth.eIDAS.node_v2.entityId=ownSpecificConnector
+eidas.ms.auth.eIDAS.node_v2.forward.endpoint=
+eidas.ms.auth.eIDAS.node_v2.forward.method=POST
+eidas.ms.auth.eIDAS.node_v2.countrycode=AT
+eidas.ms.auth.eIDAS.node_v2.publicSectorTargets=.*
+eidas.ms.auth.eIDAS.node_v2.workarounds.addAlwaysProviderName=true
+eidas.ms.auth.eIDAS.node_v2.workarounds.useRequestIdAsTransactionIdentifier=true
+eidas.ms.auth.eIDAS.node_v2.workarounds.useStaticProviderNameForPublicSPs=true
+eidas.ms.auth.eIDAS.node_v2.staticProviderNameForPublicSPs=myNode
+
+eidas.ms.auth.eIDAS.node_v2.loa.requested.minimum=http://eidas.europa.eu/LoA/high
+
+eidas.ms.auth.eIDAS.szrclient.useTestService=true
+eidas.ms.auth.eIDAS.szrclient.endpoint.prod=
+eidas.ms.auth.eIDAS.szrclient.endpoint.test=http://localhost:1234/demoszr
+eidas.ms.auth.eIDAS.szrclient.ssl.keyStore.path=keys/.....
+eidas.ms.auth.eIDAS.szrclient.ssl.keyStore.password=
+eidas.ms.auth.eIDAS.szrclient.ssl.trustStore.path=
+eidas.ms.auth.eIDAS.szrclient.ssl.trustStore.password=
+eidas.ms.auth.eIDAS.szrclient.timeout.connection=15
+eidas.ms.auth.eIDAS.szrclient.timeout.response=30
+eidas.ms.auth.eIDAS.szrclient.params.vkz=
+
+eidas.ms.auth.eIDAS.szrclient.params.useSZRForbPKCalculation=false
+
+
+eidas.ms.auth.eIDAS.authblock.keystore.password=f/+saJBc3a}*/T^s
+eidas.ms.auth.eIDAS.authblock.keystore.friendlyName=connectorkeypair
+eidas.ms.auth.eIDAS.authblock.keystore.path=./../keystore/teststore.jks
+eidas.ms.auth.eIDAS.authblock.keystore.type=jks
+eidas.ms.auth.eIDAS.authblock.key.alias=connectorkeypair
+eidas.ms.auth.eIDAS.authblock.key.password=f/+saJBc3a}*/T^s
+
+
+#Raw eIDAS Id data storage
+eidas.ms.auth.eIDAS.szrclient.workarounds.eidmapping.revisionlog.active=true
+
+eidas.ms.auth.eIDAS.szrclient.params.setPlaceOfBirthIfAvailable=true
+eidas.ms.auth.eIDAS.szrclient.params.setBirthNameIfAvailable=true
+
+eidas.ms.auth.eIDAS.szrclient.debug.logfullmessages=true
+eidas.ms.auth.eIDAS.szrclient.debug.useDummySolution=true
+
+##without mandates
+eidas.ms.auth.eIDAS.node_v2.attributes.requested.onlynatural.0=PersonIdentifier,true
+eidas.ms.auth.eIDAS.node_v2.attributes.requested.onlynatural.1=FamilyName,true
+eidas.ms.auth.eIDAS.node_v2.attributes.requested.onlynatural.2=FirstName,true
+eidas.ms.auth.eIDAS.node_v2.attributes.requested.onlynatural.3=DateOfBirth,true
+
+eidas.ms.auth.eIDAS.node_v2.attributes.requested.de.onlynatural.4=PlaceOfBirth,false
+eidas.ms.auth.eIDAS.node_v2.attributes.requested.de.onlynatural.5=BirthName,false
+eidas.ms.auth.eIDAS.node_v2.attributes.requested.de.onlynatural.6=Gender,false
+eidas.ms.auth.eIDAS.node_v2.attributes.requested.de.onlynatural.7=CurrentAddress,false
+eidas.ms.auth.eIDAS.node_v2.attributes.requested.de.onlynatural.8=testtest,false
+
+##with mandates ---- NOT FULLY SUPPORTED AT THE MOMENT -----
+eidas.ms.auth.eIDAS.node_v2.attributes.requested.representation.0=PersonIdentifier,true
+eidas.ms.auth.eIDAS.node_v2.attributes.requested.representation.1=FamilyName,true
+eidas.ms.auth.eIDAS.node_v2.attributes.requested.representation.2=FirstName,true
+eidas.ms.auth.eIDAS.node_v2.attributes.requested.representation.3=DateOfBirth,true
+eidas.ms.auth.eIDAS.node_v2.attributes.requested.representation.4=LegalPerson,true
+eidas.ms.auth.eIDAS.node_v2.attributes.requested.representation.5=LegalName,true
+
+
+## PVP2 S-Profile end-point configuration
+eidas.ms.pvp2.keystore.path=keys/.....
+eidas.ms.pvp2.keystore.password=
+eidas.ms.pvp2.key.metadata.alias=
+eidas.ms.pvp2.key.metadata.password=
+eidas.ms.pvp2.key.signing.alias=
+eidas.ms.pvp2.key.signing.password=
+eidas.ms.pvp2.metadata.validity=24
+
+## Service Provider configuration
+eidas.ms.sp.0.uniqueID=jUnitTest1
+eidas.ms.sp.0.pvp2.metadata.truststore=
+eidas.ms.sp.0.pvp2.metadata.truststore.password=1234pass
+eidas.ms.sp.0.newEidMode=true
+
+eidas.ms.sp.1.uniqueID=jUnitTest2
+eidas.ms.sp.1.friendlyName=jUnit tester 2
+eidas.ms.sp.1.pvp2.metadata.truststore=
+eidas.ms.sp.1.pvp2.metadata.truststore.password=
+eidas.ms.sp.1.newEidMode=false
+
+#eidas.ms.sp.0.friendlyName=
+#eidas.ms.sp.0.pvp2.metadata.url=
+#eidas.ms.sp.0.policy.allowed.requested.targets=.*
+#eidas.ms.sp.0.policy.hasBaseIdTransferRestriction=false
+
+
+##only for advanced config
+eidas.ms.configuration.sp.disableRegistrationRequirement=
+eidas.ms.configuration.restrictions.baseID.spTransmission=
+eidas.ms.configuration.auth.default.countrycode=
+eidas.ms.configuration.pvp.scheme.validation=
+eidas.ms.configuration.pvp.enable.entitycategories=
\ No newline at end of file