MOA-ID Updates and Bugfixes

 -- OW BPK calculation
 -- OA specific SL-Templates
 -- update MOA-ID configuration XML
 -- PVP2: QA Level and BPK calculation updated
 -- PVP2: add two attribute builder
 -- MOA-ID BKU selection: bugfix local BKU selection

1 files changed, 9 insertions, 1 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 d6bef8d53..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
@@ -43,6 +43,7 @@ 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;
@@ -237,7 +238,7 @@ public class ParamValidatorUtils implements MOAIDAuthConstants{
     * @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");

 	   

@@ -267,6 +268,13 @@ public class ParamValidatorUtils implements MOAIDAuthConstants{
     			  //check against configured trustet template urls
     			  AuthConfigurationProvider authConf = AuthConfigurationProvider.getInstance();
     			  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");