From 96a97e7eb2974f7bef3f93496b31ea47b3406b55 Mon Sep 17 00:00:00 2001 From: Jason Lowe Date: Wed, 24 May 2017 11:22:42 -0500 Subject: [PATCH] YARN-6615. AmIpFilter drops query parameters on redirect. Contributed by Wilfred Spiegelenburg (cherry picked from commit 8bf1949c0efed700781eb47cf18f9f88443ed506) --- .../hadoop/yarn/server/webproxy/amfilter/AmIpFilter.java | 6 ++++++ .../yarn/server/webproxy/amfilter/TestAmFilter.java | 8 ++++++++ 2 files changed, 14 insertions(+) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/amfilter/AmIpFilter.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/amfilter/AmIpFilter.java index fe6fc329b58..65791910246 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/amfilter/AmIpFilter.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/amfilter/AmIpFilter.java @@ -150,6 +150,12 @@ public class AmIpFilter implements Filter { insertPoint += PROXY_PATH.length(); redirect.insert(insertPoint, "/redirect"); } + // add the query parameters on the redirect if there were any + String queryString = httpReq.getQueryString(); + if (queryString != null && !queryString.isEmpty()) { + redirect.append("?"); + redirect.append(queryString); + } ProxyUtils.sendRedirect(httpReq, httpResp, redirect.toString()); } else { diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/test/java/org/apache/hadoop/yarn/server/webproxy/amfilter/TestAmFilter.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/test/java/org/apache/hadoop/yarn/server/webproxy/amfilter/TestAmFilter.java index 9dc0ce0f10d..b788f5d80f0 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/test/java/org/apache/hadoop/yarn/server/webproxy/amfilter/TestAmFilter.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/test/java/org/apache/hadoop/yarn/server/webproxy/amfilter/TestAmFilter.java @@ -176,6 +176,14 @@ public class TestAmFilter { redirect = response.getHeader(ProxyUtils.LOCATION); assertEquals("http://bogus/proxy/redirect/application_00_0", redirect); + // check for query parameters + Mockito.when(request.getRequestURI()).thenReturn("/proxy/application_00_0"); + Mockito.when(request.getQueryString()).thenReturn("id=0"); + testFilter.doFilter(request, response, chain); + assertEquals(HttpURLConnection.HTTP_MOVED_TEMP, response.status); + redirect = response.getHeader(ProxyUtils.LOCATION); + assertEquals("http://bogus/proxy/redirect/application_00_0?id=0", redirect); + // "127.0.0.1" contains in host list. Without cookie Mockito.when(request.getRemoteAddr()).thenReturn("127.0.0.1"); testFilter.doFilter(request, response, chain);