1 files changed, 55 insertions, 21 deletions

diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/ProtocolFinalizationController.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/ProtocolFinalizationController.java
index 17da63f5..4ff41836 100644
--- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/ProtocolFinalizationController.java
+++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/ProtocolFinalizationController.java
@@ -29,6 +29,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.util.SerializationUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
@@ -38,7 +39,9 @@ import at.gv.egiz.eaaf.core.api.IRequestStorage;
 import at.gv.egiz.eaaf.core.api.IStatusMessenger;
 import at.gv.egiz.eaaf.core.api.data.EaafConstants;
 import at.gv.egiz.eaaf.core.api.data.ExceptionContainer;
+import at.gv.egiz.eaaf.core.api.utils.IPendingRequestIdGenerationStrategy;
 import at.gv.egiz.eaaf.core.exceptions.EaafException;
+import at.gv.egiz.eaaf.core.impl.utils.TransactionIdUtils;
 
 /**
  * Protocol finialization end-point.
@@ -54,6 +57,7 @@ public class ProtocolFinalizationController extends AbstractController {
 
   @Autowired(required = true)
   IRequestStorage requestStorage;
+  @Autowired IPendingRequestIdGenerationStrategy requestIdValidationStragegy;
 
   /**
    * End-Point to handle errors.
@@ -67,35 +71,57 @@ public class ProtocolFinalizationController extends AbstractController {
   public void errorHandling(final HttpServletRequest req, final HttpServletResponse resp)
       throws EaafException, IOException {
     // receive an authentication error
-    final String errorid =
+    final String errorToken =
         StringEscapeUtils.escapeHtml4(req.getParameter(EaafConstants.PARAM_HTTP_ERROR_CODE));
-    if (errorid != null) {
+    if (errorToken != null) {
       IRequest pendingReq = null;
-      try {
+      try {       
+        String errorId = requestIdValidationStragegy.validateAndGetPendingRequestId(errorToken);                
+        log.debug("Searching exception with internal error-token: {}", errorId);
+        
         // load stored exception from database
-        final ExceptionContainer container =
-            transactionStorage.get(errorid, ExceptionContainer.class);
-        if (container != null) {
+        final byte[] containerSerialized =
+            transactionStorage.get(errorId, byte[].class);
+        if (containerSerialized != null) {
           // remove exception if it was found
-          transactionStorage.remove(errorid);
-
-          final Throwable throwable = container.getExceptionThrown();
-          pendingReq = container.getPendingRequest();
-
-          if (pendingReq != null) {
-            // build protocol-specific error message if possible
-            protAuthService.buildProtocolSpecificErrorResponse(throwable, req, resp, pendingReq);
-
-            // remove active user-session
-            transactionStorage.remove(pendingReq.getPendingRequestId());
-
-            return;
+          transactionStorage.remove(errorId);
+          log.trace("Find exception with internal error-token: {}", errorId);
+          
+          //final Object containerObj = EaafSerializationUtils.deserialize(containerSerialized, 
+          //    Arrays.asList(
+          //        ExceptionContainer.class.getName()
+          //        ));
+          final Object containerObj = SerializationUtils.deserialize(containerSerialized);
+          
+          if (containerObj instanceof ExceptionContainer) {
+            final ExceptionContainer container = (ExceptionContainer) containerObj;
+            final Throwable throwable = container.getExceptionThrown();
+            pendingReq = container.getPendingRequest();
+
+            if (pendingReq != null) {
+              //set MDC variables
+              TransactionIdUtils.setAllLoggingVariables(pendingReq);
+              
+              // build protocol-specific error message if possible
+              protAuthService.buildProtocolSpecificErrorResponse(throwable, req, resp, pendingReq);
+
+              // remove active user-session
+              transactionStorage.remove(pendingReq.getPendingRequestId());
+
+            } else {
+              protAuthService.handleErrorNoRedirect(throwable, req, resp, true);
+
+            }
 
           } else {
-            protAuthService.handleErrorNoRedirect(throwable, req, resp, true);
+            protAuthService.handleErrorNoRedirect(
+                new EaafException(IStatusMessenger.CODES_INTERNAL_ERROR_GENERIC, null),
+                req, resp, false);
 
           }
+
         } else {
+          log.info("Find no exception with internal error-token: {}", errorId);
           protAuthService.handleErrorNoRedirect(
               new EaafException(IStatusMessenger.CODES_INTERNAL_ERROR_AUTH_NOPENDIGREQID, null),
               req, resp, false);
@@ -114,6 +140,9 @@ public class ProtocolFinalizationController extends AbstractController {
               pendingReq.getUniqueTransactionIdentifier());
 
         }
+        
+        //remove all Logger variables
+        TransactionIdUtils.removeAllLoggingVariables();
 
       }
 
@@ -152,9 +181,14 @@ public class ProtocolFinalizationController extends AbstractController {
           req, resp, false);
 
     } else {
+      //set MDC variables
+      TransactionIdUtils.setAllLoggingVariables(pendingReq);
+      
+      //perform protocol finalization steps
       protAuthService.finalizeAuthentication(req, resp, pendingReq);
+                  
     }
-
+    
   }
 
 }