add first version of reversionslog implementation

3 files changed, 34 insertions, 3 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/AuthenticationManager.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/AuthenticationManager.java
index cbfdfc36b..d3e9b5120 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/AuthenticationManager.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/AuthenticationManager.java
@@ -61,10 +61,13 @@ import org.opensaml.xml.XMLObject;
 import org.opensaml.xml.security.SecurityException;
 import org.springframework.beans.factory.annotation.Autowired;
 
+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.builder.LoginFormBuilder;
 import at.gv.egovernment.moa.id.auth.builder.SendAssertionFormBuilder;
 import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
+import at.gv.egovernment.moa.id.auth.data.AuthenticationSessionExtensions;
 import at.gv.egovernment.moa.id.auth.exception.AuthenticationException;
 import at.gv.egovernment.moa.id.auth.exception.BuildException;
 import at.gv.egovernment.moa.id.auth.exception.MOAIDException;
@@ -148,7 +151,7 @@ public class AuthenticationManager implements MOAIDAuthConstants {
 						authSession.setAuthenticatedUsed(true);
 					
 						AuthenticationSessionStoreage.storeSession(authSession);
-						
+												
 						return true; // got authenticated
 					}
 				}
@@ -335,6 +338,10 @@ public class AuthenticationManager implements MOAIDAuthConstants {
 			
 			authSession.setAuthenticated(false);
 			//HTTPSessionUtils.setHTTPSessionString(session, MOA_SESSION, null); // remove moa session from HTTP Session
+
+			//log Session_Destroy to reversionslog
+			AuthenticationSessionExtensions sessionExtensions = AuthenticationSessionStoreage.getAuthenticationSessionExtensions(moaSessionID);
+			MOAReversionLogger.getInstance().logEvent(MOAIDEventConstants.SESSION_DESTROYED, sessionExtensions.getUniqueSessionId());
 			
 			AuthenticationSessionStoreage.destroySession(moaSessionID);
 			
@@ -351,13 +358,17 @@ public class AuthenticationManager implements MOAIDAuthConstants {
 			HttpServletResponse response, IRequest target)
 			throws ServletException, IOException, MOAIDException {
 		
-		Logger.info("Starting authentication ...");
+		Logger.info("Starting authentication ...");		
+		MOAReversionLogger.getInstance().logEvent(target.getOnlineApplicationConfiguration(), 
+				target, MOAIDEventConstants.AUTHPROCESS_START);
 		
 		if (MiscUtil.isEmpty(target.getRequestedIDP())) {
 			perfomLocalAuthentication(request, response, target);
 			
 		} else {
 			Logger.info("Use IDP " + target.getRequestedIDP() + " for authentication ...");
+			MOAReversionLogger.getInstance().logEvent(target.getOnlineApplicationConfiguration(), 
+					target, MOAIDEventConstants.AUTHPROCESS_INTERFEDERATION);
 			buildPVP21AuthenticationRequest(request, response, target);
 						
 		}		
@@ -370,7 +381,10 @@ public class AuthenticationManager implements MOAIDAuthConstants {
 			String form = SendAssertionFormBuilder.buildForm(target.requestedModule(), 
 					target.requestedAction(), target.getRequestID(), oaParam, 
 					AuthConfigurationProvider.getInstance().getPublicURLPrefix());
-						
+
+			MOAReversionLogger.getInstance().logEvent(target.getOnlineApplicationConfiguration(), 
+					target, MOAIDEventConstants.AUTHPROCESS_SSO_ASK_USER_START);
+			
 			response.setContentType("text/html;charset=UTF-8");
 			PrintWriter out = new PrintWriter(response.getOutputStream()); 
 			out.print(form);
@@ -592,6 +606,7 @@ public class AuthenticationManager implements MOAIDAuthConstants {
 				executionContext.put("useMandate", moasession.getUseMandate());
 				executionContext.put("bkuURL", moasession.getBkuURL());
 				executionContext.put(PARAM_SESSIONID, moasession.getSessionID());
+				executionContext.put("pendingRequestID", target.getRequestID());
 
 				// create process instance
 				String processDefinitionId = ModuleRegistration.getInstance().selectProcess(executionContext);
@@ -620,6 +635,9 @@ public class AuthenticationManager implements MOAIDAuthConstants {
 				processEngine.start(processInstanceId);
 			    
 			} else {
+				MOAReversionLogger.getInstance().logEvent(target.getOnlineApplicationConfiguration(), 
+						target, MOAIDEventConstants.AUTHPROCESS_BKUSELECTION_INIT);
+								
 				//load Parameters from OnlineApplicationConfiguration
 				OAAuthParameter oaParam = AuthConfigurationProvider.getInstance()
 						.getOnlineApplicationParameter(target.getOAURL());
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/IRequest.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/IRequest.java
index 7fe933695..8f3ed9fdd 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/IRequest.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/IRequest.java
@@ -27,6 +27,7 @@ import java.util.List;
 
 import org.opensaml.saml2.core.Attribute;
 
+import at.gv.egovernment.moa.id.config.auth.IOAAuthParameters;
 import at.gv.egovernment.moa.id.protocols.pvp2x.messages.MOAResponse;
 
 public interface IRequest {
@@ -45,6 +46,7 @@ public interface IRequest {
 	public String getRequestedIDP();
 	public MOAResponse getInterfederationResponse();
 	public List<Attribute> getRequestedAttributes();
+	public IOAAuthParameters getOnlineApplicationConfiguration();
 	
 	//public void setTarget();
 }
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/RequestImpl.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/RequestImpl.java
index 77256c897..26fb7bd29 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/RequestImpl.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/RequestImpl.java
@@ -27,6 +27,7 @@ import java.util.List;
 
 import org.opensaml.saml2.core.Attribute;
 
+import at.gv.egovernment.moa.id.config.auth.IOAAuthParameters;
 import at.gv.egovernment.moa.id.protocols.pvp2x.messages.MOAResponse;
 
 public abstract class RequestImpl implements IRequest, Serializable{
@@ -42,6 +43,7 @@ public abstract class RequestImpl implements IRequest, Serializable{
 	private String target = null;
 	private String requestID;
 	private String sessionIdentifier;
+	private IOAAuthParameters OAConfiguration = null;
 	
 	//MOA-ID interfederation
 	private String requestedIDP = null;
@@ -158,4 +160,13 @@ public abstract class RequestImpl implements IRequest, Serializable{
 		
 	}
 	
+	public IOAAuthParameters getOnlineApplicationConfiguration() {
+		return this.OAConfiguration;
+	
+	}
+	
+	public void setOnlineApplicationConfiguration(IOAAuthParameters oaConfig) {
+		this.OAConfiguration = oaConfig;
+		
+	}
 }