1 files changed, 37 insertions, 21 deletions

diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/AbstractController.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/AbstractController.java
index fc62af45..b05d8df0 100644
--- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/AbstractController.java
+++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/AbstractController.java
@@ -26,11 +26,11 @@ import javax.annotation.Nullable;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.commons.text.StringEscapeUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
+import org.springframework.util.SerializationUtils;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 
 import at.gv.egiz.components.eventlog.api.EventConstants;
@@ -42,12 +42,12 @@ import at.gv.egiz.eaaf.core.api.idp.IConfigurationWithSP;
 import at.gv.egiz.eaaf.core.api.idp.auth.services.IProtocolAuthenticationService;
 import at.gv.egiz.eaaf.core.api.logging.IRevisionLogger;
 import at.gv.egiz.eaaf.core.api.storage.ITransactionStorage;
+import at.gv.egiz.eaaf.core.api.utils.IPendingRequestIdGenerationStrategy;
 import at.gv.egiz.eaaf.core.exceptions.EaafException;
 import at.gv.egiz.eaaf.core.exceptions.PendingReqIdValidationException;
 import at.gv.egiz.eaaf.core.exceptions.ProcessExecutionException;
 import at.gv.egiz.eaaf.core.exceptions.TaskExecutionException;
 import at.gv.egiz.eaaf.core.impl.data.Pair;
-import at.gv.egiz.eaaf.core.impl.utils.Random;
 
 /**
  * Basic application controller that implements core error-handling.
@@ -69,10 +69,13 @@ public abstract class AbstractController {
   protected ITransactionStorage transactionStorage;
   @Autowired(required = true)
   protected IStatusMessenger statusMessager;
-  
+
   @Autowired
   protected IRevisionLogger revisionsLogger;
 
+  @Autowired
+  protected IPendingRequestIdGenerationStrategy reqIdGenerationStrategy;
+  
   /**
    * EAAF framework exception handler.
    *
@@ -92,11 +95,11 @@ public abstract class AbstractController {
       protAuthService.handleErrorNoRedirect(e, req, resp, true);
 
     } catch (final EaafException e1) {
+      log.warn("ErrorHandling failed with error: ", e.getMessage(), e);
       log.warn("Can NOT handle an 'EAAFException'. Forwarding to generic error ... ", e);
       ioExceptionHandler(resp, e);
 
     }
-
   }
 
   /**
@@ -106,20 +109,23 @@ public abstract class AbstractController {
    * This handler wrote an internal server error into http response
    * </p>
    *
-   * @param resp      http response
-   * @param exception exception
+   * @param req  http request
+   * @param resp http response
+   * @param e Catched exception
    * @throws IOException In case of an internal error.
    */
   @ExceptionHandler({ Exception.class })
-  public void genericExceptionHandler(final HttpServletResponse resp, final Exception exception)
-      throws IOException {
-    log.error("Internel Server Error.", exception);
-    resp.setContentType(EaafConstants.CONTENTTYPE_HTML_UTF8);
-    resp.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "Internal Server Error!"
-        + "(Errorcode=9199" + " | Description="
-        + StringEscapeUtils.escapeHtml4(StringEscapeUtils.escapeEcmaScript(exception.getMessage()))
-        + ")");
+  public void genericExceptionHandler(final HttpServletRequest req, final HttpServletResponse resp, 
+      final Exception e) throws IOException {
+    try {
+      protAuthService.handleErrorNoRedirect(e, req, resp, true);
+
+    } catch (final EaafException e1) {
+      log.warn("ErrorHandling failed with error: ", e.getMessage(), e);
+      log.error("Can NOT handle a generic 'Exception'. Forwarding to generic error ... ", e);
+      ioExceptionHandler(resp, e);
 
+    }    
   }
 
   /**
@@ -150,8 +156,6 @@ public abstract class AbstractController {
     try {
       final String errorKey = storeErrorAndGetErrorToken(errorToHandle);
       protAuthService.forwardToErrorHandler(errorToHandle, errorKey, req, resp);
-      
-      return;
 
     } catch (final Exception e) {
       log.warn("Default error-handling FAILED. Exception can not be stored ....", e);
@@ -169,18 +173,30 @@ public abstract class AbstractController {
     }
 
     // put exception into transaction store for redirect
-    final String errorKey = Random.nextLongRandom();
+    final String errorToken = reqIdGenerationStrategy.generateExternalPendingRequestId();    
+    final String errorKey = reqIdGenerationStrategy.getPendingRequestIdWithOutChecks(errorToken);
+            
     if (errorToHandle.getFirst() != null) {
       revisionsLogger.logEvent(errorToHandle.getFirst(), EventConstants.TRANSACTION_ERROR);
-      transactionStorage.put(errorKey, new ExceptionContainer(errorToHandle.getFirst(), errorToHandle
-          .getSecond()), -1);
+
+      log.trace("Serializing {} ... ", ExceptionContainer.class.getName());
+      final byte[] serializedError = SerializationUtils.serialize(
+          new ExceptionContainer(errorToHandle.getFirst(), errorToHandle.getSecond()));
+
+      log.debug("Put 'ExceptionContainer' into cache with id: {}... ", errorKey);
+      transactionStorage.put(errorKey, serializedError, -1);
 
     } else {
-      transactionStorage.put(errorKey, new ExceptionContainer(null, errorToHandle.getSecond()), -1);
+      log.trace("Serializing {} ... ", ExceptionContainer.class.getName());
+      final byte[] serializedError = SerializationUtils.serialize(
+          new ExceptionContainer(null, errorToHandle.getSecond()));
+
+      log.trace("Put 'ExceptionContainer' into cache with id: {}... ",errorKey);
+      transactionStorage.put(errorKey, serializedError, -1);
 
     }
 
-    return errorKey;
+    return errorToken;
 
   }