Changeset 7216

Timestamp:

10/21/18 17:40:59 (6 years ago)

Author:

Leif-Jöran

Message:

Fixing x-aggregation-context dispatching/handover once and for all.

File:

• SRUAggregator/trunk/src/main/java/eu/clarin/sru/fcs/aggregator/app/ErrorHandler.java (modified) (8 diffs)

SRUAggregator/trunk/src/main/java/eu/clarin/sru/fcs/aggregator/app/ErrorHandler.java

@@ -6 +6 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletRequestWrapper;
+//import org.apache.commons.lang3.StringEscapeUtils;
 import org.eclipse.jetty.http.HttpMethod;
 import org.eclipse.jetty.server.Request;
@@ -12 +14 @@
 /**
  * @author edima
+ * @author ljo
  *
  * The Aggregator is a single web page application, and most of the URLs are
@@ -31 +34 @@
         public static final String PARAM_AGGREGATION_CONTEXT = "x-aggregation-context";
 
-        public static final String redirectRoute = "/index.html";
+        public static final String redirectRoute = "/";
 
 
@@ -38 +41 @@
                 // On 404 page we need to show index.html and let JS router do the work, otherwise show error page
                 if (response.getStatus() == HttpServletResponse.SC_NOT_FOUND) {
-                        forward(redirectRoute, baseRequest, response);
+                        forward(redirectRoute, baseRequest, request, response);
                 } else if (request.getMethod().equals("POST")
                                 && response.getStatus() == HttpServletResponse.SC_METHOD_NOT_ALLOWED) {
@@ -45 +48 @@
                                 String[] queryValues = request.getParameterValues(PARAM_QUERY);
                                 if (queryValues != null && queryValues.length > 0) {
-                                        baseRequest.getSession().setAttribute(PARAM_QUERY, queryValues[0]);
+                                        request.getSession().setAttribute(PARAM_QUERY, queryValues[0]);
                                 }
                         }
@@ -52 +55 @@
                                 String[] modeValues = request.getParameterValues(PARAM_MODE);
                                 if (modeValues != null && modeValues.length > 0) {
-                                        baseRequest.getSession().setAttribute(PARAM_MODE, modeValues[0]);
+                                        request.getSession().setAttribute(PARAM_MODE, modeValues[0]);
                                 }
                         }
@@ -59 +62 @@
                                 String[] contextValues = request.getParameterValues(PARAM_AGGREGATION_CONTEXT);
                                 if (contextValues != null && contextValues.length > 0) {
-                                        baseRequest.getSession().setAttribute(PARAM_AGGREGATION_CONTEXT, contextValues[0]);
+                                    request.getSession().setAttribute(PARAM_AGGREGATION_CONTEXT, contextValues[0]);
+                                    request.setAttribute(PARAM_AGGREGATION_CONTEXT, contextValues[0]);
+                                    request.setAttribute(PARAM_AGGREGATION_CONTEXT, contextValues[0]);
+                                        log.info("Error handler request.contextValues > 0: " + contextValues[0]);
                                 }
+                                
                         }
 
-                        baseRequest.setMethod(HttpMethod.GET, HttpMethod.GET.asString());
+                        HttpServletRequest getRequest = new HttpServletRequestWrapper(request) {
+                                @Override
+                                public String getMethod(){
+                                    return HttpMethod.GET.asString();
+                                }
+                            };
+            
+                        //baseRequest.setMethod(HttpMethod.GET, HttpMethod.GET.asString());
 
-                        forward(redirectRoute, baseRequest, response);
+                        forward(redirectRoute, baseRequest, getRequest, response);
                 } else {
                         super.handle(target, baseRequest, request, response);
@@ -71 +85 @@
         }
 
-        void forward(String target, Request request, HttpServletResponse response) throws IOException {
-                RequestDispatcher dispatcher = request.getRequestDispatcher(target);
+        void forward(final String target, final Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException {
+                StringBuilder params = new StringBuilder();
+                if (request.getSession().getAttribute(PARAM_AGGREGATION_CONTEXT) != null) {
+                    params.append("x-aggregation-context=" + request.getSession().getAttribute(PARAM_AGGREGATION_CONTEXT));
+                }
+                RequestDispatcher dispatcher = request.getServletContext().getNamedDispatcher("static");
+                request = new HttpServletRequestWrapper(request) {
+                    @Override
+                    public String getPathInfo(){
+                        return target;
+                    }
+                };
                 if (dispatcher != null) {
+                    request.setAttribute(dispatcher.FORWARD_QUERY_STRING, params.toString());
+                    request.getSession().setAttribute(dispatcher.FORWARD_QUERY_STRING, params.toString());
                         try {
+                                log.info("dispatching attribute check:" + request.getSession().getAttribute(PARAM_AGGREGATION_CONTEXT) + " " + request.getSession());
                                 response.reset();
                                 dispatcher.forward(request, response);
                         } catch (ServletException e) {
-                                super.handle(target, request, request, response);
+                                log.info("dispatching failed, attribute check:" + request.getSession().getAttribute(PARAM_AGGREGATION_CONTEXT));
+                                super.handle(target, baseRequest, request, response);
                         }
                 } else {
                         log.error("Can not find internal redirect route '" + target + "' while handling error. Will show system error page");
-                        super.handle(target, request, request, response);
+                        super.handle(target, baseRequest, request, response);
                 }
         }