big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

YARN-6615. AmIpFilter drops query parameters on redirect. Contributed by Wilfred Spiegelenburg

Browse Source
This commit is contained in:
Jason Lowe 2017-05-24 11:22:42 -05:00
parent a62be38a5e
commit 8bf1949c0e
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
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
View File

@ -150,6 +150,12 @@ public void doFilter(ServletRequest req, ServletResponse resp,
insertPoint += PROXY_PATH.length(); insertPoint += PROXY_PATH.length();
redirect.insert(insertPoint, "/redirect"); 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()); ProxyUtils.sendRedirect(httpReq, httpResp, redirect.toString());
} else { } else {

8
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
View File

@ -176,6 +176,14 @@ public void doFilter(ServletRequest servletRequest,
redirect = response.getHeader(ProxyUtils.LOCATION); redirect = response.getHeader(ProxyUtils.LOCATION);
assertEquals("http://bogus/proxy/redirect/application_00_0", redirect); 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 // "127.0.0.1" contains in host list. Without cookie
Mockito.when(request.getRemoteAddr()).thenReturn("127.0.0.1"); Mockito.when(request.getRemoteAddr()).thenReturn("127.0.0.1");
testFilter.doFilter(request, response, chain); testFilter.doFilter(request, response, chain);