Merge branch 'eIDAS_node_implementation_remote' into moapid-3.2-opb-redis

Conflicts:
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/AbstractController.java
	id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/session/AssertionStore.java

6 files changed, 76 insertions, 36 deletions

diff --git a/id/moa-id-webgui/src/main/java/at/gv/egovernment/moa/id/config/webgui/validation/MOAIDConfigurationValidator.java b/id/moa-id-webgui/src/main/java/at/gv/egovernment/moa/id/config/webgui/validation/MOAIDConfigurationValidator.java
index 42ef0e1e6..2bb33a9d7 100644
--- a/id/moa-id-webgui/src/main/java/at/gv/egovernment/moa/id/config/webgui/validation/MOAIDConfigurationValidator.java
+++ b/id/moa-id-webgui/src/main/java/at/gv/egovernment/moa/id/config/webgui/validation/MOAIDConfigurationValidator.java
@@ -22,19 +22,19 @@
  */
 package at.gv.egovernment.moa.id.config.webgui.validation;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.ServiceLoader;
 import java.util.Map.Entry;
+import java.util.ServiceLoader;
 import java.util.Set;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import at.gv.egiz.components.configuration.api.Configuration;
 import at.gv.egovernment.moa.id.commons.config.MOAIDConfigurationConstants;
 import at.gv.egovernment.moa.id.commons.config.persistence.MOAIDConfiguration;
 import at.gv.egovernment.moa.id.commons.utils.KeyValueUtils;
@@ -243,10 +243,11 @@ public class MOAIDConfigurationValidator {
 				groupEl.getKey(), 
 				MOAIDConfigurationConstants.PREFIX_MOAID)); 
 		
-		//add or update key/value pairs from users with module or task specific information 
+		//add or update key/value pairs from users with module or task specific information
+		List<String> taskDelete = new ArrayList<String>();
 		Map<String, String> toBeAdded = module.postProcessing(
 				KeyValueUtils.removePrefixFromKeys(groupEl.getValue(), groupEl.getKey()), 
-				deleted, 
+				taskDelete, 
 				dbconfig);		
 		if (toBeAdded != null) {
 			toBeAdded = KeyValueUtils.makeKeysAbsolut(toBeAdded, groupEl.getKey(), MOAIDConfigurationConstants.PREFIX_MOAID);
@@ -261,6 +262,23 @@ public class MOAIDConfigurationValidator {
 			}
 		}
 		
+		//make delete elements absolute
+		if (!taskDelete.isEmpty()) {
+			Iterator<String> delInterator = taskDelete.iterator();
+			while (delInterator.hasNext()) {
+				String delKey = delInterator.next();
+				if (!delKey.startsWith(MOAIDConfigurationConstants.PREFIX_MOAID)) {
+					deleted.add(groupEl.getKey() + KeyValueUtils.KEY_DELIMITER + delKey );
+					
+				} else {
+					deleted.add(delKey);
+					
+				}
+				
+			}
+			
+		}
+		
 	}
 	
 	private void keyValueClassification(Iterator<Entry<String, String>> config, Map<String, Map<String,String>> result) {		
diff --git a/id/moa-id-webgui/src/main/java/at/gv/egovernment/moa/id/config/webgui/validation/task/impl/GeneralMOAIDConfigurationTask.java b/id/moa-id-webgui/src/main/java/at/gv/egovernment/moa/id/config/webgui/validation/task/impl/GeneralMOAIDConfigurationTask.java
index 1c3e0fe13..270d0866c 100644
--- a/id/moa-id-webgui/src/main/java/at/gv/egovernment/moa/id/config/webgui/validation/task/impl/GeneralMOAIDConfigurationTask.java
+++ b/id/moa-id-webgui/src/main/java/at/gv/egovernment/moa/id/config/webgui/validation/task/impl/GeneralMOAIDConfigurationTask.java
@@ -435,10 +435,10 @@ public class GeneralMOAIDConfigurationTask extends AbstractTaskValidator impleme
 		check = input.get(KeyValueUtils.removePrefixFromKey(MOAIDConfigurationConstants.GENERAL_AUTH_SSO_TARGET, getKeyPrefix()));
 		if (MiscUtil.isEmpty(check)) {
 			log.info("Empty SSO Target");
-			errors.add(new ValidationObjectIdentifier(
-					MOAIDConfigurationConstants.GENERAL_AUTH_SSO_TARGET, 
-					"SSO - Target",
-					LanguageHelper.getErrorString("validation.general.sso.target.empty")));
+//			errors.add(new ValidationObjectIdentifier(
+//					MOAIDConfigurationConstants.GENERAL_AUTH_SSO_TARGET, 
+//					"SSO - Target",
+//					LanguageHelper.getErrorString("validation.general.sso.target.empty")));
 			
 		} else {
 			
diff --git a/id/moa-id-webgui/src/main/java/at/gv/egovernment/moa/id/config/webgui/validation/task/impl/GeneralSTORKConfigurationTask.java b/id/moa-id-webgui/src/main/java/at/gv/egovernment/moa/id/config/webgui/validation/task/impl/GeneralSTORKConfigurationTask.java
index 1747e2207..8a1a2925b 100644
--- a/id/moa-id-webgui/src/main/java/at/gv/egovernment/moa/id/config/webgui/validation/task/impl/GeneralSTORKConfigurationTask.java
+++ b/id/moa-id-webgui/src/main/java/at/gv/egovernment/moa/id/config/webgui/validation/task/impl/GeneralSTORKConfigurationTask.java
@@ -133,38 +133,40 @@ public static final List<String> KEYWHITELIST;
 										LanguageHelper.getErrorString("validation.stork.cpeps.cc",
 										new Object[] {cc})));
 							}
-						} else {
-							log.warn("CPEPS config countrycode is empty : " + cc);
-							errors.add(new ValidationObjectIdentifier(
-								MOAIDConfigurationConstants.GENERAL_AUTH_STORK_CPEPS_LIST
-									+ "." + cpepsKey, 
-								"STORK - CPEPS Country",
-								LanguageHelper.getErrorString("validation.stork.cpeps.empty",
-								new Object[] {cc})));
-						}
-
-						// check url
-						if (MiscUtil.isNotEmpty(url)) {
-							if (!ValidationHelper.validateURL(url)) {
-								log.info("CPEPS config URL is invalid : " + url);
+							
+							// check url
+							if (MiscUtil.isNotEmpty(url)) {
+								if (!ValidationHelper.validateURL(url)) {
+									log.info("CPEPS config URL is invalid : " + url);
+									errors.add(new ValidationObjectIdentifier(
+										MOAIDConfigurationConstants.GENERAL_AUTH_STORK_CPEPS_LIST
+											+ "." + index + "." 
+											+ MOAIDConfigurationConstants.GENERAL_AUTH_STORK_CPEPS_LIST_URL, 
+										"STORK - CPEPS URL",
+										LanguageHelper.getErrorString("validation.stork.cpeps.url")));
+								}
+							} else {
+								log.warn("CPEPS config url is empty : " + url);
 								errors.add(new ValidationObjectIdentifier(
 									MOAIDConfigurationConstants.GENERAL_AUTH_STORK_CPEPS_LIST
 										+ "." + index + "." 
 										+ MOAIDConfigurationConstants.GENERAL_AUTH_STORK_CPEPS_LIST_URL, 
 									"STORK - CPEPS URL",
-									LanguageHelper.getErrorString("validation.stork.cpeps.url")));
-							}
+									LanguageHelper.getErrorString("validation.stork.cpeps.empty",
+									new Object[] {url})));
+								
+							}	
+														
 						} else {
-							log.warn("CPEPS config url is empty : " + url);
-							errors.add(new ValidationObjectIdentifier(
-								MOAIDConfigurationConstants.GENERAL_AUTH_STORK_CPEPS_LIST
-									+ "." + index + "." 
-									+ MOAIDConfigurationConstants.GENERAL_AUTH_STORK_CPEPS_LIST_URL, 
-								"STORK - CPEPS URL",
-								LanguageHelper.getErrorString("validation.stork.cpeps.empty",
-								new Object[] {url})));
-							
-						}					
+							log.warn("CPEPS config countrycode is empty : " + cc);
+//							errors.add(new ValidationObjectIdentifier(
+//								MOAIDConfigurationConstants.GENERAL_AUTH_STORK_CPEPS_LIST
+//									+ "." + cpepsKey, 
+//								"STORK - CPEPS Country",
+//								LanguageHelper.getErrorString("validation.stork.cpeps.empty",
+//								new Object[] {cc})));
+						}
+				
 						validatedCPeps.put(cc, url);
 						
 					} else {
diff --git a/id/moa-id-webgui/src/main/java/at/gv/egovernment/moa/id/config/webgui/validation/task/impl/ServicesAuthenticationInformationTask.java b/id/moa-id-webgui/src/main/java/at/gv/egovernment/moa/id/config/webgui/validation/task/impl/ServicesAuthenticationInformationTask.java
index 8e8feefe0..1819c5c2b 100644
--- a/id/moa-id-webgui/src/main/java/at/gv/egovernment/moa/id/config/webgui/validation/task/impl/ServicesAuthenticationInformationTask.java
+++ b/id/moa-id-webgui/src/main/java/at/gv/egovernment/moa/id/config/webgui/validation/task/impl/ServicesAuthenticationInformationTask.java
@@ -89,6 +89,25 @@ public class ServicesAuthenticationInformationTask extends AbstractTaskValidator
 			
 		}
 		
+		String isLegacyModeActive = input.get(MOAIDConfigurationConstants.SERVICE_AUTH_BKU_TEMPLATE_LEGACY);
+		if (MiscUtil.isNotEmpty(isLegacyModeActive) && Boolean.parseBoolean(isLegacyModeActive)) {
+			if (!input.containsKey(MOAIDConfigurationConstants.SERVICE_AUTH_BKU_TEMPLATE_FIRST_VALUE))
+				keysToDelete.add(MOAIDConfigurationConstants.SERVICE_AUTH_BKU_TEMPLATE_FIRST_VALUE);
+			
+			if (!input.containsKey(MOAIDConfigurationConstants.SERVICE_AUTH_BKU_TEMPLATE_SECOND_VALUE))
+				keysToDelete.add(MOAIDConfigurationConstants.SERVICE_AUTH_BKU_TEMPLATE_SECOND_VALUE);
+			
+			if (!input.containsKey(MOAIDConfigurationConstants.SERVICE_AUTH_BKU_TEMPLATE_THIRD_VALUE))
+				keysToDelete.add(MOAIDConfigurationConstants.SERVICE_AUTH_BKU_TEMPLATE_THIRD_VALUE);
+						
+		} else {
+			keysToDelete.add(MOAIDConfigurationConstants.SERVICE_AUTH_BKU_TEMPLATE_FIRST_VALUE);
+			keysToDelete.add(MOAIDConfigurationConstants.SERVICE_AUTH_BKU_TEMPLATE_SECOND_VALUE);
+			keysToDelete.add(MOAIDConfigurationConstants.SERVICE_AUTH_BKU_TEMPLATE_THIRD_VALUE);
+			
+		}
+		
+		
 		if (newConfigValues.isEmpty())
 			return null;
 		else
diff --git a/id/moa-id-webgui/src/main/java/at/gv/egovernment/moa/id/config/webgui/validation/task/impl/ServicesProtocolPVP2XTask.java b/id/moa-id-webgui/src/main/java/at/gv/egovernment/moa/id/config/webgui/validation/task/impl/ServicesProtocolPVP2XTask.java
index c55c35da0..d69157553 100644
--- a/id/moa-id-webgui/src/main/java/at/gv/egovernment/moa/id/config/webgui/validation/task/impl/ServicesProtocolPVP2XTask.java
+++ b/id/moa-id-webgui/src/main/java/at/gv/egovernment/moa/id/config/webgui/validation/task/impl/ServicesProtocolPVP2XTask.java
@@ -186,7 +186,7 @@ public class ServicesProtocolPVP2XTask extends AbstractTaskValidator implements
 						BasicX509Credential credential = new BasicX509Credential();
 						credential.setEntityCertificate(cert);
 						
-						timer = new Timer();
+						timer = new Timer(true);
 						httpClient = new MOAHttpClient();
 						
 						if (metadataURL.startsWith("https:"))
diff --git a/id/moa-id-webgui/src/main/java/at/gv/egovernment/moa/id/config/webgui/validation/task/impl/ServicesProtocolSTORKTask.java b/id/moa-id-webgui/src/main/java/at/gv/egovernment/moa/id/config/webgui/validation/task/impl/ServicesProtocolSTORKTask.java
index c7a74d1a1..eb881d465 100644
--- a/id/moa-id-webgui/src/main/java/at/gv/egovernment/moa/id/config/webgui/validation/task/impl/ServicesProtocolSTORKTask.java
+++ b/id/moa-id-webgui/src/main/java/at/gv/egovernment/moa/id/config/webgui/validation/task/impl/ServicesProtocolSTORKTask.java
@@ -190,7 +190,8 @@ public class ServicesProtocolSTORKTask extends AbstractTaskValidator implements
 //		if (MiscUtil.isEmpty(identificationType) || 
 //				!MOAIDConfigurationConstants.IDENIFICATIONTYPE_STORK.equals(identificationType)) {
 		if (MiscUtil.isNotEmpty(identificationType) && 
-				!MOAIDConfigurationConstants.IDENIFICATIONTYPE_STORK.equals(identificationType)) {
+				!(MOAIDConfigurationConstants.IDENIFICATIONTYPE_STORK.equals(identificationType) 
+						|| MOAIDConfigurationConstants.IDENIFICATIONTYPE_EIDAS.equals(identificationType))) {
 			log.info("STORK V-IDP only allowes identification numbers with STORK prefix.");
 			errors.add(new ValidationObjectIdentifier(
 					MOAIDConfigurationConstants.SERVICE_AUTH_TARGET_BUSINESS_TYPE,