local merge

Merge branch 'master' of https://gitlab.iaik.tugraz.at/egiz/moa-sig

3 files changed, 39 insertions, 25 deletions

diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationPartsBuilder.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationPartsBuilder.java
index 5f3f670..15e44eb 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationPartsBuilder.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationPartsBuilder.java
@@ -763,6 +763,11 @@ public class ConfigurationPartsBuilder {
     while ((keyGroupElem = (Element) kgIter.nextNode()) != null) 
     {
       String keyGroupId = getElementValue(keyGroupElem, CONF + "Id", null);
+
+      //switch all keyGroupIds to lower case, only
+      if (MiscUtil.isNotEmpty(keyGroupId))
+    	  keyGroupId = keyGroupId.trim().toLowerCase();
+      
       String keyGroupDigestMethodAlgorithm = getElementValue(keyGroupElem, CONF + "DigestMethodAlgorithm", null);
       Set keyGroupEntries =
         buildKeyGroupEntries(keyGroupId, keyModuleIds, keyGroupElem);
@@ -888,9 +893,9 @@ public class ConfigurationPartsBuilder {
         keyGroupIter = XPathUtils.selectNodeIterator(mappingElem, CONF + "KeyGroupId");
         while ((keyGroupElem = (Element) keyGroupIter.nextNode()) != null) 
         {
-          String keyGroupId = getElementValue(keyGroupElem, ".", null);
-          KeyGroup keyGroup = (KeyGroup) keyGroups.get(keyGroupId);
-
+        	String keyGroupId = getElementValue(keyGroupElem, ".", null);
+        	KeyGroup keyGroup = (KeyGroup) keyGroups.get(keyGroupId.trim().toLowerCase());
+        	
           if (keyGroup != null) 
           {
             groups.put(keyGroupId, keyGroup);
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationProvider.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationProvider.java
index 3e074a2..7ae83cb 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationProvider.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationProvider.java
@@ -637,9 +637,12 @@ public class ConfigurationProvider
     return keyGroups;
   }
   
-  public KeyGroup getKeyGroup(String keyGroupId) {	  
-	  KeyGroup keyGroup = (KeyGroup) keyGroups.get(keyGroupId);
-	  return keyGroup;
+  public KeyGroup getKeyGroup(String keyGroupId) {
+	  if (MiscUtil.isNotEmpty(keyGroupId))
+	  	return (KeyGroup) keyGroups.get(keyGroupId.trim().toLowerCase());
+	  
+	  else
+	  return null;
   }
 
   /**
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/TrustProfile.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/TrustProfile.java
index f64643f..0063c7f 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/TrustProfile.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/TrustProfile.java
@@ -29,6 +29,8 @@ import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.regex.Pattern;
+import java.util.regex.PatternSyntaxException;
 
 import at.gv.egovernment.moa.sig.tsl.TslConstants;
 import at.gv.egovernment.moaspss.logging.Logger;
@@ -55,7 +57,7 @@ public class TrustProfile {
   private List<String> countries = new ArrayList<String>();
   
   private List<URI> allowedTspStatus = new ArrayList<URI>();
-  private List<URI> allowedTspServiceTypes = new ArrayList<URI>();
+  private List<Pattern> allowedTspServiceTypes = new ArrayList<Pattern>();
   
   
   /**
@@ -76,16 +78,21 @@ public class TrustProfile {
     
     //TSL configuration parameters
     this.tslEnabled = tslEnabled;
-        
-    setCountries(countries);
-    Logger.debug("TrustProfile "+ id + " allows " + Arrays.toString(this.countries.toArray()) + " TSL countries");
-    
-    setAllowedTspStatus(allowedTspStatus);
-    Logger.debug("TrustProfile "+ id + " allows " + Arrays.toString(this.allowedTspStatus.toArray()) + " TSP status identifier");
+
+    if (tslEnabled) {    	
+    	setCountries(countries);
+    	if (!this.countries.isEmpty())
+    		Logger.info("TrustProfile "+ id + " allows " + Arrays.toString(this.countries.toArray()) + " TSL countries");
+    	else
+    		Logger.info("TrustProfile "+ id + " allows " + "ALL" + " TSL countries");
     
-    setAllowedTspServiceTypes(allowedTspServiceTypes);
-    Logger.debug("TrustProfile "+ id + " allows " + Arrays.toString(this.allowedTspServiceTypes.toArray()) + " TSL service-type identifier");
-            
+    	setAllowedTspStatus(allowedTspStatus);
+    	Logger.info("TrustProfile "+ id + " allows " + Arrays.toString(this.allowedTspStatus.toArray()) + " TSP status identifier");
+    	
+    	setAllowedTspServiceTypes(allowedTspServiceTypes);
+    	Logger.info("TrustProfile "+ id + " allows " + Arrays.toString(this.allowedTspServiceTypes.toArray()) + " TSL service-type identifier");
+    	
+    }            
   }
 
   private void setCountries(String countries) {
@@ -112,7 +119,7 @@ public class TrustProfile {
 		 }
 		  
 	  }	else {
-		  Logger.info("Use default set of TSP Status identifier");
+		  Logger.debug("Use default set of TSP Status identifier");
 		  this.allowedTspStatus.addAll(
 				  Arrays.asList(
 							TslConstants.SERVICE_STATUS_SORT_TO_URI.get(TslConstants.SERVICE_STATUS_SHORT.granted),
@@ -129,21 +136,20 @@ public class TrustProfile {
 			 String[] ccArray = allowedTspServiceTypes.split(","); 
 			 for (String el : ccArray) {
 				 try {
-					this.allowedTspStatus.add(new URI(el.trim()));
+					this.allowedTspServiceTypes.add(Pattern.compile(el.trim()));
 					
-				} catch (URISyntaxException e) {
-					Logger.warn("TrustProfile: " + this.id + " contains a non-valid TSP Service-Type identifier (" + el + ")");
+				} catch (PatternSyntaxException e) {
+					Logger.warn("TrustProfile: " + this.id + " contains a non-valid TSP Service-Type identifier Regex pattern(" + el + ")");
 					
 				}
 				 
 			 }
 			  
 		  }	else {
-			  Logger.info("Use default set of TSP Service-Type identifier");
-			  this.allowedTspStatus.addAll(
+			  Logger.debug("Use default set of TSP Service-Type identifier");
+			  this.allowedTspServiceTypes.addAll(
 					  Arrays.asList(
-							  TslConstants.SERVICE_STATUS_SORT_TO_URI.get(TslConstants.SERVICE_TYPE_SHORT.CA_QC),
-  							  TslConstants.SERVICE_STATUS_SORT_TO_URI.get(TslConstants.SERVICE_TYPE_SHORT.TSA_QTST)));
+							  Pattern.compile(TslConstants.DEFAULT_REGEX_PATTERN_ALLOW_ALL)));
 			  
 		  }
 	  
@@ -199,7 +205,7 @@ public class TrustProfile {
 	  return allowedTspStatus;
   }
 
-  public List<URI> getAllowedTspServiceTypes() {
+  public List<Pattern> getAllowedTspServiceTypes() {
 	  return allowedTspServiceTypes;
   }