move BKU Authentication preprocessing into a seperate task.

The GenerateIFrameTemplateServlet only put all request parameters into process-managment context

3 files changed, 202 insertions, 3 deletions

diff --git a/id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/DefaultAuthModuleImpl.java b/id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/DefaultAuthModuleImpl.java
index 8ae4a9999..cac7359c7 100644
--- a/id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/DefaultAuthModuleImpl.java
+++ b/id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/DefaultAuthModuleImpl.java
@@ -2,6 +2,7 @@ package at.gv.egovernment.moa.id.auth.modules.internal;
 
 import org.apache.commons.lang3.StringUtils;
 
+import at.gv.egovernment.moa.id.auth.MOAIDAuthConstants;
 import at.gv.egovernment.moa.id.auth.modules.AuthModule;
 import at.gv.egovernment.moa.id.process.api.ExecutionContext;
 
@@ -16,8 +17,15 @@ public class DefaultAuthModuleImpl implements AuthModule {
 	}
 
 	@Override
-	public String selectProcess(ExecutionContext context) {
-		return StringUtils.isBlank((String) context.get("ccc")) ? "DefaultAuthentication" : null;
+	public String selectProcess(ExecutionContext context) {		
+		//select process if BKU is selected and it is no STORK authentication
+		if (StringUtils.isBlank((String) context.get("ccc")) && 
+				StringUtils.isNotBlank((String) context.get(MOAIDAuthConstants.PARAM_BKU)))
+			return "DefaultAuthentication";
+		
+		else
+			return null;
+		
 	}
 
 	@Override
diff --git a/id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/InitializeBKUAuthenticationTask.java b/id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/InitializeBKUAuthenticationTask.java
new file mode 100644
index 000000000..feab1ec66
--- /dev/null
+++ b/id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/InitializeBKUAuthenticationTask.java
@@ -0,0 +1,188 @@
+/*
+ * 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.auth.modules.internal.tasks;
+
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import at.gv.egovernment.moa.id.advancedlogging.MOAIDEventConstants;
+import at.gv.egovernment.moa.id.advancedlogging.MOAReversionLogger;
+import at.gv.egovernment.moa.id.auth.MOAIDAuthConstants;
+import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
+import at.gv.egovernment.moa.id.auth.exception.AuthenticationException;
+import at.gv.egovernment.moa.id.auth.exception.MOAIDException;
+import at.gv.egovernment.moa.id.auth.modules.AbstractAuthServletTask;
+import at.gv.egovernment.moa.id.auth.modules.TaskExecutionException;
+import at.gv.egovernment.moa.id.auth.parser.StartAuthentificationParameterParser;
+import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.MOAAuthDataType;
+import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException;
+import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProviderFactory;
+import at.gv.egovernment.moa.id.config.auth.IOAAuthParameters;
+import at.gv.egovernment.moa.id.moduls.IRequest;
+import at.gv.egovernment.moa.id.moduls.RequestStorage;
+import at.gv.egovernment.moa.id.process.api.ExecutionContext;
+import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage;
+import at.gv.egovernment.moa.logging.Logger;
+import at.gv.egovernment.moa.util.FileUtils;
+import at.gv.egovernment.moa.util.MiscUtil;
+
+/**
+ * @author tlenz
+ *
+ */
+public class InitializeBKUAuthenticationTask extends AbstractAuthServletTask {
+
+	/* (non-Javadoc)
+	 * @see at.gv.egovernment.moa.id.process.springweb.MoaIdTask#execute(at.gv.egovernment.moa.id.process.api.ExecutionContext, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
+	 */
+	@Override
+	public void execute(ExecutionContext executionContext,
+			HttpServletRequest request, HttpServletResponse response)
+			throws TaskExecutionException {
+		
+		try {
+	    	String moasessionid = (String) executionContext.get(MOAIDAuthConstants.PARAM_SESSIONID);	    	
+			String pendingRequestID = (String) executionContext.get("pendingRequestID");
+
+			//load pending request
+			IRequest pendingReq = RequestStorage.getPendingRequest(pendingRequestID);				
+			if (pendingReq == null) {
+				Logger.info("No PendingRequest with Id: " + pendingRequestID + " Maybe, a transaction timeout occure.");
+				throw new MOAIDException("auth.28", new Object[]{pendingRequestID});
+				
+			}
+	    	
+			//load MOASession object
+			AuthenticationSession moasession = AuthenticationSessionStoreage.getSession(moasessionid);
+			
+			boolean isLegacyRequest = false;
+			Object isLegacyRequestObj = executionContext.get("isLegacyRequest");
+			if (isLegacyRequestObj != null && isLegacyRequestObj instanceof Boolean)
+				isLegacyRequest = (boolean) isLegacyRequestObj;
+
+			if (isLegacyRequest) {
+				//parse request parameter into MOASession
+			    Logger.info("Start Authentication Module: " + moasession.getModul() 
+			    		+ " Action: " + moasession.getAction());
+
+				StartAuthentificationParameterParser.parse(executionContext, request, moasession, pendingReq);
+												
+			} else {						
+		    	String bkuid = (String) executionContext.get(MOAIDAuthConstants.PARAM_BKU);
+		    	String useMandate = (String) executionContext.get(MOAIDAuthConstants.PARAM_USEMANDATE);
+				String ccc = (String) executionContext.get(MOAIDAuthConstants.PARAM_CCC);
+							
+				//remove MOASessionID from executionContext because it is not needed any more
+	
+				
+		    	if (MiscUtil.isEmpty(bkuid) || MiscUtil.isEmpty(moasessionid)) {
+		    		Logger.warn("MOASessionID or BKU-type is empty. Maybe an old BKU-selection template is in use.");
+		    		throw new MOAIDException("auth.23", new Object[] {});
+		    	}
+								
+		    	//load OA Config
+				IOAAuthParameters oaParam = pendingReq.getOnlineApplicationConfiguration();
+				
+				if (oaParam == null)
+					throw new AuthenticationException("auth.00", new Object[] { moasession.getOAURLRequested() });
+				
+				else {
+					MOAReversionLogger.getInstance().logEvent(pendingReq.getOnlineApplicationConfiguration(), 
+							pendingReq, MOAIDEventConstants.AUTHPROCESS_BKUTYPE_SELECTED, bkuid);
+					
+			    	//get Target from config or from request in case of SAML 1				
+					String target = null;
+					if (MiscUtil.isNotEmpty(pendingReq.getTarget()) && 
+							pendingReq.requestedModule().equals("id_saml1"))
+						target = pendingReq.getTarget();
+					else
+						target = oaParam.getTarget();
+									
+			    	String bkuURL = oaParam.getBKUURL(bkuid);
+			    	if (MiscUtil.isEmpty(bkuURL)) {
+			    		Logger.info("No OA specific BKU defined. Use BKU from default configuration");
+			    		bkuURL = AuthConfigurationProviderFactory.getInstance().getDefaultBKUURL(bkuid);
+			    	}
+			    	
+			    	//search for OA specific template
+			    	String templateURL = null;
+			    	List<String> oaTemplateURLList = oaParam.getTemplateURL();
+			    	if ( oaTemplateURLList != null && oaTemplateURLList.size() > 0
+			    			&& MiscUtil.isNotEmpty(oaTemplateURLList.get(0)) ) {
+			    		templateURL = oaTemplateURLList.get(0);
+			    		
+			    	} else {		    	
+			    		templateURL = AuthConfigurationProviderFactory.getInstance().getSLRequestTemplates(bkuid);
+			    	}
+			    	
+			    	//make url absolut if it is a local url
+		    		if (MiscUtil.isNotEmpty(templateURL))
+		    			templateURL = FileUtils.makeAbsoluteURL(templateURL, 
+		    					AuthConfigurationProviderFactory.getInstance().getRootConfigFileDir());
+			    	
+			    	if (oaParam.isOnlyMandateAllowed()) 
+			    		useMandate = "true";
+			    	
+			    	if (!oaParam.isShowMandateCheckBox())
+			    		useMandate = "false";
+			    	
+			    	//parse all OA parameters i
+			    	StartAuthentificationParameterParser.parse(moasession, 
+			    											   target, 
+			    											   moasession.getOAURLRequested(),
+			    											   bkuURL,
+			    											   templateURL,
+			    											   useMandate,
+			    											   ccc, 
+			    											   moasession.getModul(),
+			    											   moasession.getAction(),
+			    											   request);
+				}
+			}
+			
+			executionContext.put(MOAIDAuthConstants.PARAM_USEMANDATE, moasession.getUseMandate());
+			
+			// make sure moa session has been persisted before running the process
+			try {
+				AuthenticationSessionStoreage.storeSession(moasession);
+			} catch (MOADatabaseException e) {
+				Logger.error("Database Error! MOASession is not stored!");
+				throw new MOAIDException("init.04", new Object[] {
+						moasession.getSessionID()});
+			}
+			
+			
+		} catch (MOADatabaseException | MOAIDException e) {
+			throw new TaskExecutionException(e.getMessage(), e);
+			
+		} catch (Exception e) {
+			Logger.warn("InitializeBKUAuthentication has an internal error", e);
+			throw new TaskExecutionException(e.getMessage(), e);
+			
+		}
+
+	}
+
+}
diff --git a/id/server/modules/moa-id-modul-citizencard_authentication/src/main/resources/at/gv/egovernment/moa/id/auth/modules/internal/DefaultAuthentication.process.xml b/id/server/modules/moa-id-modul-citizencard_authentication/src/main/resources/at/gv/egovernment/moa/id/auth/modules/internal/DefaultAuthentication.process.xml
index e9e95e922..6bbaf6ece 100644
--- a/id/server/modules/moa-id-modul-citizencard_authentication/src/main/resources/at/gv/egovernment/moa/id/auth/modules/internal/DefaultAuthentication.process.xml
+++ b/id/server/modules/moa-id-modul-citizencard_authentication/src/main/resources/at/gv/egovernment/moa/id/auth/modules/internal/DefaultAuthentication.process.xml
@@ -5,6 +5,7 @@
 	- National authentication with Austrian Citizen Card and mobile signature with our without mandate.
 	- Legacy authentication for foreign citizens using MOCCA supported signature cards.
 -->
+	<pd:Task id="initializeBKUAuthentication" class="at.gv.egovernment.moa.id.auth.modules.internal.tasks.InitializeBKUAuthenticationTask" />
 	<pd:Task id="createIdentityLinkForm"    class="at.gv.egovernment.moa.id.auth.modules.internal.tasks.CreateIdentityLinkFormTask" />
 	<pd:Task id="verifyIdentityLink"        class="at.gv.egovernment.moa.id.auth.modules.internal.tasks.VerifyIdentityLinkTask"        async="true" />
 	<pd:Task id="verifyAuthBlock"           class="at.gv.egovernment.moa.id.auth.modules.internal.tasks.VerifyAuthenticationBlockTask" async="true" />
@@ -19,7 +20,9 @@
 	<!-- Process is triggered either by GenerateIFrameTemplateServlet (upon bku selection) or by AuthenticationManager (upon legacy authentication start using legacy parameters. -->
 	<pd:StartEvent id="start" />
 	
-	<pd:Transition from="start"                     to="createIdentityLinkForm" />
+	<pd:Transition from="start"                     to="initializeBKUAuthentication" />
+	
+	<pd:Transition from="initializeBKUAuthentication" to="createIdentityLinkForm" />
 	
 	<pd:Transition from="createIdentityLinkForm"    to="verifyIdentityLink" />