add event codes

3 files changed, 17 insertions, 29 deletions

diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/gv/egiz/eidas/specific/modules/authmodule_eIDASv2/tasks/CreateIdentityLinkTask.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/gv/egiz/eidas/specific/modules/authmodule_eIDASv2/tasks/CreateIdentityLinkTask.java
index b31b6a21..8766783f 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/gv/egiz/eidas/specific/modules/authmodule_eIDASv2/tasks/CreateIdentityLinkTask.java
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/gv/egiz/eidas/specific/modules/authmodule_eIDASv2/tasks/CreateIdentityLinkTask.java
@@ -51,6 +51,7 @@ import at.gv.egiz.eaaf.core.impl.idp.auth.data.SimpleIdentityLinkAssertionParser
 import at.gv.egiz.eaaf.core.impl.idp.auth.modules.AbstractAuthServletTask;
 import at.gv.egiz.eaaf.core.impl.utils.DOMUtils;
 import at.gv.egiz.eaaf.core.impl.utils.XPathUtils;
+import at.gv.egiz.eidas.specific.connector.MSConnectorEventCodes;
 import at.gv.egiz.eidas.specific.modules.authmodule_eIDASv2.Constants;
 import at.gv.egiz.eidas.specific.modules.authmodule_eIDASv2.exception.SZRCommunicationException;
 import at.gv.egiz.eidas.specific.modules.authmodule_eIDASv2.exception.eIDASAttributeException;
@@ -230,16 +231,18 @@ public class CreateIdentityLinkTask extends AbstractAuthServletTask {
 				throw new SZRCommunicationException("ernb.00", null);
 				
 			}
+			revisionsLogger.logEvent(pendingReq, MSConnectorEventCodes.SZR_IDL_RECEIVED);
+			
 			
 			if (bPK == null) {
 				log.error("ERnB did not return a bPK for target: " + pendingReq.getServiceProviderConfiguration().getAreaSpecificTargetIdentifier());
 				throw new SZRCommunicationException("ernb.01", null);
 				
 			}
+			revisionsLogger.logEvent(pendingReq, MSConnectorEventCodes.SZR_BPK_RECEIVED);
 			
 			log.debug("ERnB communication was successfull");
-			
-			revisionsLogger.logEvent(pendingReq, -1);			
+					
 			authProcessData.setForeigner(true);
 			authProcessData.setIdentityLink(identityLink);
 			authProcessData.setGenericDataToSession(
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/gv/egiz/eidas/specific/modules/authmodule_eIDASv2/tasks/GenerateAuthnRequestTask.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/gv/egiz/eidas/specific/modules/authmodule_eIDASv2/tasks/GenerateAuthnRequestTask.java
index ee126d0c..d65ce72f 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/gv/egiz/eidas/specific/modules/authmodule_eIDASv2/tasks/GenerateAuthnRequestTask.java
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/gv/egiz/eidas/specific/modules/authmodule_eIDASv2/tasks/GenerateAuthnRequestTask.java
@@ -30,6 +30,7 @@ import at.gv.egiz.eaaf.core.api.storage.ITransactionStorage;
 import at.gv.egiz.eaaf.core.exceptions.EAAFConfigurationException;
 import at.gv.egiz.eaaf.core.exceptions.TaskExecutionException;
 import at.gv.egiz.eaaf.core.impl.idp.auth.modules.AbstractAuthServletTask;
+import at.gv.egiz.eidas.specific.connector.MSConnectorEventCodes;
 import at.gv.egiz.eidas.specific.connector.gui.StaticGuiBuilderConfiguration;
 import at.gv.egiz.eidas.specific.modules.authmodule_eIDASv2.Constants;
 import at.gv.egiz.eidas.specific.modules.authmodule_eIDASv2.exception.eIDASAuthenticationException;
@@ -80,12 +81,8 @@ public class GenerateAuthnRequestTask extends AbstractAuthServletTask {
 
 			//TODO: maybe add countryCode validation before request ref. impl. eIDAS node
 			log.debug("Request eIDAS auth. for citizen of country: " + citizenCountryCode);
-
-						
-			//TODO: switch to entityID and set new status codes
-			//revisionsLogger.logEvent(oaConfig, pendingReq, MOAIDEventConstants.AUTHPROCESS_PEPS_SELECTED, metadataUrl);
-			
-			
+			revisionsLogger.logEvent(pendingReq, MSConnectorEventCodes.COUNTRY_SELECTED, citizenCountryCode);
+									
 			//build eIDAS AuthnRequest			
 			LightRequest.Builder authnRequestBuilder = LightRequest.builder();			
 			authnRequestBuilder.id(UUID.randomUUID().toString());
@@ -211,7 +208,8 @@ public class GenerateAuthnRequestTask extends AbstractAuthServletTask {
 				guiBuilder.build(response, config, "BKU-Selection form");
 								
 			} 				
-				
+			
+			revisionsLogger.logEvent(pendingReq, MSConnectorEventCodes.EIDAS_NODE_CONNECTED, lightAuthnReq.getId());
 			
 					
 		} catch (eIDASAuthenticationException  e) {
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/gv/egiz/eidas/specific/modules/authmodule_eIDASv2/tasks/ReceiveAuthnResponseTask.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/gv/egiz/eidas/specific/modules/authmodule_eIDASv2/tasks/ReceiveAuthnResponseTask.java
index f0b37ede..16030c52 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/gv/egiz/eidas/specific/modules/authmodule_eIDASv2/tasks/ReceiveAuthnResponseTask.java
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/gv/egiz/eidas/specific/modules/authmodule_eIDASv2/tasks/ReceiveAuthnResponseTask.java
@@ -17,6 +17,7 @@ import at.gv.egiz.eaaf.core.exceptions.EAAFException;
 import at.gv.egiz.eaaf.core.exceptions.TaskExecutionException;
 import at.gv.egiz.eaaf.core.impl.idp.auth.data.AuthProcessDataWrapper;
 import at.gv.egiz.eaaf.core.impl.idp.auth.modules.AbstractAuthServletTask;
+import at.gv.egiz.eidas.specific.connector.MSConnectorEventCodes;
 import at.gv.egiz.eidas.specific.modules.authmodule_eIDASv2.Constants;
 import at.gv.egiz.eidas.specific.modules.authmodule_eIDASv2.exception.eIDASAuthenticationException;
 import at.gv.egiz.eidas.specific.modules.authmodule_eIDASv2.service.eIDASAttributeRegistry;
@@ -33,23 +34,7 @@ public class ReceiveAuthnResponseTask extends AbstractAuthServletTask {
 		
 	@Override 
 	public void execute(ExecutionContext executionContext, HttpServletRequest request, HttpServletResponse response) throws TaskExecutionException {
-		try{
-			
-//			//get token from Request
-//			final String tokenBase64 = request.getParameter(EidasParameterKeys.TOKEN.toString());			
-//			if (StringUtils.isEmpty(tokenBase64)) {
-//				log.warn("NO eIDAS message token found.");
-//				throw new eIDASAuthenticationException("TODO", null, 
-//						"NO eIDAS message token found.");
-//				
-//			}
-//			
-//			//get eIDAS response from cache
-//			final SpecificConnectorCommunicationServiceImpl specificConnectorCommunicationService =
-//		                (SpecificConnectorCommunicationServiceImpl) context.getBean(SpecificCommunicationDefinitionBeanNames.SPECIFIC_CONNECTOR_COMMUNICATION_SERVICE.toString());
-//	    	ILightResponse eIDASResponse = specificConnectorCommunicationService.getAndRemoveResponse(tokenBase64, 
-//	    			ImmutableSortedSet.copyOf(attrRegistry.getCoreAttributeRegistry().getAttributes()));
-		    
+		try{					    
 			ILightResponse eIDASResponse = (ILightResponse) request.getAttribute(Constants.DATA_FULL_EIDAS_RESPONSE);
 			if (eIDASResponse == null) {
 				log.warn("NO eIDAS response-message found.");
@@ -58,7 +43,8 @@ public class ReceiveAuthnResponseTask extends AbstractAuthServletTask {
 			}
 			
 	    	log.debug("Receive eIDAS response with RespId:" + eIDASResponse.getId() + " for ReqId:" + eIDASResponse.getInResponseToId());
-			
+			revisionsLogger.logEvent(pendingReq, MSConnectorEventCodes.RESPONSE_FROM_EIDAS_NODE, eIDASResponse.getId());
+	    	
 	    	
 			//check response StatusCode 
 			if (!eIDASResponse.getStatus().getStatusCode().equals(Constants.SUCCESS_URI)) {
@@ -92,14 +78,15 @@ public class ReceiveAuthnResponseTask extends AbstractAuthServletTask {
 			//store MOA-session to database
 			requestStoreage.storePendingRequest(pendingReq);
 			
-			revisionsLogger.logEvent(pendingReq, -1, eIDASResponse.getId());
+			revisionsLogger.logEvent(pendingReq, MSConnectorEventCodes.RESPONSE_FROM_EIDAS_NODE_VALID);
 		
 		} catch (EAAFException e) {
+			revisionsLogger.logEvent(pendingReq, MSConnectorEventCodes.RESPONSE_FROM_EIDAS_NODE_NOT_VALID);
 			throw new TaskExecutionException(pendingReq, "eIDAS Response processing FAILED.", e);
 					
 		} catch (Exception e) {
 			log.warn("eIDAS Response processing FAILED.", e);
-			revisionsLogger.logEvent(pendingReq, -1);
+			revisionsLogger.logEvent(pendingReq, MSConnectorEventCodes.RESPONSE_FROM_EIDAS_NODE_NOT_VALID);
 			throw new TaskExecutionException(pendingReq, e.getMessage(), 
 					new eIDASAuthenticationException("eidas.05", new Object[]{e.getMessage()}, e));