First untested part: Refactor authentication modules and process management to Spring

1 files changed, 30 insertions, 27 deletions

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 fe5cd1ac0..48292cee1 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
@@ -31,6 +31,8 @@ import javax.servlet.http.HttpServletResponse;
 import org.apache.velocity.VelocityContext;
 import org.opensaml.saml2.core.LogoutResponse;
 import org.opensaml.saml2.metadata.SingleLogoutService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
 
 import at.gv.egovernment.moa.id.auth.MOAIDAuthConstants;
 import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
@@ -43,8 +45,7 @@ import at.gv.egovernment.moa.id.moduls.SSOManager;
 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.AssertionStorage;
-import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage;
+import at.gv.egovernment.moa.id.storage.IAuthenticationSessionStoreage;
 import at.gv.egovernment.moa.id.util.HTTPUtils;
 import at.gv.egovernment.moa.id.util.MOAIDMessageProvider;
 import at.gv.egovernment.moa.id.util.Random;
@@ -56,10 +57,13 @@ import at.gv.egovernment.moa.util.URLEncoder;
  * @author tlenz
  *
  */
-public class IDPSingleLogOutServlet extends AuthServlet {
+@Controller
+public class IDPSingleLogOutServlet extends AbstractController {
 
-	private static final long serialVersionUID = -1301786072691577221L;
-		
+	@Autowired SSOManager ssoManager;
+	@Autowired AuthenticationManager authManager;
+	@Autowired IAuthenticationSessionStoreage authenicationStorage;
+	
 	protected void doGet(HttpServletRequest req, HttpServletResponse resp)
 			    throws ServletException, IOException {
 		Logger.debug("receive IDP SingleLogOut Request");
@@ -79,9 +83,8 @@ public class IDPSingleLogOutServlet extends AuthServlet {
 			return;
 			
 		}
-		
-		SSOManager ssomanager = SSOManager.getInstance();		
-		String ssoid = ssomanager.getSSOSessionID(req);
+			
+		String ssoid = ssoManager.getSSOSessionID(req);
 		
 		Object restartProcessObj = req.getParameter(MOAIDAuthConstants.PARAM_SLORESTART);
 		
@@ -91,9 +94,9 @@ public class IDPSingleLogOutServlet extends AuthServlet {
 		if (tokkenObj != null && tokkenObj instanceof String) {
 			tokken = (String) tokkenObj;
 			try {	
-				status = AssertionStorage.getInstance().get(tokken, String.class);
+				status = transactionStorage.get(tokken, String.class);
 				if (MiscUtil.isNotEmpty(status)) {
-					AssertionStorage.getInstance().remove(tokken);
+					transactionStorage.remove(tokken);
 					
 				}
 				VelocityContext context = new VelocityContext();
@@ -104,13 +107,13 @@ public class IDPSingleLogOutServlet extends AuthServlet {
 					context.put("errorMsg", 
 							MOAIDMessageProvider.getInstance().getMessage("slo.01", null));
 	                	
-				ssomanager.printSingleLogOutInfo(context, resp);				
+				ssoManager.printSingleLogOutInfo(context, resp);				
 					
 			} catch (MOAIDException e) {
-				handleErrorNoRedirect(e.getMessage(), e, req, resp);
+				handleErrorNoRedirect(e, req, resp);
 				
 			} catch (MOADatabaseException e) {
-				handleErrorNoRedirect(e.getMessage(), e, req, resp);
+				handleErrorNoRedirect(e, req, resp);
 				
 			}
 			
@@ -118,16 +121,14 @@ public class IDPSingleLogOutServlet extends AuthServlet {
 					
 		} else if (MiscUtil.isNotEmpty(ssoid)) {
 			try {
-				if (ssomanager.isValidSSOSession(ssoid, null)) {
+				if (ssoManager.isValidSSOSession(ssoid, null)) {
 				
-					AuthenticationManager authmanager = AuthenticationManager.getInstance();
-					String moaSessionID = AuthenticationSessionStoreage.getMOASessionSSOID(ssoid);
+					String moaSessionID = authenicationStorage.getMOASessionSSOID(ssoid);
 
 					if (MiscUtil.isNotEmpty(moaSessionID)) {					
-						AuthenticationSession authSession = AuthenticationSessionStoreage
-								.getSession(moaSessionID);
+						AuthenticationSession authSession = authenicationStorage.getSession(moaSessionID);
 						if(authSession != null) {
-							authmanager.performSingleLogOut(req, resp, authSession, authURL);
+							authManager.performSingleLogOut(req, resp, authSession, authURL);
 							return;
 							
 						}
@@ -147,7 +148,7 @@ public class IDPSingleLogOutServlet extends AuthServlet {
 			if (MiscUtil.isNotEmpty(restartProcess)) {
 				Logger.info("Restart Single LogOut process after timeout ... ");
 					try {						
-						SLOInformationContainer sloContainer = AssertionStorage.getInstance().get(restartProcess, SLOInformationContainer.class);
+						SLOInformationContainer sloContainer = transactionStorage.get(restartProcess, SLOInformationContainer.class);
 						if (sloContainer.hasFrontChannelOA())
 							sloContainer.putFailedOA("differntent OAs");
 							
@@ -171,13 +172,13 @@ public class IDPSingleLogOutServlet extends AuthServlet {
 					        else
 					        	statusCode  = MOAIDAuthConstants.SLOSTATUS_ERROR;
 
-							AssertionStorage.getInstance().put(artifact, statusCode);
-					        redirectURL = addURLParameter(redirectURL, MOAIDAuthConstants.PARAM_SLOSTATUS, artifact);
+							transactionStorage.put(artifact, statusCode);
+					        redirectURL = HTTPUtils.addURLParameter(redirectURL, MOAIDAuthConstants.PARAM_SLOSTATUS, artifact);
 					        
 						}								
-						//redirect to Redirect Servlet
-						String url = AuthConfigurationProviderFactory.getInstance().getPublicURLPrefix() + "/RedirectServlet";
-						url = addURLParameter(url, RedirectServlet.REDIRCT_PARAM_URL, URLEncoder.encode(redirectURL, "UTF-8"));
+						//redirect to Redirect Servlet						
+						String url = authURL + "/RedirectServlet";
+						url = HTTPUtils.addURLParameter(url, RedirectServlet.REDIRCT_PARAM_URL, URLEncoder.encode(redirectURL, "UTF-8"));
 						url = resp.encodeRedirectURL(url);
 					
 						resp.setContentType("text/html");
@@ -205,10 +206,11 @@ public class IDPSingleLogOutServlet extends AuthServlet {
 							MOAIDMessageProvider.getInstance().getMessage("slo.01", null));
 		                	
 					try {
-						ssomanager.printSingleLogOutInfo(context, resp);
+						ssoManager.printSingleLogOutInfo(context, resp);
 						
 					} catch (MOAIDException e) {
 						e.printStackTrace();
+						
 					}
 					return;
 			}			
@@ -218,10 +220,11 @@ public class IDPSingleLogOutServlet extends AuthServlet {
 		context.put("successMsg",
 				MOAIDMessageProvider.getInstance().getMessage("slo.02", null));
 		try {			
-			ssomanager.printSingleLogOutInfo(context, resp);
+			ssoManager.printSingleLogOutInfo(context, resp);
 						
 		} catch (MOAIDException e) {
 			e.printStackTrace();
+			
 		}
 					
 	}