1 files changed, 7 insertions, 11 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ParamValidatorUtils.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ParamValidatorUtils.java
index 6c8365e67..be8e475f2 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ParamValidatorUtils.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ParamValidatorUtils.java
@@ -46,6 +46,7 @@ import at.gv.egovernment.moa.id.auth.WrongParametersException;
 import at.gv.egovernment.moa.id.config.ConfigurationException;
 import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider;
 import at.gv.egovernment.moa.logging.Logger;
+import at.gv.egovernment.moa.util.MiscUtil;
 import at.gv.egovernment.moa.util.StringUtils;
 
 
@@ -177,7 +178,7 @@ public class ParamValidatorUtils implements MOAIDAuthConstants{
     * @param target HTTP parameter from request
     * @return 
     */
-   public static boolean isValidBKUURI(String bkuURI) {
+   public static boolean isValidBKUURI(String bkuURI, List<String> allowedBKUs) {
 	   Logger.debug("Ueberpruefe Parameter bkuURI");
 	   
 	   // if non parameter is given return true
@@ -202,9 +203,7 @@ public class ParamValidatorUtils implements MOAIDAuthConstants{
 	    		  }
 	    		  else {
 	    			  Logger.debug("Parameter bkuURI ist keine lokale BKU. Ueberpruefe Liste der vertrauenswuerdigen BKUs.");
-	    			  AuthConfigurationProvider authConf = AuthConfigurationProvider.getInstance();
-		    		  List trustedBKUs = authConf.getTrustedBKUs();
-		    		  boolean b = trustedBKUs.contains(bkuURI);
+		    		  boolean b = allowedBKUs.contains(bkuURI);
 		    		  if (b) {
 		    			  Logger.debug("Parameter bkuURI erfolgreich ueberprueft");
 		    			  return true;
@@ -228,10 +227,7 @@ public class ParamValidatorUtils implements MOAIDAuthConstants{
 	      } catch (MalformedURLException e) {
 	    	  Logger.error("Fehler Ueberpruefung Parameter bkuURI", e);
 	         return false;
-	      } catch (ConfigurationException e) {
-	    	  Logger.error("Fehler Ueberpruefung Parameter bkuURI", e);
-	    	  return false;
-		}
+	      }
    }
    
    
@@ -270,7 +266,7 @@ public class ParamValidatorUtils implements MOAIDAuthConstants{
     		  else {
     			  //check against configured trustet template urls
     			  AuthConfigurationProvider authConf = AuthConfigurationProvider.getInstance();
-    			  List trustedTemplateURLs = authConf.getTrustedTemplateURLs();
+    			  List<String> trustedTemplateURLs = authConf.getSLRequestTemplates();
 	    		  boolean b = trustedTemplateURLs.contains(template);
 	    		  if (b) {
 	    			  Logger.debug("Parameter Template erfolgreich ueberprueft");
@@ -486,9 +482,9 @@ public class ParamValidatorUtils implements MOAIDAuthConstants{
 	    try {
 			if (!ParamValidatorUtils.isValidOA(oaURL))			
 				throw new WrongParametersException("StartAuthentication", PARAM_OA, "auth.12");
-		    if (!ParamValidatorUtils.isValidBKUURI(bkuURL))
+		    if (MiscUtil.isEmpty(bkuURL))
 		       throw new WrongParametersException("StartAuthentication", PARAM_BKU, "auth.12");
-		    if (!ParamValidatorUtils.isValidTemplate(req, templateURL))
+		    if (MiscUtil.isEmpty(templateURL))
 		       throw new WrongParametersException("StartAuthentication", PARAM_TEMPLATE, "auth.12");
 		    if (!ParamValidatorUtils.isValidUseMandate(useMandate))
 	           throw new WrongParametersException("StartAuthentication", PARAM_USEMANDATE, "auth.12");