1 files changed, 41 insertions, 5 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..6c8365e67 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,15 @@ 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.config.ConfigurationException;
 import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider;
 import at.gv.egovernment.moa.logging.Logger;
 import at.gv.egovernment.moa.util.StringUtils;
 
 
-public class ParamValidatorUtils {
+public class ParamValidatorUtils implements MOAIDAuthConstants{
    
    /**
     * Checks if the given target is valid
@@ -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;
 	    	  }
@@ -467,7 +471,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 (!ParamValidatorUtils.isValidBKUURI(bkuURL))
+		       throw new WrongParametersException("StartAuthentication", PARAM_BKU, "auth.12");
+		    if (!ParamValidatorUtils.isValidTemplate(req, 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;
+	}
 
 }