Merge branch 'eIDAS_node_implementation' into development_preview

9 files changed, 129 insertions, 39 deletions

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/FormularCustomization.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/FormularCustomization.java
index 80800543b..5ee2ee6a7 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/FormularCustomization.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/FormularCustomization.java
@@ -97,6 +97,9 @@ public class FormularCustomization implements IOnlineApplicationData {
 	private String aditionalAuthBlockText = null;
 	private boolean isHideBPKAuthBlock = false;
 
+	private String saml2PostBindingTemplate = null;
+	private String mandateServiceSelectionTemplate = null;
+	
 	public FormularCustomization() {
 		new FormularCustomization(null);
 	}
@@ -128,6 +131,9 @@ public class FormularCustomization implements IOnlineApplicationData {
 	public List<String> parse(OnlineApplication dbOA, AuthenticatedUser authUser, HttpServletRequest request) {
 		AuthComponentOA auth = dbOA.getAuthComponentOA();
 
+		mandateServiceSelectionTemplate = dbOA.getMandateServiceSelectionTemplateURL();
+		saml2PostBindingTemplate = dbOA.getSaml2PostBindingTemplateURL();
+		
 		if (dbOA.getAuthComponentOA() != null)
 			isHideBPKAuthBlock = dbOA.isRemoveBPKFromAuthBlock();
 		
@@ -243,6 +249,9 @@ public class FormularCustomization implements IOnlineApplicationData {
         
         dbOA.setRemoveBPKFromAuthBlock(isHideBPKAuthBlock());
         
+        dbOA.setMandateServiceSelectionTemplateURL(mandateServiceSelectionTemplate);
+        dbOA.setSaml2PostBindingTemplateURL(saml2PostBindingTemplate);
+        
         TemplatesType templates = authoa.getTemplates();
         if (templates == null) {
             templates = new TemplatesType();
@@ -382,6 +391,21 @@ public class FormularCustomization implements IOnlineApplicationData {
 
         }
 		
+        check = getSaml2PostBindingTemplate();
+        if (MiscUtil.isNotEmpty(check) && ValidationHelper.isNotValidIdentityLinkSigner(check)	) {
+        	log.info("URL to SAML2 POST-Binding template is not valid");
+			errors.add(LanguageHelper.getErrorString("validation.general.templates.saml2.postbinding.valid", request));
+			
+		}
+        
+        check = getMandateServiceSelectionTemplate();
+        if (MiscUtil.isNotEmpty(check) && ValidationHelper.isNotValidIdentityLinkSigner(check)	) {
+        	log.info("URL to mandate-service selection-template is not valid");
+			errors.add(LanguageHelper.getErrorString("validation.general.templates.mandateserviceselection.valid", request));
+			
+		}
+        
+        
         //validate BKUFormCustomization
 		errors.addAll(new FormularCustomizationValitator().validate(this, request));
        		
@@ -813,7 +837,36 @@ public class FormularCustomization implements IOnlineApplicationData {
 	 */
 	public Map<String, String> getFormMap() {
 		return map;
+	}
+
+	/**
+	 * @return the saml2PostBindingTemplate
+	 */
+	public String getSaml2PostBindingTemplate() {
+		return saml2PostBindingTemplate;
+	}
+
+	/**
+	 * @param saml2PostBindingTemplate the saml2PostBindingTemplate to set
+	 */
+	public void setSaml2PostBindingTemplate(String saml2PostBindingTemplate) {
+		this.saml2PostBindingTemplate = saml2PostBindingTemplate;
+	}
+
+	/**
+	 * @return the mandateServiceSelectionTemplate
+	 */
+	public String getMandateServiceSelectionTemplate() {
+		return mandateServiceSelectionTemplate;
+	}
+
+	/**
+	 * @param mandateServiceSelectionTemplate the mandateServiceSelectionTemplate to set
+	 */
+	public void setMandateServiceSelectionTemplate(String mandateServiceSelectionTemplate) {
+		this.mandateServiceSelectionTemplate = mandateServiceSelectionTemplate;
 	}	
 	
 	
+	
 }
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/BasicOAAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/BasicOAAction.java
index 5022be915..539deac9e 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/BasicOAAction.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/BasicOAAction.java
@@ -44,7 +44,7 @@ import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.VelocityEngine;
 
 import at.gv.egiz.components.configuration.meta.api.ConfigurationStorageException;
-import at.gv.egovernment.moa.id.auth.frontend.builder.ServiceProviderSpecificGUIFormBuilderConfiguration;
+import at.gv.egovernment.moa.id.auth.frontend.builder.AbstractServiceProviderSpecificGUIFormBuilderConfiguration;
 import at.gv.egovernment.moa.id.auth.frontend.utils.FormBuildUtils;
 import at.gv.egovernment.moa.id.auth.frontend.velocity.VelocityProvider;
 import at.gv.egovernment.moa.id.commons.config.ConfigurationMigrationUtils;
@@ -610,7 +610,7 @@ public class BasicOAAction extends BasicAction {
                 //set parameters
                 Map<String, Object> params =  (Map<String, Object>) mapobj;
                 params.put(
-                		ServiceProviderSpecificGUIFormBuilderConfiguration.PARAM_AUTHCONTEXT, 
+                		AbstractServiceProviderSpecificGUIFormBuilderConfiguration.PARAM_AUTHCONTEXT, 
                 		contextpath);
                 
                 request.setCharacterEncoding("UTF-8");
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/StorkConfigValidator.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/StorkConfigValidator.java
index 8e8020d75..fbd2f3bb3 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/StorkConfigValidator.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/StorkConfigValidator.java
@@ -43,7 +43,7 @@ public class StorkConfigValidator {
 						errors.add(LanguageHelper.getErrorString("validation.stork.cpeps.cc",
 								new Object[] {ValidationHelper.getPotentialCSSCharacter(false)}, request ));
 					}
-					if(!check.toLowerCase().matches("(^[a-z][a-z]$)|(^[a-z][a-z]-[a-z]*)")) {
+					if(!check.toLowerCase().matches("(^[a-z][a-z]$)|(^[a-z][a-z]-[a-z,0-9]*)")) {
 							log.warn("CPEPS config countrycode does not comply to ISO 3166-2 : " + check);
 							errors.add(LanguageHelper.getErrorString("validation.stork.cpeps.cc",
 									new Object[] {check}, request ));
diff --git a/id/ConfigWebTool/src/main/resources/applicationResources_de.properties b/id/ConfigWebTool/src/main/resources/applicationResources_de.properties
index d75403575..4b29f901a 100644
--- a/id/ConfigWebTool/src/main/resources/applicationResources_de.properties
+++ b/id/ConfigWebTool/src/main/resources/applicationResources_de.properties
@@ -132,7 +132,7 @@ webpages.moaconfig.defaultbkus.header=Default BKUs
 webpages.moaconfig.slrequesttemplates.header=SecurityLayer Request Templates
 webpages.moaconfig.slrequesttemplates.local=Locale BKU
 webpages.moaconfig.slrequesttemplates.handy=Handy BKU
-webpages.moaconfig.slrequesttemplates.online=Online BKU
+webpages.moaconfig.slrequesttemplates.online=Dritte BKU
 webpages.moaconfig.certificates.header=Zertifikatspr\u00FCfung
 webpages.moaconfig.certificates.certstore=CertStoreDirecorty
 webpages.moaconfig.certificates.trustmanagerrev=TrustManagerRevocationChecking
@@ -202,7 +202,7 @@ webpages.oaconfig.header=Konfiguration der Onlineapplikation
 webpages.oaconfig.general.isActive=Online-Applikation ist aktiviert
 webpages.oaconfig.general.bku.header=BKU Konfiguration
 webpages.oaconfig.general.bku.local=Locale BKU
-webpages.oaconfig.general.bku.online=Online BKU
+webpages.oaconfig.general.bku.online=Dritte BKU
 webpages.oaconfig.general.bku.handy=Handy BKU
 webpages.oaconfig.general.bku.slversion=SecurityLayer Version
 webpages.oaconfig.general.bku.keyboxidentifier=KeyBoxIdentifier
@@ -218,6 +218,11 @@ webpages.oaconfig.general.bku.bkuselection.upload=Neues Template hochladen
 webpages.oaconfig.general.bku.sendassertion.header=Send-Assertion Template
 webpages.oaconfig.general.bku.sendassertion.filename=Dateiname
 webpages.oaconfig.general.bku.sendassertion.upload=Neues Template hochladen
+webpages.oaconfig.general.templates.elgamandates.header=Template zur Vollmachtenserviceauswahl
+webpages.oaconfig.general.templates.elgamandates.url=Template URL
+webpages.oaconfig.general.templates.saml2.postbinding.header=SAML2 POST Binding Formular
+webpages.oaconfig.general.templates.saml2.postbinding.url=Template URL
+
 
 webpages.oaconfig.bPKEncDec.header=Fremd-bPK Konfiguration
 webpages.oaconfig.bPKEncDec.keystore.header=KeyStore Konfiguration
@@ -437,8 +442,8 @@ validation.general.slrequest.handy.empty=Die URL zum SecurityLayer Template f\u0
 validation.general.slrequest.handy.valid=Die URL zum SecurityLayer Template f\u00F6r die Handy-BKU hat kein g\u00F6ltiges Format.
 validation.general.slrequest.local.empty=Die URL zum SecurityLayer Template f\u00F6r die locale BKU ist leer.
 validation.general.slrequest.local.valid=Die URL zum SecurityLayer Template f\u00F6r die locale BKU hat kein g\u00F6ltiges Format.
-validation.general.slrequest.online.empty=Die URL zum SecurityLayer Template f\u00F6r die Online-BKU ist leer.
-validation.general.slrequest.online.valid=Die URL zum SecurityLayer Template f\u00F6r die Online-BKU hat kein g\u00F6ltiges Format.
+validation.general.slrequest.online.empty=Die URL zum SecurityLayer Template f\u00F6r die Dritte-BKU ist leer.
+validation.general.slrequest.online.valid=Die URL zum SecurityLayer Template f\u00F6r die Dritte-BKU hat kein g\u00F6ltiges Format.
 validation.general.sso.friendlyname.valid=Der SSO Service Name enth\u00E4lt ein ung\u00FCltiges Zeichen. Folgende Zeichen sind nicht erlaubt\: {0}
 validation.general.sso.identificationnumber.valid=Die SSO IdentificationNumber enth\u00E4lt ein ung\u00FCltiges Zeichen. Folgende Zeichen sind nicht erlaubt\: {0}
 validation.general.sso.publicurl.valid=Der SSO Service URL-Prefix hat kein g\u00F6ltiges Format.
@@ -456,8 +461,8 @@ validation.general.bku.handy.empty=Die URL f\u00FCr die Handy-BKU ist leer.
 validation.general.bku.handy.valid=Die URL f\u00FCr die Handy-BKU hat kein g\u00FCltiges Format.
 validation.general.bku.local.empty=Die URL f\u00FCr die lokale BKU ist leer.
 validation.general.bku.local.valid=Die URL f\u00FCr die locale BKU hat kein g\u00FCltiges Format.
-validation.general.bku.online.empty=Die URL f\u00FCr die Online-BKU ist leer.
-validation.general.bku.online.valid=Die URL f\u00FCr die Online-BKU hat kein g\u00FCltiges Format.
+validation.general.bku.online.empty=Die URL f\u00FCr die Dritte-BKU ist leer.
+validation.general.bku.online.valid=Die URL f\u00FCr die Dritte-BKU hat kein g\u00FCltiges Format.
 validation.general.oafriendlyname.empty=Es wurde kein Name f\u00FCr die Online-Applikation angegeben.
 validation.general.oafriendlyname.valid=Der Name der Online-Applikation enth\u00E4lt nicht erlaubte Zeichen. Folgende Zeichen sind nicht erlaubt\: {0}
 validation.general.keyboxidentifier.empty=Es wurde kein KeyBoxIdentifier ausgew\u00E4hlt.
@@ -493,6 +498,8 @@ validation.general.sendassertion.filename.valid=Der Dateiname des Send-Assertion
 validation.general.sendassertion.file.valid=Das Send-Assertion Templates konnte nicht geladen werden.
 validation.general.sendassertion.file.selected=Es kann nur EIN Send-Assertion Template angegeben werden.
 validation.general.testcredentials.oid.valid=Die Testdaten OID {0} ist ung\u00FCltig.
+validation.general.templates.saml2.postbinding.valid=URL zum Template f\u00FCr das SAML2 POST-Binding Formular ist nicht g\u00FCltig.
+validation.general.templates.mandateserviceselection.valid=URL zum Template z\u00FCr Auswahl des Vollmachtenservices ist nicht g\u00FCltig.
 
 validation.bPKDec.keyStorePassword.empty=Das Password f\u00FCr den KeyStore ist leer.
 validation.bPKDec.keyStorePassword.valid=Das Password f\u00FCr den KeyStore enth\u00E4lt nicht erlaubte Zeichen. Folgende Zeichen sind nicht erlaubt\: {0}
diff --git a/id/ConfigWebTool/src/main/resources/applicationResources_en.properties b/id/ConfigWebTool/src/main/resources/applicationResources_en.properties
index 708cc605e..d642994de 100644
--- a/id/ConfigWebTool/src/main/resources/applicationResources_en.properties
+++ b/id/ConfigWebTool/src/main/resources/applicationResources_en.properties
@@ -131,7 +131,7 @@ webpages.moaconfig.defaultbkus.header=Default CCE
 webpages.moaconfig.slrequesttemplates.header=SecurityLayer Request Templates
 webpages.moaconfig.slrequesttemplates.local=Local CCE
 webpages.moaconfig.slrequesttemplates.handy=Mobile CCE
-webpages.moaconfig.slrequesttemplates.online=Online CCE
+webpages.moaconfig.slrequesttemplates.online=Third CCE
 webpages.moaconfig.certificates.header=Certificate check
 webpages.moaconfig.certificates.certstore=CertStoreDirectory
 webpages.moaconfig.certificates.trustmanagerrev=TrustManagerRevocationChecking
@@ -197,7 +197,7 @@ webpages.oaconfig.header=Configuration of the Online-Application
 webpages.oaconfig.general.isActive=Online-Application is activated
 webpages.oaconfig.general.bku.header=CCE configuration
 webpages.oaconfig.general.bku.local=Local CCE
-webpages.oaconfig.general.bku.online=Online CCE
+webpages.oaconfig.general.bku.online=Third CCE
 webpages.oaconfig.general.bku.handy=Mobile CCE
 webpages.oaconfig.general.bku.slversion=SecurityLayer Version
 webpages.oaconfig.general.bku.keyboxidentifier=KeyBoxIdentifier
@@ -224,6 +224,12 @@ webpages.oaconfig.general.bku.sendassertion.header=Send-Assertion Template
 webpages.oaconfig.general.bku.sendassertion.filename=Filename
 webpages.oaconfig.general.bku.sendassertion.upload=Upload new template
 
+webpages.oaconfig.general.templates.elgamandates.header=Template to select a specific mandate service
+webpages.oaconfig.general.templates.elgamandates.url=Template URL
+webpages.oaconfig.general.templates.saml2.postbinding.header=SAML2 POST-Binding Formular
+webpages.oaconfig.general.templates.saml2.postbinding.url=Template URL
+
+
 webpages.oaconfig.bPKEncDec.header=Foreign-bPK Configuration
 webpages.oaconfig.bPKEncDec.keystore.header=Keystore configuration
 webpages.oaconfig.bPKEncDec.filename=Filename
@@ -435,8 +441,8 @@ validation.general.slrequest.handy.empty=URL for SecurityLayer Template for die
 validation.general.slrequest.handy.valid=URL for SecurityLayer Template for Mobile-CCE has invalid format.
 validation.general.slrequest.local.empty=URL for SecurityLayer Template for local CCE is blank.
 validation.general.slrequest.local.valid=URL for SecurityLayer Template for local CCE has invalid format.
-validation.general.slrequest.online.empty=URL for SecurityLayer Template for Online-CCE is blank.
-validation.general.slrequest.online.valid=URL for SecurityLayer Template for die Online-CCE has invalid format.
+validation.general.slrequest.online.empty=URL for SecurityLayer Template for Third-CCE is blank.
+validation.general.slrequest.online.valid=URL for SecurityLayer Template for Third-CCE has invalid format.
 validation.general.sso.friendlyname.valid=SSO Service Name contains forbidden characters. The following characters are not allowed\: {0}
 validation.general.sso.identificationnumber.valid=SSO IdentificationNumber contains forbidden characters. The following characters are not allowed\: {0}
 validation.general.sso.publicurl.valid=SSO Service URL-Prefix has invalid format.
@@ -454,8 +460,8 @@ validation.general.bku.handy.empty=URL for Mobile-CCE is blank.
 validation.general.bku.handy.valid=URL for Mobile-CCE has invalid format.
 validation.general.bku.local.empty=URL for local CCE is blank.
 validation.general.bku.local.valid=URL for local CCE has invalid format.
-validation.general.bku.online.empty=URL for Online-CCE is blank.
-validation.general.bku.online.valid=URL for Online-CCE has invalid format.
+validation.general.bku.online.empty=URL for Third-CCE is blank.
+validation.general.bku.online.valid=URL for Third-CCE has invalid format.
 validation.general.oafriendlyname.empty=There is no name for Online-Application provided.
 validation.general.oafriendlyname.valid=The name of Online-Application contains forbidden characters. The following characters are not allowed\: {0}
 validation.general.keyboxidentifier.empty=There is no KeyBoxIdentifier selected.
@@ -491,6 +497,8 @@ validation.general.sendassertion.filename.valid=The file name of Send-Assertion
 validation.general.sendassertion.file.valid=Send-Assertion Templates could not be loaded.
 validation.general.sendassertion.file.selected=Only one Send-Assertion Template can be provided.
 validation.general.testcredentials.oid.valid=The OID {0} for test credentials is not a valid.
+validation.general.templates.saml2.postbinding.valid=URL to SAML2 POST-Binding template is not valid
+validation.general.templates.mandateserviceselection.valid=URL to mandate-service selection-template is not valid
 
 validation.bPKDec.keyStorePassword.empty=KeyStore password is blank.
 validation.bPKDec.keyStorePassword.valid=The keyStore password contains forbidden characters. The following characters are not allowed\: {0}
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
index 6892535a1..79c66f37c 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
@@ -73,13 +73,6 @@
 						<div class="oa_config_block">
 							<h3><%=LanguageHelper.getGUIString("webpages.moaconfig.defaultbkus.header", request) %></h3>
 							
-							<s:textfield name="moaconfig.defaultBKUOnline" 
-								value="%{moaconfig.defaultBKUOnline}" 
-								labelposition="left"
-								key="webpages.oaconfig.general.bku.online"
-								cssClass="textfield_long">
-							</s:textfield>
-	
 							<s:textfield name="moaconfig.defaultBKUHandy" 
 								value="%{moaconfig.defaultBKUHandy}" 
 								labelposition="left"
@@ -93,18 +86,18 @@
 								key="webpages.oaconfig.general.bku.local"
 								cssClass="textfield_long">
 							</s:textfield>
-						</div>
-						
-						<div class="oa_config_block">
-							<h3><%=LanguageHelper.getGUIString("webpages.moaconfig.slrequesttemplates.header", request) %></h3>
 							
-							<s:textfield name="moaconfig.SLRequestTemplateOnline" 
-								value="%{moaconfig.SLRequestTemplateOnline}" 
+							<s:textfield name="moaconfig.defaultBKUOnline" 
+								value="%{moaconfig.defaultBKUOnline}" 
 								labelposition="left"
-								key="webpages.moaconfig.slrequesttemplates.online"
+								key="webpages.oaconfig.general.bku.online"
 								cssClass="textfield_long">
 							</s:textfield>
-	
+						</div>
+						
+						<div class="oa_config_block">
+							<h3><%=LanguageHelper.getGUIString("webpages.moaconfig.slrequesttemplates.header", request) %></h3>
+								
 							<s:textfield name="moaconfig.SLRequestTemplateHandy" 
 								value="%{moaconfig.SLRequestTemplateHandy}" 
 								labelposition="left"
@@ -118,6 +111,14 @@
 								key="webpages.moaconfig.slrequesttemplates.local"
 								cssClass="textfield_long">
 							</s:textfield>
+							
+							<s:textfield name="moaconfig.SLRequestTemplateOnline" 
+								value="%{moaconfig.SLRequestTemplateOnline}" 
+								labelposition="left"
+								key="webpages.moaconfig.slrequesttemplates.online"
+								cssClass="textfield_long">
+							</s:textfield>
+							
 						</div>			
 
 						<div class="oa_config_block">
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/authentication.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/authentication.jsp
index ff2b091c6..59661091b 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/authentication.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/authentication.jsp
@@ -7,14 +7,7 @@
 					<s:if test="authUser.isAdmin()">
 						<div class="oa_config_block">
 							<h3><%=LanguageHelper.getGUIString("webpages.oaconfig.general.bku.header", request) %></h3>
-							
-							<s:textfield name="authOA.bkuOnlineURL" 
-								value="%{authOA.bkuOnlineURL}" 
-								labelposition="left"
-								key="webpages.oaconfig.general.bku.online"
-								cssClass="textfield_long">
-							</s:textfield>
-	
+						
 							<s:textfield name="authOA.bkuHandyURL" 
 								value="%{authOA.bkuHandyURL}" 
 								labelposition="left"
@@ -28,6 +21,13 @@
 								key="webpages.oaconfig.general.bku.local"
 								cssClass="textfield_long">
 							</s:textfield>
+						
+							<s:textfield name="authOA.bkuOnlineURL" 
+								value="%{authOA.bkuOnlineURL}" 
+								labelposition="left"
+								key="webpages.oaconfig.general.bku.online"
+								cssClass="textfield_long">
+							</s:textfield>
 							
 							<s:radio list="authOA.keyBoxIdentifierList"
 								name="authOA.keyBoxIdentifier"
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/formCustomization.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/formCustomization.jsp
index 008a8b521..6dbed0047 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/formCustomization.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/formCustomization.jsp
@@ -160,7 +160,7 @@
 																
 							</div>
 							
-														<div class="oa_protocol_area">
+							<div class="oa_protocol_area">
 								<h4><%=LanguageHelper.getGUIString("webpages.oaconfig.general.bku.bkuselection.header", request) %></h4>
 								<s:iterator value="%{formOA.bkuSelectionFileUploadFileName}" var="fileNameBKU">
 									<div class="floatClass">
@@ -202,6 +202,16 @@
 								</s:if>
 							</div>
 							
+							<div class="oa_protocol_area">
+								<h4><%=LanguageHelper.getGUIString("webpages.oaconfig.general.templates.elgamandates.header", request) %></h4>
+								<s:textfield name="formOA.mandateServiceSelectionTemplate" 
+		 												 value="%{formOA.mandateServiceSelectionTemplate}" 
+								 						 labelposition="left"
+								 						 key="webpages.oaconfig.general.templates.elgamandates.url"
+								 						 cssClass="textfield_long">
+								</s:textfield>
+							</div>
+							
 						</s:if>
 							
 					</div>
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/pvp2.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/pvp2.jsp
index 7e40fc60b..693ef8073 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/pvp2.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/pvp2.jsp
@@ -23,6 +23,17 @@
 							<div id="pvp2_certificate_upload">
 								<s:file name="pvp2OA.fileUpload" key="webpages.oaconfig.pvp2.certifcate" cssClass="textfield_long"></s:file>
 							</div>
+							
+							<div class="oa_protocol_area">
+								<h4><%=LanguageHelper.getGUIString("webpages.oaconfig.general.templates.saml2.postbinding.header", request) %></h4>
+								<s:textfield name="formOA.saml2PostBindingTemplate" 
+		 												 value="%{formOA.saml2PostBindingTemplate}" 
+								 						 labelposition="left"
+								 						 key="webpages.oaconfig.general.templates.saml2.postbinding.url"
+								 						 cssClass="textfield_long">
+								</s:textfield>
+							</div>
+							
 						</div>
 				
 </html>
\ No newline at end of file