more refactoring staff

6 files changed, 14 insertions, 116 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/AbstractProcessEngineSignalController.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/AbstractProcessEngineSignalController.java
deleted file mode 100644
index 3b12418fa..000000000
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/AbstractProcessEngineSignalController.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package at.gv.egovernment.moa.id.auth.servlet;

-

-import java.io.IOException;

-

-import javax.servlet.http.HttpServletRequest;

-import javax.servlet.http.HttpServletResponse;

-

-import org.apache.commons.lang.StringEscapeUtils;

-import org.springframework.beans.factory.annotation.Autowired;

-

-import at.gv.egiz.eaaf.core.api.IRequest;

-import at.gv.egiz.eaaf.core.impl.idp.controller.AbstractController;

-import at.gv.egiz.eaaf.core.impl.utils.TransactionIDUtils;

-import at.gv.egovernment.moa.id.auth.exception.MOAIllegalStateException;

-import at.gv.egovernment.moa.id.commons.MOAIDAuthConstants;

-import at.gv.egovernment.moa.id.commons.api.exceptions.MOAIDException;

-import at.gv.egovernment.moa.id.process.ProcessEngine;

-import at.gv.egovernment.moa.logging.Logger;

-

-/**

- * Servlet that resumes a suspended process (in case of asynchronous tasks).

- * 

- * @author tknall

- * 

- */

-public abstract class AbstractProcessEngineSignalController extends AbstractController {

-		

-	@Autowired protected ProcessEngine processEngine;

-	

-	protected void signalProcessManagement(HttpServletRequest req, HttpServletResponse resp) throws IOException {

-		String pendingRequestID = StringEscapeUtils.escapeHtml(getPendingRequestId(req));

-		IRequest pendingReq = null;

-		try {	

-			if (pendingRequestID == null) {

-				throw new MOAIllegalStateException("process.03", new Object[]{"Unable to determine MOA pending-request id."});

-				

-			}

-			

-			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});

-				

-			}

-			

-			//change pending-request ID

-			requestStorage.changePendingRequestID(pendingReq);

-			pendingRequestID = pendingReq.getRequestID();

-						

-			// process instance is mandatory

-			if (pendingReq.getProcessInstanceId() == null) {

-				throw new MOAIllegalStateException("process.03", new Object[]{"MOA session does not provide process instance id."});

-				

-			}

-

-			// wake up next task

-			processEngine.signal(pendingReq);

-			

-		} catch (Exception ex) {		

-			handleError(null, ex, req, resp, pendingReq);

-			

-		} finally {

-			//MOASessionDBUtils.closeSession();

-			TransactionIDUtils.removeAllLoggingVariables();

-			

-		}

-		

-		

-	}

-	

-	/**

-	 * Retrieves the current pending-request id from the HttpServletRequest parameter

-	 * {@link MOAIDAuthConstants#PARAM_TARGET_PENDINGREQUESTID}.

-	 * <p/>

-	 * Note that this class/method can be overwritten by modules providing their own strategy of retrieving the

-	 * respective pending-request id.

-	 * 

-	 * @param request

-	 *            The unterlying HttpServletRequest.

-	 * @return The current pending-request id.

-	 */

-	public String getPendingRequestId(HttpServletRequest request) {

-		return StringEscapeUtils.escapeHtml(request.getParameter(MOAIDAuthConstants.PARAM_TARGET_PENDINGREQUESTID));

-		

-	}

-

-}

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GUILayoutBuilderServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GUILayoutBuilderServlet.java
index cfeca88b7..18aa93cc9 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GUILayoutBuilderServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GUILayoutBuilderServlet.java
@@ -35,12 +35,12 @@ import org.springframework.web.bind.annotation.RequestMethod;
 
 import at.gv.egiz.eaaf.core.api.IRequest;
 import at.gv.egiz.eaaf.core.api.IRequestStorage;
+import at.gv.egiz.eaaf.core.api.data.EAAFConstants;
 import at.gv.egiz.eaaf.core.api.gui.IGUIFormBuilder;
 import at.gv.egiz.eaaf.core.impl.idp.controller.AbstractController;
 import at.gv.egiz.eaaf.core.impl.utils.HTTPUtils;
 import at.gv.egovernment.moa.id.auth.frontend.builder.AbstractServiceProviderSpecificGUIFormBuilderConfiguration;
 import at.gv.egovernment.moa.id.auth.frontend.builder.SPSpecificGUIBuilderConfigurationWithDBLoad;
-import at.gv.egovernment.moa.id.commons.MOAIDAuthConstants;
 import at.gv.egovernment.moa.id.commons.MOAIDConstants;
 import at.gv.egovernment.moa.id.commons.api.AuthConfiguration;
 import at.gv.egovernment.moa.logging.Logger;
@@ -165,7 +165,7 @@ public class GUILayoutBuilderServlet extends AbstractController {
 	private IRequest extractPendingRequest(HttpServletRequest req) {
 		try {		
 			String pendingReqID = StringEscapeUtils.escapeHtml(
-					req.getParameter(MOAIDAuthConstants.PARAM_TARGET_PENDINGREQUESTID));
+					req.getParameter(EAAFConstants.PARAM_HTTP_TARGET_PENDINGREQUESTID));
 		
 			if (MiscUtil.isNotEmpty(pendingReqID)) {		
 				IRequest pendingReq = requestStorage.getPendingRequest(pendingReqID);
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GeneralProcessEngineSignalController.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GeneralProcessEngineSignalController.java
index dfa923558..87325989a 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GeneralProcessEngineSignalController.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GeneralProcessEngineSignalController.java
@@ -31,6 +31,8 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
+import at.gv.egiz.eaaf.core.impl.idp.controller.AbstractProcessEngineSignalController;
+
 /**
  * @author tlenz
  *
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/IDPSingleLogOutServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/IDPSingleLogOutServlet.java
index 9282db3b1..0e9db3964 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/IDPSingleLogOutServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/IDPSingleLogOutServlet.java
@@ -46,6 +46,7 @@ import at.gv.egovernment.moa.id.auth.frontend.builder.DefaultGUIFormBuilderConfi
 import at.gv.egovernment.moa.id.commons.MOAIDAuthConstants;
 import at.gv.egovernment.moa.id.commons.api.exceptions.MOAIDException;
 import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException;
+import at.gv.egovernment.moa.id.commons.utils.MOAIDMessageProvider;
 import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProviderFactory;
 import at.gv.egovernment.moa.id.data.SLOInformationContainer;
 import at.gv.egovernment.moa.id.moduls.SSOManager;
@@ -53,7 +54,6 @@ import at.gv.egovernment.moa.id.protocols.pvp2x.builder.SingleLogOutBuilder;
 import at.gv.egovernment.moa.id.protocols.pvp2x.exceptions.NOSLOServiceDescriptorException;
 import at.gv.egovernment.moa.id.protocols.pvp2x.exceptions.NoMetadataInformationException;
 import at.gv.egovernment.moa.id.storage.IAuthenticationSessionStoreage;
-import at.gv.egovernment.moa.id.util.MOAIDMessageProvider;
 import at.gv.egovernment.moa.logging.Logger;
 import at.gv.egovernment.moa.util.MiscUtil;
 import at.gv.egovernment.moa.util.URLEncoder;
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/LogOutServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/LogOutServlet.java
index beacf1552..21d329145 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/LogOutServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/LogOutServlet.java
@@ -56,12 +56,10 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
-import at.gv.egiz.eaaf.core.impl.idp.auth.AuthenticationManager;
+import at.gv.egiz.eaaf.core.api.idp.auth.ISSOManager;
 import at.gv.egiz.eaaf.core.impl.utils.HTTPUtils;
-import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
 import at.gv.egovernment.moa.id.commons.api.AuthConfiguration;
 import at.gv.egovernment.moa.id.commons.api.IOAAuthParameters;
-import at.gv.egovernment.moa.id.moduls.SSOManager;
 import at.gv.egovernment.moa.id.storage.IAuthenticationSessionStoreage;
 import at.gv.egovernment.moa.logging.Logger;
 import at.gv.egovernment.moa.util.MiscUtil;
@@ -71,8 +69,8 @@ import at.gv.egovernment.moa.util.MiscUtil;
 public class LogOutServlet {
 	private static final String REDIRECT_URL = "redirect";
 	
-	@Autowired(required=true) private SSOManager ssomanager;
-	@Autowired(required=true) private AuthenticationManager authmanager;
+	@Autowired(required=true) private ISSOManager ssomanager;
+	//@Autowired(required=true) private IAuthenticationManager authmanager;
 	@Autowired(required=true) private IAuthenticationSessionStoreage authenticatedSessionStorage;
 	@Autowired(required=true) private AuthConfiguration authConfig;
 	
@@ -83,10 +81,7 @@ public class LogOutServlet {
 
 		String redirectUrl = (String) req.getParameter(REDIRECT_URL);
 				
-		try {
-			//get SSO token from request
-			String ssoid = ssomanager.getSSOSessionID(req);
-			
+		try {			
 			if (MiscUtil.isEmpty(redirectUrl)) {
 				//set default redirect Target
 				Logger.debug("Set default RedirectURL back to MOA-ID-Auth");
@@ -103,23 +98,11 @@ public class LogOutServlet {
 				
 			}
 			
-			if (ssomanager.isValidSSOSession(ssoid, null)) {
-		
-				//TODO: Single LogOut Implementation
-		
-				//delete SSO session and MOA session
-				AuthenticationSession moasessionid = authenticatedSessionStorage.getInternalMOASessionWithSSOID(ssoid);
-				authmanager.performOnlyIDPLogOut(moasessionid);
-				
-				Logger.info("User with SSO Id " + ssoid + " is logged out and get redirect to "+ redirectUrl);
-			} else {
+			if (ssomanager.destroySSOSessionOnIDPOnly(req, resp))
+				Logger.info("User with SSO is logged out and get redirect to "+ redirectUrl);				
+			else
 				Logger.info("No active SSO session found. User is maybe logout already and get redirect to "+ redirectUrl);
-				
-			}
-			
-			//Remove SSO token
-			ssomanager.deleteSSOSessionID(req, resp);
-			
+		
 		} catch (Exception e) {
 			resp.sendError(HttpServletResponse.SC_FORBIDDEN, "Request not allowed.");
 			return;
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/interceptor/WebFrontEndSecurityInterceptor.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/interceptor/WebFrontEndSecurityInterceptor.java
index 979b8f4e4..ee69b082b 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/interceptor/WebFrontEndSecurityInterceptor.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/interceptor/WebFrontEndSecurityInterceptor.java
@@ -33,7 +33,7 @@ import org.springframework.web.servlet.ModelAndView;
 import at.gv.egiz.eaaf.core.impl.utils.HTTPUtils;
 import at.gv.egovernment.moa.id.commons.MOAIDAuthConstants;
 import at.gv.egovernment.moa.id.commons.api.AuthConfiguration;
-import at.gv.egovernment.moa.id.util.MOAIDMessageProvider;
+import at.gv.egovernment.moa.id.commons.utils.MOAIDMessageProvider;
 import at.gv.egovernment.moa.logging.Logger;
 import at.gv.egovernment.moa.util.MiscUtil;