1 files changed, 61 insertions, 21 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 bd79f88b7..ea823889f 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
@@ -41,13 +41,17 @@ import javax.xml.parsers.ParserConfigurationException;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
+import at.gv.egovernment.moa.id.auth.MOAIDAuthConstants;
+import at.gv.egovernment.moa.id.auth.WrongParametersException;
+import at.gv.egovernment.moa.id.commons.db.dao.config.TemplateType;
 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;
 

 

-public class ParamValidatorUtils {

+public class ParamValidatorUtils implements MOAIDAuthConstants{

    

    /**

     * Checks if the given target is valid

@@ -175,7 +179,7 @@ public class ParamValidatorUtils {
     * @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

@@ -200,9 +204,7 @@ public class ParamValidatorUtils {
 	    		  }

 	    		  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;

@@ -212,10 +214,12 @@ public class ParamValidatorUtils {
 		    			  return false;

 		    		  }  

 	    		  }

-	    		  

-	    			

 	    	  }

-	    	  else {

+	    	  else if (MOAIDAuthConstants.REQ_BKU_TYPES.contains(bkuURI)) {
+	    		  Logger.debug("Parameter bkuURI from configuration is used.");
+	    		  return true;
+	    		  
+	    	  } else {

 	    		  Logger.error("Fehler Ueberpruefung Parameter bkuURI. bkuURI beginnt nicht mit http or https");

 	    		  return false;

 	    	  }

@@ -224,10 +228,7 @@ public class ParamValidatorUtils {
 	      } catch (MalformedURLException e) {

 	    	  Logger.error("Fehler Ueberpruefung Parameter bkuURI", e);

 	         return false;

-	      } catch (ConfigurationException e) {

-	    	  Logger.error("Fehler Ueberpruefung Parameter bkuURI", e);

-	    	  return false;

-		}

+	      }

    }

    

    

@@ -237,7 +238,7 @@ public class ParamValidatorUtils {
     * @param template

     * @return

     */

-   public static boolean isValidTemplate(HttpServletRequest req, String template) {

+   public static boolean isValidTemplate(HttpServletRequest req, String template, List<TemplateType> oaSlTemplates) {

    

 	   Logger.debug("Ueberpruefe Parameter Template bzw. bkuSelectionTemplateURL");

 	   

@@ -266,7 +267,14 @@ public class ParamValidatorUtils {
     		  else {
     			  //check against configured trustet template urls
     			  AuthConfigurationProvider authConf = AuthConfigurationProvider.getInstance();
-    			  List trustedTemplateURLs = authConf.getTrustedTemplateURLs();
+    			  List<String> trustedTemplateURLs = authConf.getSLRequestTemplates();
+    			  
+    			  //get OA specific template URLs
+    			  if (oaSlTemplates != null && oaSlTemplates.size() > 0) {
+    			    for (TemplateType el : oaSlTemplates)
+    			    	trustedTemplateURLs.add(el.getURL());    				  
+    			  }
+    			  
 	    		  boolean b = trustedTemplateURLs.contains(template);
 	    		  if (b) {
 	    			  Logger.debug("Parameter Template erfolgreich ueberprueft");
@@ -308,18 +316,18 @@ public class ParamValidatorUtils {
     	  Logger.debug("Parameter MOASessionId ist null");

     	  return true; 

       }

-         

-

-      Pattern pattern = Pattern.compile("[0-9-]*");

+        

+     Pattern pattern = Pattern.compile("[0-9-]*");

       Matcher matcher = pattern.matcher(sessionID);

       boolean b = matcher.matches();

       if (b) {

     	  Logger.debug("Parameter MOASessionId erfolgreich ueberprueft");

     	  return true;

       }

-      else {

-    	  Logger.error("Fehler Ueberpruefung Parameter MOASessionId. MOASessionId entspricht nicht den Kriterien (nur Zeichen 0-9 und -)");

-    	  return false;

+      else {
+       	  Logger.error("Fehler Ueberpruefung Parameter MOASessionId. MOASessionId entspricht nicht den Kriterien (nur Zeichen 0-9 und -)");

+       	  return false;
+

       }

    }

    

@@ -467,7 +475,39 @@ public class ParamValidatorUtils {
 		   return false;

 	   }	

 	   

-   }

+   }
+   
+	public static boolean areAllLegacyParametersAvailable(HttpServletRequest req) {
+		
+	    String oaURL = req.getParameter(PARAM_OA);
+	    String bkuURL = req.getParameter(PARAM_BKU);
+	    String templateURL = req.getParameter(PARAM_TEMPLATE);
+	    String useMandate = req.getParameter(PARAM_USEMANDATE);
+	    String ccc = req.getParameter(PARAM_CCC);
+	    
+	    
+	      // check parameter
+	    try {
+			if (!ParamValidatorUtils.isValidOA(oaURL))			
+				throw new WrongParametersException("StartAuthentication", PARAM_OA, "auth.12");
+		    if (MiscUtil.isEmpty(bkuURL))
+		       throw new WrongParametersException("StartAuthentication", PARAM_BKU, "auth.12");
+		    if (MiscUtil.isEmpty(templateURL))
+		       throw new WrongParametersException("StartAuthentication", PARAM_TEMPLATE, "auth.12");
+		    if (!ParamValidatorUtils.isValidUseMandate(useMandate))
+	           throw new WrongParametersException("StartAuthentication", PARAM_USEMANDATE, "auth.12");		    
+		    if (!ParamValidatorUtils.isValidCCC(ccc))
+	           throw new WrongParametersException("StartAuthentication", PARAM_CCC, "auth.12");
+		    
+		} catch (WrongParametersException e) {
+			return false;
+		}
+
+	    if (StringUtils.isEmpty(oaURL) || StringUtils.isEmpty(templateURL) || StringUtils.isEmpty(bkuURL))
+	    	return false;
+	    else
+	    	return true;
+	}

 

 }