Merge tag 'MOA-ID-3.4.2'

3 files changed, 56 insertions, 2 deletions

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/config/ConfigurationProvider.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/config/ConfigurationProvider.java
index d249fa597..39cd0980b 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/config/ConfigurationProvider.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/config/ConfigurationProvider.java
@@ -111,6 +111,9 @@ public class ConfigurationProvider {
 		
 	private void inizialize() throws ConfigurationException {
 		
+		log.info("Set SystemProperty for UTF-8 file.encoding as default");
+		System.setProperty("file.encoding", "UTF-8");
+		
 		configFileName = System.getProperty(SYSTEM_PROP_CONFIG);
 		
 	    if (configFileName == null) {
@@ -633,6 +636,7 @@ public class ConfigurationProvider {
 				try {
 					MOAHttpProtocolSocketFactory protoSocketFactory = new MOAHttpProtocolSocketFactory(
 							"MOAMetaDataProvider",
+							true,
 							ConfigurationProvider.getInstance().getCertStoreDirectory(), 
 							ConfigurationProvider.getInstance().getTrustStoreDirectory(),
 							null,
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OATargetConfiguration.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OATargetConfiguration.java
index 381bf5cc7..b2671302c 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OATargetConfiguration.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OATargetConfiguration.java
@@ -59,6 +59,8 @@ public class OATargetConfiguration implements IOnlineApplicationData {
 	private static List<String> identificationTypeList = null;
 
 	private String foreignbPKTargets = null;
+	private String additionalbPKTargets = null;
+	private boolean eidDemoActive = false;
 	
 	public OATargetConfiguration() {
 		 targetList = TargetValidator.getListOfTargets();
@@ -165,7 +167,26 @@ public class OATargetConfiguration implements IOnlineApplicationData {
 				
 			}
 		}
+		
+		//parse additional bPK sector list
+		if (dbOA.getAdditionalbPKTargetList() != null) {
+			if (KeyValueUtils.isCSVValueString(dbOA.getAdditionalbPKTargetList()))
+				additionalbPKTargets = KeyValueUtils.normalizeCSVValueString(dbOA.getAdditionalbPKTargetList());
 			
+			else {
+				if (dbOA.getAdditionalbPKTargetList().contains(KeyValueUtils.CSV_DELIMITER)) {
+					//remove trailing comma if exist
+					additionalbPKTargets = dbOA.getAdditionalbPKTargetList().substring(0, 
+							dbOA.getAdditionalbPKTargetList().indexOf(KeyValueUtils.CSV_DELIMITER));
+												
+				} else
+					additionalbPKTargets = dbOA.getAdditionalbPKTargetList();
+				
+			}
+		}
+		
+		//parse 'Austrian eID mode'  flag
+		eidDemoActive = dbOA.getIseIDDemoModeActive();
 		
 		
 		return null;
@@ -277,7 +298,9 @@ public class OATargetConfiguration implements IOnlineApplicationData {
             }
         }
         
-        dbOA.setForeignbPKTargetList(getForeignbPKTargets());
+        dbOA.setForeignbPKTargetList(getForeignbPKTargets());        
+        dbOA.setAdditionalbPKTargetList(getAdditionalbPKTargets());
+        dbOA.setIseIDDemoModeActive(isEidDemoActive());
         
 		return null;
 	}
@@ -441,6 +464,32 @@ public class OATargetConfiguration implements IOnlineApplicationData {
 		else
 			this.foreignbPKTargets = foreignbPKTargets;
 	}
+
+
+	public String getAdditionalbPKTargets() {
+		return additionalbPKTargets;
+	}
+
+
+	public void setAdditionalbPKTargets(String additionalbPKTargets) {
+		if (MiscUtil.isNotEmpty(additionalbPKTargets))
+			this.additionalbPKTargets = 
+				KeyValueUtils.removeAllNewlineFromString(additionalbPKTargets);
+		else
+			this.additionalbPKTargets = additionalbPKTargets;
+
+	}
+
+
+	public boolean isEidDemoActive() {
+		return eidDemoActive;
+	}
+
+
+	public void setEidDemoActive(boolean eidDemoActive) {
+		this.eidDemoActive = eidDemoActive;
+	}
+	
 	
 	
     
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAPVP2ConfigValidation.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAPVP2ConfigValidation.java
index 8b41823e1..cbb7c88b2 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAPVP2ConfigValidation.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAPVP2ConfigValidation.java
@@ -129,6 +129,7 @@ public class OAPVP2ConfigValidation {
 								try {
 									MOAHttpProtocolSocketFactory protoSocketFactory = new MOAHttpProtocolSocketFactory(
 											"MOAMetaDataProvider",
+											true,
 											ConfigurationProvider.getInstance().getCertStoreDirectory(), 
 											ConfigurationProvider.getInstance().getTrustStoreDirectory(),
 											null,
@@ -145,7 +146,7 @@ public class OAPVP2ConfigValidation {
 									log.warn("MOA SSL-TrustStore can not initialized. Use default Java TrustStore.", e);
 								
 								} catch (ConfigurationException e) {
-									log.info("No MOA specific SSL-TrustStore configured. Use default Java TrustStore.", e);
+									log.info("No MOA specific SSL-TrustStore configured. Use default Java TrustStore.");
 								
 								}