Merge branch 'moa2_0_tlenz' of gitlab.iaik.tugraz.at:afitzek/moa-idspss into moa2_0_tlenz_bs_2

9 files changed, 442 insertions, 19 deletions

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/Constants.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/Constants.java
index e0c6a69b7..b963890af 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/Constants.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/Constants.java
@@ -51,7 +51,9 @@ public class Constants {
 	public static final String SESSION_PVP2REQUESTID = "pvp2requestid";
 	public static final String SESSION_RETURNAREA = "returnarea";
 	public static final String SESSION_BKUFORMPREVIEW = "bkuformpreview";
-	public static final String SESSION_OAUTH20SECRET = "oauth20secret";
+	public static final String SESSION_OAUTH20SECRET = "oauth20secret";	
+	public static final String SESSION_BKUSELECTIONTEMPLATE = "bkuSelectionTemplate";
+	public static final String SESSION_SENDASSERTIONTEMPLATE = "sendAssertionTemplate";
 	
 	
 	public static enum STRUTS_RETURNAREA_VALUES {adminRequestsInit, main, usermanagementInit}; 
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/auth/pvp2/BuildMetadata.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/auth/pvp2/BuildMetadata.java
index 56f593ce7..9a0f73a1f 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/auth/pvp2/BuildMetadata.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/auth/pvp2/BuildMetadata.java
@@ -45,6 +45,7 @@ import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
 import org.apache.log4j.Logger;
+import org.joda.time.DateTime;
 import org.opensaml.Configuration;
 import org.opensaml.common.impl.SecureRandomIdentifierGenerator;
 import org.opensaml.common.xml.SAMLConstants;
@@ -87,6 +88,8 @@ public class BuildMetadata extends HttpServlet {
 	
 	private static final Logger log = Logger.getLogger(BuildMetadata.class);
 
+	private static final int VALIDUNTIL_IN_HOURS = 24;
+	
 	/**
 	 * @see HttpServlet#HttpServlet()
 	 */
@@ -118,6 +121,9 @@ public class BuildMetadata extends HttpServlet {
 			EntitiesDescriptor spEntitiesDescriptor = SAML2Utils.
 					createSAMLObject(EntitiesDescriptor.class);
 			
+			DateTime date = new DateTime();	
+			spEntitiesDescriptor.setValidUntil(date.plusHours(VALIDUNTIL_IN_HOURS));
+			
 			String name = config.getPVP2MetadataEntitiesName();
 			if (MiscUtil.isEmpty(name)) {
 				log.info("NO Metadata EntitiesName configurated");
@@ -130,6 +136,8 @@ public class BuildMetadata extends HttpServlet {
 			EntityDescriptor spEntityDescriptor = SAML2Utils
 					.createSAMLObject(EntityDescriptor.class);
 
+			spEntityDescriptor.setValidUntil(date.plusDays(VALIDUNTIL_IN_HOURS));
+			
 			spEntitiesDescriptor.getEntityDescriptors().add(spEntityDescriptor);
 			
 			String serviceURL = config.getPublicUrlPreFix(request);
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 49d556ba4..687925c18 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
@@ -49,7 +49,10 @@ public class FormularCustomization {
 	private String button_BackGroundColor = null;
 	private String button_BackGroundColorFocus = null;
 	private String button_FrontColor = null;
-
+	private String applet_height = null;
+	private String applet_width = null;
+	
+	
 	private String appletRedirectTarget = null;
 	public static List<String> appletRedirectTargetList = null;
 	
@@ -79,6 +82,14 @@ public class FormularCustomization {
 						onlyMandateAllowed = formcustom.isOnlyMandateLoginAllowed();
 					}
 					
+					if (formcustom.getAppletHeight() != null) {
+						applet_height = formcustom.getAppletHeight();
+					}
+					
+					if (formcustom.getAppletHeight() != null) {
+						applet_width = formcustom.getAppletWidth();
+					}
+					
 					if (MiscUtil.isNotEmpty(formcustom.getAppletRedirectTarget()))
 						appletRedirectTarget = formcustom.getAppletRedirectTarget();
 					
@@ -351,6 +362,35 @@ public class FormularCustomization {
 		this.fontTypeListValue = fontTypeListValue;
 	}
 
+	/**
+	 * @return the applet_height
+	 */
+	public String getApplet_height() {
+		return applet_height;
+	}
+
+	/**
+	 * @param applet_height the applet_height to set
+	 */
+	public void setApplet_height(String applet_height) {
+		this.applet_height = applet_height;
+	}
+
+	/**
+	 * @return the applet_width
+	 */
+	public String getApplet_width() {
+		return applet_width;
+	}
+
+	/**
+	 * @param applet_width the applet_width to set
+	 */
+	public void setApplet_width(String applet_width) {
+		this.applet_width = applet_width;
+	}
+
+	
 	
 	
 	
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAGeneralConfig.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAGeneralConfig.java
index 334124cfd..079e6807e 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAGeneralConfig.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAGeneralConfig.java
@@ -22,6 +22,7 @@
  *******************************************************************************/
 package at.gv.egovernment.moa.id.configuration.data.oa;
 
+import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -87,6 +88,16 @@ public class OAGeneralConfig {
 	
 	private Map<String, byte[]> transformations;
 	
+	private List<File> bkuSelectionFileUpload = null;
+	private List<String> bkuSelectionFileUploadContentType = null;
+	private List<String> bkuSelectionFileUploadFileName = new ArrayList<String>();
+	
+	private List<File> sendAssertionFileUpload = null;
+	private List<String> sendAssertionFileUploadContentType = null;
+	private List<String> sendAssertionFileUploadFileName  = new ArrayList<String>();;
+	
+	private boolean deleteBKUTemplate = false;
+	private boolean deleteSendAssertionTemplate = false;
 
 	
 	public OAGeneralConfig() {
@@ -225,6 +236,16 @@ public class OAGeneralConfig {
 						SLTemplates.add(el.getURL());
 					}
 				}
+				
+				TransformsInfoType bkuSelectTemplate = templates.getBKUSelectionTemplate();
+				if (bkuSelectTemplate != null && MiscUtil.isNotEmpty(bkuSelectTemplate.getFilename())) {
+					bkuSelectionFileUploadFileName.add(bkuSelectTemplate.getFilename());					
+				}
+				
+				TransformsInfoType sendAssertionTemplate = templates.getSendAssertionTemplate();
+				if (sendAssertionTemplate != null && MiscUtil.isNotEmpty(sendAssertionTemplate.getFilename())) {
+					sendAssertionFileUploadFileName.add(sendAssertionTemplate.getFilename());					
+				}
 			}
 		
 			if (SLTemplates != null && SLTemplates.size() > 0)
@@ -602,7 +623,140 @@ public class OAGeneralConfig {
 	 */
 	public void setUseMandates(boolean useMandates) {
 		this.useMandates = useMandates;
+	}
+
+
+	/**
+	 * @return the bkuSelectionFileUpload
+	 */
+	public List<File> getBkuSelectionFileUpload() {
+		return bkuSelectionFileUpload;
+	}
+
+
+	/**
+	 * @param bkuSelectionFileUpload the bkuSelectionFileUpload to set
+	 */
+	public void setBkuSelectionFileUpload(List<File> bkuSelectionFileUpload) {
+		this.bkuSelectionFileUpload = bkuSelectionFileUpload;
+	}
+
+
+	/**
+	 * @return the bkuSelectionFileUploadContentType
+	 */
+	public List<String> getBkuSelectionFileUploadContentType() {
+		return bkuSelectionFileUploadContentType;
+	}
+
+
+	/**
+	 * @param bkuSelectionFileUploadContentType the bkuSelectionFileUploadContentType to set
+	 */
+	public void setBkuSelectionFileUploadContentType(
+			List<String> bkuSelectionFileUploadContentType) {
+		this.bkuSelectionFileUploadContentType = bkuSelectionFileUploadContentType;
+	}
+
+
+	/**
+	 * @return the bkuSelectionFileUploadFileName
+	 */
+	public List<String> getBkuSelectionFileUploadFileName() {
+		return bkuSelectionFileUploadFileName;
+	}
+
+
+	/**
+	 * @param bkuSelectionFileUploadFileName the bkuSelectionFileUploadFileName to set
+	 */
+	public void setBkuSelectionFileUploadFileName(
+			List<String> bkuSelectionFileUploadFileName) {
+		this.bkuSelectionFileUploadFileName = bkuSelectionFileUploadFileName;
+	}
+
+
+	/**
+	 * @return the sendAssertionFileUpload
+	 */
+	public List<File> getSendAssertionFileUpload() {
+		return sendAssertionFileUpload;
+	}
+
+
+	/**
+	 * @param sendAssertionFileUpload the sendAssertionFileUpload to set
+	 */
+	public void setSendAssertionFileUpload(List<File> sendAssertionFileUpload) {
+		this.sendAssertionFileUpload = sendAssertionFileUpload;
+	}
+
+
+	/**
+	 * @return the sendAssertionFileUploadContentType
+	 */
+	public List<String> getSendAssertionFileUploadContentType() {
+		return sendAssertionFileUploadContentType;
+	}
+
+
+	/**
+	 * @param sendAssertionFileUploadContentType the sendAssertionFileUploadContentType to set
+	 */
+	public void setSendAssertionFileUploadContentType(
+			List<String> sendAssertionFileUploadContentType) {
+		this.sendAssertionFileUploadContentType = sendAssertionFileUploadContentType;
+	}
+
+
+	/**
+	 * @return the sendAssertionFileUploadFileName
+	 */
+	public List<String> getSendAssertionFileUploadFileName() {
+		return sendAssertionFileUploadFileName;
+	}
+
+
+	/**
+	 * @param sendAssertionFileUploadFileName the sendAssertionFileUploadFileName to set
+	 */
+	public void setSendAssertionFileUploadFileName(
+			List<String> sendAssertionFileUploadFileName) {
+		this.sendAssertionFileUploadFileName = sendAssertionFileUploadFileName;
+	}
+
+
+	/**
+	 * @return the deleteBKUTemplate
+	 */
+	public boolean isDeleteBKUTemplate() {
+		return deleteBKUTemplate;
+	}
+
+
+	/**
+	 * @param deleteBKUTemplate the deleteBKUTemplate to set
+	 */
+	public void setDeleteBKUTemplate(boolean deleteBKUTemplate) {
+		this.deleteBKUTemplate = deleteBKUTemplate;
+	}
+
+
+	/**
+	 * @return the deleteSendAssertionTemplate
+	 */
+	public boolean isDeleteSendAssertionTemplate() {
+		return deleteSendAssertionTemplate;
+	}
+
+
+	/**
+	 * @param deleteSendAssertionTemplate the deleteSendAssertionTemplate to set
+	 */
+	public void setDeleteSendAssertionTemplate(boolean deleteSendAssertionTemplate) {
+		this.deleteSendAssertionTemplate = deleteSendAssertionTemplate;
 	}	
 	
 	
+	
 }
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAPVP2Config.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAPVP2Config.java
index 0a03ac77b..843844e22 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAPVP2Config.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAPVP2Config.java
@@ -42,6 +42,8 @@ public class OAPVP2Config {
 	
 	private final Logger log = Logger.getLogger(OAPVP2Config.class);
 	
+	private boolean reLoad = false;
+	
 	private String metaDataURL = null;
 	private String certificateDN = null;
 	
@@ -139,6 +141,20 @@ public class OAPVP2Config {
 	public void setFileUploadFileName(String fileUploadFileName) {
 		this.fileUploadFileName = fileUploadFileName;
 	}
+
+	/**
+	 * @return the reLoad
+	 */
+	public boolean isReLoad() {
+		return reLoad;
+	}
+
+	/**
+	 * @param reLoad the reLoad to set
+	 */
+	public void setReLoad(boolean reLoad) {
+		this.reLoad = reLoad;
+	}
 	
 	
 }
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java
index 25c3f24b9..b0de196ca 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java
@@ -34,6 +34,7 @@ import java.security.cert.CertificateException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
@@ -63,7 +64,6 @@ import at.gv.egovernment.moa.id.commons.db.dao.config.OASSO;
 import at.gv.egovernment.moa.id.commons.db.dao.config.OASTORK;
 import at.gv.egovernment.moa.id.commons.db.dao.config.OnlineApplication;
 import at.gv.egovernment.moa.id.commons.db.dao.config.OnlineApplicationType;
-import at.gv.egovernment.moa.id.commons.db.dao.config.STORK;
 import at.gv.egovernment.moa.id.commons.db.dao.config.TemplateType;
 import at.gv.egovernment.moa.id.commons.db.dao.config.TemplatesType;
 import at.gv.egovernment.moa.id.commons.db.dao.config.TransformsInfoType;
@@ -85,6 +85,7 @@ import at.gv.egovernment.moa.id.configuration.helper.MailHelper;
 import at.gv.egovernment.moa.id.configuration.validation.FormularCustomizationValitator;
 import at.gv.egovernment.moa.id.configuration.validation.TargetValidator;
 import at.gv.egovernment.moa.id.configuration.validation.ValidationHelper;
+import at.gv.egovernment.moa.id.configuration.validation.oa.OAFileUploadValidation;
 import at.gv.egovernment.moa.id.configuration.validation.oa.OAGeneralConfigValidation;
 import at.gv.egovernment.moa.id.configuration.validation.oa.OAOAUTH20ConfigValidation;
 import at.gv.egovernment.moa.id.configuration.validation.oa.OAPVP2ConfigValidation;
@@ -126,9 +127,12 @@ public class EditOAAction extends ActionSupport implements ServletRequestAware,
 	private OAOAuth20Config oauth20OA = new OAOAuth20Config();
 	private OASTORKConfig storkOA = new OASTORKConfig();
 	private FormularCustomization formOA = new FormularCustomization();
-	
+		
 	private InputStream stream;
 	
+	private Map<String, byte[]> sendAssertionForm = new HashMap<String, byte[]>();
+	private Map<String, byte[]> bkuSelectionForm = new HashMap<String, byte[]>();
+	
 	// STRUTS actions
 	public String inital() {
 		HttpSession session = request.getSession();
@@ -365,6 +369,7 @@ public class EditOAAction extends ActionSupport implements ServletRequestAware,
 		OASTORKConfigValidation validator_stork = new OASTORKConfigValidation();
 		FormularCustomizationValitator validator_form = new FormularCustomizationValitator();
 		OAOAUTH20ConfigValidation validatior_oauth20 = new OAOAUTH20ConfigValidation();
+		OAFileUploadValidation valiator_fileUpload = new OAFileUploadValidation();
 		
 		errors.addAll(validatior_general.validate(generalOA, authUser.isAdmin()));
 		errors.addAll(validatior_pvp2.validate(pvp2OA));
@@ -374,6 +379,37 @@ public class EditOAAction extends ActionSupport implements ServletRequestAware,
 		errors.addAll(validator_form.validate(formOA));
 		errors.addAll(validatior_oauth20.validate(oauth20OA));
 		
+		//validate BKU-selection template		
+		List<String> templateError = valiator_fileUpload.validate(generalOA.getBkuSelectionFileUploadFileName()
+				, generalOA.getBkuSelectionFileUpload(), "validation.general.bkuselection", bkuSelectionForm);
+		if (templateError != null && templateError.size() == 0) {
+			if (bkuSelectionForm != null && bkuSelectionForm.size() > 0)
+				session.setAttribute(Constants.SESSION_BKUSELECTIONTEMPLATE, bkuSelectionForm);
+			
+			else
+				bkuSelectionForm = (Map<String, byte[]>) session.getAttribute(Constants.SESSION_BKUSELECTIONTEMPLATE);
+
+		} else {
+			errors.addAll(templateError);
+			
+		}
+		
+		//validate send-assertion template
+		templateError = valiator_fileUpload.validate(generalOA.getSendAssertionFileUploadFileName()
+				, generalOA.getSendAssertionFileUpload(), "validation.general.sendassertion", sendAssertionForm);
+		if (templateError != null && templateError.size() == 0) {			
+			if (sendAssertionForm != null && sendAssertionForm.size() > 0)
+				session.setAttribute(Constants.SESSION_SENDASSERTIONTEMPLATE, sendAssertionForm);
+			
+			else
+				sendAssertionForm = (Map<String, byte[]>) session.getAttribute(Constants.SESSION_SENDASSERTIONTEMPLATE);
+
+		} else {
+			errors.addAll(templateError);
+			
+		}
+		
+		
 		// Do not allow SSO in combination with special BKUSelection features
 		if (ssoOA.isUseSSO() && (formOA.isOnlyMandateAllowed() || !formOA.isShowMandateLoginButton())) {
 			log.warn("Special BKUSelection features can not be used in combination with SSO");
@@ -432,12 +468,26 @@ public class EditOAAction extends ActionSupport implements ServletRequestAware,
 					}
 				}
 			}
+
+			//save OA configuration
+			String error = saveOAConfigToDatabase(onlineapplication, newentry);
+			if (MiscUtil.isNotEmpty(error)) {
+				log.warn("OA configuration can not be stored!");
+				addActionError(error);
+				
+				formID = Random.nextRandom();
+				session.setAttribute(Constants.SESSION_FORMID, formID);
+				return Constants.STRUTS_ERROR_VALIDATION;
+			}
 			
+			//set metadata reload flag if reload is required 
 			if (pvp2OA.getMetaDataURL() != null) {
 				
 				try {
 					if (isMetaDataRefreshRequired
-							|| !pvp2OA.getMetaDataURL().equals(onlineapplication.getAuthComponentOA().getOAPVP2().getMetadataURL())) {
+							|| !pvp2OA.getMetaDataURL().equals(onlineapplication.getAuthComponentOA().getOAPVP2().getMetadataURL())
+							|| pvp2OA.getFileUpload() != null
+							|| pvp2OA.isReLoad()) {
 						
 						log.debug("Set PVP2 Metadata refresh flag.");
 						MOAIDConfiguration moaconfig = ConfigurationDBRead.getMOAIDConfiguration();
@@ -451,16 +501,6 @@ public class EditOAAction extends ActionSupport implements ServletRequestAware,
 				}
 				
 			}
-			
-			String error = saveOAConfigToDatabase(onlineapplication, newentry);
-			if (MiscUtil.isNotEmpty(error)) {
-				log.warn("OA configuration can not be stored!");
-				addActionError(error);
-				
-				formID = Random.nextRandom();
-				session.setAttribute(Constants.SESSION_FORMID, formID);
-				return Constants.STRUTS_ERROR_VALIDATION;
-			}
 		}
 		
 		Object nextPageAttr = session.getAttribute(Constants.SESSION_RETURNAREA);
@@ -495,9 +535,12 @@ public class EditOAAction extends ActionSupport implements ServletRequestAware,
 		} else
 			addActionMessage(LanguageHelper.getGUIString("webpages.oaconfig.success", generalOA.getIdentifier(), request));
 		
-		request.getSession().setAttribute(Constants.SESSION_OAID, null);
-		ConfigurationDBUtils.closeSession();
+		//remove session attributes
+		session.setAttribute(Constants.SESSION_OAID, null);
+		session.removeAttribute(Constants.SESSION_BKUSELECTIONTEMPLATE);
+		session.removeAttribute(Constants.SESSION_SENDASSERTIONTEMPLATE);
 		
+		ConfigurationDBUtils.closeSession();
 		return Constants.STRUTS_SUCCESS;
 	}
 	
@@ -808,6 +851,7 @@ public class EditOAAction extends ActionSupport implements ServletRequestAware,
 			}
 		}
 		
+		//store BKU-URLs
 		BKUURLS bkuruls = new BKUURLS();
 		authoa.setBKUURLS(bkuruls);
 		if (authUser.isAdmin()) {
@@ -822,6 +866,41 @@ public class EditOAAction extends ActionSupport implements ServletRequestAware,
 			authoa.setTemplates(templates);
 		}
 		
+		//store BKU-selection and send-assertion templates
+		if (authUser.isAdmin()) {
+			
+			if(generalOA.isDeleteBKUTemplate())
+				templates.setBKUSelectionTemplate(null);
+			
+			if (generalOA.isDeleteSendAssertionTemplate())
+				templates.setSendAssertionTemplate(null);
+			
+			
+			if (bkuSelectionForm != null && bkuSelectionForm.size() > 0) {
+				TransformsInfoType template = new TransformsInfoType();
+				
+				Iterator<String> interator = bkuSelectionForm.keySet().iterator();
+				template.setFilename(interator.next());
+				template.setTransformation(bkuSelectionForm.get(
+						template.getFilename()));
+				
+				templates.setBKUSelectionTemplate(template);					
+			}
+			
+			if (sendAssertionForm != null && sendAssertionForm.size() > 0) {
+				TransformsInfoType template = new TransformsInfoType();
+				
+				Iterator<String> interator = sendAssertionForm.keySet().iterator();
+				template.setFilename(interator.next());
+				template.setTransformation(sendAssertionForm.get(
+						template.getFilename()));
+				
+				templates.setSendAssertionTemplate(template);					
+			}	
+		}
+		
+		
+		//store BKU-selection customization
 		BKUSelectionCustomizationType bkuselectioncustom = templates.getBKUSelectionCustomization();
 		if (bkuselectioncustom == null) {
 			bkuselectioncustom = new BKUSelectionCustomizationType();
@@ -887,6 +966,9 @@ public class EditOAAction extends ActionSupport implements ServletRequestAware,
 			
 			bkuselectioncustom.setFontType(formOA.getFontType());
 			
+			bkuselectioncustom.setAppletHeight(formOA.getApplet_height());
+			bkuselectioncustom.setAppletWidth(formOA.getApplet_width());
+			
 		}
 		
 		// set default transformation if it is empty
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/IndexAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/IndexAction.java
index a488d919d..ee9b38f74 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/IndexAction.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/IndexAction.java
@@ -138,7 +138,19 @@ public class IndexAction extends ActionSupport implements ServletRequestAware,
 	
 	public String authenticate() {
 		
-		String key = null;
+		ConfigurationProvider config;
+		try {
+			config = ConfigurationProvider.getInstance();
+			pvp2LoginActiv = config.isPVP2LoginActive();
+						
+		} catch (ConfigurationException e1) {
+			log.warn("An internal error occurs.", e1);
+			pvp2LoginActiv = false;
+		}
+
+		
+		
+		String key = null;		
 		
 		if (MiscUtil.isNotEmpty(username)) {
 			if (ValidationHelper.containsPotentialCSSCharacter(username, false)) {
@@ -247,7 +259,8 @@ public class IndexAction extends ActionSupport implements ServletRequestAware,
 		
 			try {
 				ConfigurationProvider config = ConfigurationProvider.getInstance();
-				
+				pvp2LoginActiv = config.isPVP2LoginActive();
+								
 				//Decode with HttpPost Binding
 				HTTPPostDecoder decode = new HTTPPostDecoder(new BasicParserPool());
 				BasicSAMLMessageContext<Response, ?, ?> messageContext = new BasicSAMLMessageContext<Response, SAMLObject, SAMLObject>();
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/FormularCustomizationValitator.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/FormularCustomizationValitator.java
index 6a1eddb14..758aa7dc7 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/FormularCustomizationValitator.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/FormularCustomizationValitator.java
@@ -148,6 +148,24 @@ public class FormularCustomizationValitator {
 			}
 		}
 		
+		check = form.getApplet_height();
+		if (MiscUtil.isNotEmpty(check)) {
+			if (!ValidationHelper.validateNumber(check)) {
+				log.warn("Applet height "+ check + " is no valid number");
+				errors.add(LanguageHelper.getErrorString("validation.general.form.applet.height", 
+						new Object[] {ValidationHelper.getPotentialCSSCharacter(true)} ));
+			}			
+		}
+		
+		check = form.getApplet_width();
+		if (MiscUtil.isNotEmpty(check)) {
+			if (!ValidationHelper.validateNumber(check)) {
+				log.warn("Applet width "+ check + " is no valid number");
+				errors.add(LanguageHelper.getErrorString("validation.general.form.applet.width", 
+						new Object[] {ValidationHelper.getPotentialCSSCharacter(true)} ));
+			}			
+		}
+		
 		return errors;
 		
 	}
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAFileUploadValidation.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAFileUploadValidation.java
new file mode 100644
index 000000000..8887aeaad
--- /dev/null
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAFileUploadValidation.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2014 Federal Chancellery Austria
+ * MOA-ID has been developed in a cooperation between BRZ, the Federal
+ * Chancellery Austria - ICT staff unit, and Graz University of Technology.
+ *
+ * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "Licence");
+ * You may not use this work except in compliance with the Licence.
+ * You may obtain a copy of the Licence at:
+ * http://www.osor.eu/eupl/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the Licence is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Licence for the specific language governing permissions and
+ * limitations under the Licence.
+ *
+ * This product combines work with different licenses. See the "NOTICE" text
+ * file for details on the various modules and licenses.
+ * The "NOTICE" text file is part of the distribution. Any derivative works
+ * that you distribute must include a readable copy of the "NOTICE" text file.
+ */
+package at.gv.egovernment.moa.id.configuration.validation.oa;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.log4j.Logger;
+
+import at.gv.egovernment.moa.id.configuration.data.oa.OAGeneralConfig;
+import at.gv.egovernment.moa.id.configuration.helper.LanguageHelper;
+import at.gv.egovernment.moa.id.configuration.validation.ValidationHelper;
+import at.gv.egovernment.moa.util.Base64Utils;
+import at.gv.egovernment.moa.util.MiscUtil;
+
+/**
+ * @author tlenz
+ *
+ */
+public class OAFileUploadValidation {
+
+	private static final Logger log = Logger.getLogger(OASSOConfigValidation.class);
+	
+	public List<String> validate(List<String> fileName, List<File> files, String errorMsgPreFix, Map<String, byte[]> output) {
+		
+		List<String> errors = new ArrayList<String>();
+		
+		if (fileName != null) {
+			
+			if (fileName.size() > 1) {
+				log.info("Only one BKU-selecten template file can be stored");
+				errors.add(LanguageHelper.getErrorString(errorMsgPreFix + ".file.selected"));
+			}
+			
+			for (int i=0; i<fileName.size(); i++) {
+				String filename = fileName.get(i);
+				
+				if (MiscUtil.isNotEmpty(filename)) {
+					if (ValidationHelper.containsPotentialCSSCharacter(filename, false)) {
+						log.info("Filename is not valid");
+						errors.add(LanguageHelper.getErrorString(errorMsgPreFix + ".filename.valid"));
+						
+					} else {
+						try {
+							File file = files.get(i);
+							InputStream stream = new FileInputStream(file);
+							output.put(filename, IOUtils.toByteArray(stream));
+							stream.close();
+							
+						} catch (IOException e) {
+							log.info("File with FileName "
+									+ filename +" can not be loaded." , e);
+							errors.add(LanguageHelper.getErrorString(errorMsgPreFix + ".file.valid", 
+									new Object[] {filename} ));
+						}	
+					}
+				}
+			}
+		}
+		
+		return errors;
+	}
+}