merge tlenz into ap

3 files changed, 185 insertions, 43 deletions

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java
index 3c8c0e18d..c9e834662 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java
@@ -48,7 +48,6 @@ import at.gv.egovernment.moa.id.commons.db.dao.config.Contact;
 import at.gv.egovernment.moa.id.commons.db.dao.config.DefaultBKUs;
 import at.gv.egovernment.moa.id.commons.db.dao.config.ForeignIdentities;
 import at.gv.egovernment.moa.id.commons.db.dao.config.GeneralConfiguration;
-import at.gv.egovernment.moa.id.commons.db.dao.config.IdentificationNumber;
 import at.gv.egovernment.moa.id.commons.db.dao.config.IdentityLinkSigners;
 import at.gv.egovernment.moa.id.commons.db.dao.config.LegacyAllowed;
 import at.gv.egovernment.moa.id.commons.db.dao.config.MOAIDConfiguration;
@@ -74,6 +73,7 @@ import at.gv.egovernment.moa.id.configuration.auth.AuthenticatedUser;
 import at.gv.egovernment.moa.id.configuration.data.GeneralMOAIDConfig;
 import at.gv.egovernment.moa.id.configuration.data.GeneralStorkConfig;
 import at.gv.egovernment.moa.id.configuration.helper.LanguageHelper;
+import at.gv.egovernment.moa.id.configuration.validation.ValidationHelper;
 import at.gv.egovernment.moa.id.configuration.validation.moaconfig.MOAConfigValidator;
 import at.gv.egovernment.moa.id.configuration.validation.moaconfig.StorkConfigValidator;
 import at.gv.egovernment.moa.id.util.Random;
@@ -225,16 +225,24 @@ public class EditGeneralConfigAction extends ActionSupport
 			dbauth.setGeneralConfiguration(dbauthgeneral);
 		}
 		
-		GeneralConfiguration oldauthgeneral = null;
-		if (oldauth != null)
-			oldauthgeneral = oldauth.getGeneralConfiguration();
+//		GeneralConfiguration oldauthgeneral = null;
+//		if (oldauth != null)
+//			oldauthgeneral = oldauth.getGeneralConfiguration();
 		
-		if (MiscUtil.isNotEmpty(moaconfig.getAlternativeSourceID()))
-			dbauthgeneral.setAlternativeSourceID(moaconfig.getAlternativeSourceID());
-		else {
-			if (oldauthgeneral != null)
-			dbauthgeneral.setAlternativeSourceID(oldauthgeneral.getAlternativeSourceID());
-		}
+		//set Public URL Prefix		
+		String pubURLPrefix = moaconfig.getPublicURLPrefix(); 
+		if(pubURLPrefix.endsWith("/")) {
+			int length = pubURLPrefix.length();
+			pubURLPrefix = pubURLPrefix.substring(0, length-1);
+		}		
+		dbauthgeneral.setPublicURLPreFix(pubURLPrefix);
+		
+//		if (MiscUtil.isNotEmpty(moaconfig.getAlternativeSourceID()))
+//			dbauthgeneral.setAlternativeSourceID(moaconfig.getAlternativeSourceID());
+//		else {
+//			if (oldauthgeneral != null)
+//			dbauthgeneral.setAlternativeSourceID(oldauthgeneral.getAlternativeSourceID());
+//		}
 			
 		if (MiscUtil.isNotEmpty(moaconfig.getCertStoreDirectory()))
 				dbauthgeneral.setCertStoreDirectory(moaconfig.getCertStoreDirectory());
@@ -287,6 +295,15 @@ public class EditGeneralConfigAction extends ActionSupport
 		}
 		saml1.setIsActive(moaconfig.isProtocolActiveSAML1());
 		
+		if (MiscUtil.isNotEmpty(moaconfig.getSaml1SourceID())) {
+			saml1.setSourceID(moaconfig.getSaml1SourceID());
+			
+		} else {
+			if (MiscUtil.isNotEmpty(saml1.getSourceID()))
+				saml1.setSourceID(moaconfig.getSaml1SourceID());
+			
+		}
+		
 		OAuth oauth= dbprotocols.getOAuth();
 		if (oauth == null) {
 			oauth = new OAuth();
@@ -304,8 +321,8 @@ public class EditGeneralConfigAction extends ActionSupport
 		
 		if (MiscUtil.isNotEmpty(moaconfig.getPvp2IssuerName()))
 			pvp2.setIssuerName(moaconfig.getPvp2IssuerName());
-		if (MiscUtil.isNotEmpty(moaconfig.getPvp2PublicUrlPrefix()))
-			pvp2.setPublicURLPrefix(moaconfig.getPvp2PublicUrlPrefix());
+//		if (MiscUtil.isNotEmpty(moaconfig.getPvp2PublicUrlPrefix()))
+//			pvp2.setPublicURLPrefix(moaconfig.getPvp2PublicUrlPrefix());
 		
 		Organization pvp2org = pvp2.getOrganization();
 		if (pvp2org == null) {
@@ -353,20 +370,46 @@ public class EditGeneralConfigAction extends ActionSupport
 			dbsso.setFriendlyName(moaconfig.getSsoFriendlyName());
 		if (MiscUtil.isNotEmpty(moaconfig.getSsoSpecialText()))
 			dbsso.setSpecialText(moaconfig.getSsoSpecialText());
-		if (MiscUtil.isNotEmpty(moaconfig.getSsoPublicUrl()))
-			dbsso.setPublicURL(moaconfig.getSsoPublicUrl());
+//		if (MiscUtil.isNotEmpty(moaconfig.getSsoPublicUrl()))
+//			dbsso.setPublicURL(moaconfig.getSsoPublicUrl());
 		
-		if (MiscUtil.isNotEmpty(moaconfig.getSsoTarget()))
-			dbsso.setTarget(moaconfig.getSsoTarget());
-
-		if (MiscUtil.isNotEmpty(moaconfig.getSsoIdentificationNumber())) {
-			IdentificationNumber ssoid = dbsso.getIdentificationNumber();
-			if (ssoid == null) {
-				ssoid = new IdentificationNumber();
-				dbsso.setIdentificationNumber(ssoid);
+		if (MiscUtil.isNotEmpty(moaconfig.getSsoTarget())) {
+			
+			if (!ValidationHelper.isValidAdminTarget(moaconfig.getSsoTarget())) {
+				String num = moaconfig.getSsoTarget().replaceAll(" ", "");
+				String pre = null;
+				if (num.startsWith(Constants.IDENIFICATIONTYPE_FN)) {
+					num = num.substring(Constants.IDENIFICATIONTYPE_FN.length());
+					
+					num = at.gv.egovernment.moa.util.StringUtils.deleteLeadingZeros(num);
+					pre = Constants.IDENIFICATIONTYPE_FN;
+				}
+				
+				if (num.startsWith(Constants.IDENIFICATIONTYPE_ZVR)) {
+					num = num.substring(Constants.IDENIFICATIONTYPE_ZVR.length());
+					pre = Constants.IDENIFICATIONTYPE_ZVR;
+				}
+				
+				if (num.startsWith(Constants.IDENIFICATIONTYPE_ERSB)){
+					num = num.substring(Constants.IDENIFICATIONTYPE_ERSB.length());
+					pre = Constants.IDENIFICATIONTYPE_ERSB;
+				}
+							
+				dbsso.setTarget(Constants.PREFIX_WPBK + pre + "+" + num);
+				
+			} else {
+				dbsso.setTarget(moaconfig.getSsoTarget());
+				
 			}
-			ssoid.setValue(moaconfig.getSsoIdentificationNumber());
 		}
+//		if (MiscUtil.isNotEmpty(moaconfig.getSsoIdentificationNumber())) {
+//			IdentificationNumber ssoid = dbsso.getIdentificationNumber();
+//			if (ssoid == null) {
+//				ssoid = new IdentificationNumber();
+//				dbsso.setIdentificationNumber(ssoid);
+//			}
+//			ssoid.setValue(moaconfig.getSsoIdentificationNumber());
+//		}
 				
 		DefaultBKUs dbbkus = dbconfig.getDefaultBKUs();
 		if (dbbkus == null) {
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 c257c76c8..99bdfdc9c 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;
 	}
 	
@@ -763,6 +806,7 @@ public class EditOAAction extends ActionSupport implements ServletRequestAware,
 			
 			IdentificationNumber idnumber = new IdentificationNumber();
 			idnumber.setValue(Constants.PREFIX_WPBK + generalOA.getIdentificationType() + "+" + num);
+			idnumber.setType(Constants.BUSINESSSERVICENAMES.get(generalOA.getIdentificationType()));
 			
 			authoa.setIdentificationNumber(idnumber);
 			
@@ -807,6 +851,7 @@ public class EditOAAction extends ActionSupport implements ServletRequestAware,
 			}
 		}
 		
+		//store BKU-URLs
 		BKUURLS bkuruls = new BKUURLS();
 		authoa.setBKUURLS(bkuruls);
 		if (authUser.isAdmin()) {
@@ -821,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();
@@ -854,17 +934,20 @@ public class EditOAAction extends ActionSupport implements ServletRequestAware,
 					TemplateType el = new TemplateType();
 					el.setURL(generalOA.getSLTemplateURL1());
 					template.add(el);
-				}
+				} else
+					template.add(new TemplateType());				
 				if (MiscUtil.isNotEmpty(generalOA.getSLTemplateURL2())) {
 					TemplateType el = new TemplateType();
 					el.setURL(generalOA.getSLTemplateURL2());
 					template.add(el);
-				}
+				}else
+					template.add(new TemplateType());
 				if (MiscUtil.isNotEmpty(generalOA.getSLTemplateURL3())) {
 					TemplateType el = new TemplateType();
 					el.setURL(generalOA.getSLTemplateURL3());
 					template.add(el);
-				}
+				}else
+					template.add(new TemplateType());
 				
 			} else {
 				if (template != null && template.size() > 0) template.clear();
@@ -886,6 +969,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>();