HDFS-15320. StringIndexOutOfBoundsException in HostRestrictingAuthorizationFilter (#1992)
Signed-off-by: Mingliang Liu <liuml07@apache.org>
This commit is contained in:
parent
ba66f3b454
commit
f40dacdc2e
@ -229,9 +229,14 @@ public void handleInteraction(HttpInteraction interaction)
|
|||||||
throws IOException, ServletException {
|
throws IOException, ServletException {
|
||||||
final String address = interaction.getRemoteAddr();
|
final String address = interaction.getRemoteAddr();
|
||||||
final String query = interaction.getQueryString();
|
final String query = interaction.getQueryString();
|
||||||
final String path =
|
final String uri = interaction.getRequestURI();
|
||||||
interaction.getRequestURI()
|
if (!uri.startsWith(WebHdfsFileSystem.PATH_PREFIX)) {
|
||||||
.substring(WebHdfsFileSystem.PATH_PREFIX.length());
|
LOG.trace("Rejecting interaction; wrong URI: {}", uri);
|
||||||
|
interaction.sendError(HttpServletResponse.SC_NOT_FOUND,
|
||||||
|
"The request URI must start with " + WebHdfsFileSystem.PATH_PREFIX);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
final String path = uri.substring(WebHdfsFileSystem.PATH_PREFIX.length());
|
||||||
String user = interaction.getRemoteUser();
|
String user = interaction.getRemoteUser();
|
||||||
|
|
||||||
LOG.trace("Got request user: {}, remoteIp: {}, query: {}, path: {}",
|
LOG.trace("Got request user: {}, remoteIp: {}, query: {}, path: {}",
|
||||||
|
@ -243,6 +243,31 @@ public void doFilter(ServletRequest servletRequest,
|
|||||||
filter.destroy();
|
filter.destroy();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Test acceptable behavior to malformed requests
|
||||||
|
* Case: the request URI does not start with "/webhdfs/v1"
|
||||||
|
*/
|
||||||
|
@Test
|
||||||
|
public void testInvalidURI() throws Exception {
|
||||||
|
HttpServletRequest request = Mockito.mock(HttpServletRequest.class);
|
||||||
|
Mockito.when(request.getMethod()).thenReturn("GET");
|
||||||
|
Mockito.when(request.getRequestURI()).thenReturn("/InvalidURI");
|
||||||
|
HttpServletResponse response = Mockito.mock(HttpServletResponse.class);
|
||||||
|
|
||||||
|
Filter filter = new HostRestrictingAuthorizationFilter();
|
||||||
|
HashMap<String, String> configs = new HashMap<String, String>() {};
|
||||||
|
configs.put(AuthenticationFilter.AUTH_TYPE, "simple");
|
||||||
|
FilterConfig fc = new DummyFilterConfig(configs);
|
||||||
|
|
||||||
|
filter.init(fc);
|
||||||
|
filter.doFilter(request, response,
|
||||||
|
(servletRequest, servletResponse) -> {});
|
||||||
|
Mockito.verify(response, Mockito.times(1))
|
||||||
|
.sendError(Mockito.eq(HttpServletResponse.SC_NOT_FOUND),
|
||||||
|
Mockito.anyString());
|
||||||
|
filter.destroy();
|
||||||
|
}
|
||||||
|
|
||||||
private static class DummyFilterConfig implements FilterConfig {
|
private static class DummyFilterConfig implements FilterConfig {
|
||||||
final Map<String, String> map;
|
final Map<String, String> map;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user