Skip to content

Commit

Permalink
Fixes #4577 IPAccessHandler in context (#4580)
Browse files Browse the repository at this point in the history 
* Fixes #4577 IPAccessHandler in context

Fixes and tests #4577 IPAccessHandler in context by using target instead of pathInfo for path matching.

Signed-off-by: Greg Wilkins <[email protected]>

* Tests #4577 IPAccessHandler target

Updates from review.

Signed-off-by: Greg Wilkins <[email protected]>

* Issue #4577 IpAccessHandler NPE

Match on full URI path rather than target.

Signed-off-by: Greg Wilkins <[email protected]>
  • Loading branch information
@gregw
gregw authored Feb 25, 2020
1 parent 03359ec commit 9bb6840
Show file tree
Hide file tree
Showing 2 changed files with 72 additions and 20 deletions.
7 changes: 4 additions & 3 deletions jetty-server/src/main/java/org/eclipse/jetty/server/handler/IPAccessHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,9 @@
* internet address. Both of these features have been deprecated in the current version.
*
* @see InetAccessHandler
* @deprecated
* @deprecated Use @{@link InetAccessHandler}.
*/
@Deprecated
public class IPAccessHandler extends HandlerWrapper
{
private static final Logger LOG = Log.getLogger(IPAccessHandler.class);
Expand Down Expand Up @@ -201,7 +202,7 @@ public void handle(String target, Request baseRequest, HttpServletRequest reques
if (endp != null)
{
InetSocketAddress address = endp.getRemoteAddress();
if (address != null && !isAddrUriAllowed(address.getHostString(), baseRequest.getPathInfo()))
if (address != null && !isAddrUriAllowed(address.getHostString(), baseRequest.getMetaData().getURI().getDecodedPath()))
{
response.sendError(HttpStatus.FORBIDDEN_403);
baseRequest.setHandled(true);
Expand Down Expand Up @@ -283,7 +284,7 @@ protected void set(String[] entries, PathMap<IPAddressMap<Boolean>> patternMap)
* Check if specified request is allowed by current IPAccess rules.
*
* @param addr internet address
* @param path context path
* @param path request URI path
* @return true if request is allowed
*/
protected boolean isAddrUriAllowed(String addr, String path)
Expand Down
85 changes: 68 additions & 17 deletions jetty-server/src/test/java/org/eclipse/jetty/server/handler/IPAccessHandlerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,9 @@
import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assumptions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
Expand All @@ -53,34 +54,48 @@

public class IPAccessHandlerTest
{
private static Server _server;
private static NetworkConnector _connector;
private static IPAccessHandler _handler;
private Server _server;
private NetworkConnector _connector;
private IPAccessHandler _handler;

@BeforeAll
public static void setUp()
@BeforeEach
public void setUp()
throws Exception
{
_server = new Server();
_connector = new ServerConnector(_server);
_server.setConnectors(new Connector[]{_connector});

_handler = new IPAccessHandler();
_handler.setHandler(new AbstractHandler()
_handler.setHandler(new ScopedHandler()
{
@Override
public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
public void doScope(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
{
try
{
baseRequest.setServletPath(baseRequest.getPathInfo());
baseRequest.setPathInfo(null);
super.doScope(target, baseRequest, request, response);
}
finally
{
baseRequest.setPathInfo(baseRequest.getServletPath());
baseRequest.setServletPath(null);
}
}

@Override
public void doHandle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
{
baseRequest.setHandled(true);
response.setStatus(HttpStatus.OK_200);
}
});
_server.setHandler(_handler);
_server.start();
}

@AfterAll
public static void tearDown()
@AfterEach
public void tearDown()
throws Exception
{
_server.stop();
Expand All @@ -91,16 +106,18 @@ public static void tearDown()
public void testHandler(String white, String black, String host, String uri, String code, boolean byPath)
throws Exception
{
_server.setHandler(_handler);
_server.start();

_handler.setWhite(white.split(";", -1));
_handler.setBlack(black.split(";", -1));
_handler.setWhiteListByPath(byPath);

String request = "GET " + uri + " HTTP/1.1\n" + "Host: " + host + "\n\n";
Socket socket = new Socket("127.0.0.1", _connector.getLocalPort());
socket.setSoTimeout(5000);
try
try (OutputStream output = socket.getOutputStream();)
{
OutputStream output = socket.getOutputStream();
BufferedReader input = new BufferedReader(new InputStreamReader(socket.getInputStream()));

output.write(request.getBytes(StandardCharsets.UTF_8));
Expand All @@ -113,9 +130,43 @@ public void testHandler(String white, String black, String host, String uri, Str
};
assertEquals(code, response.getCode(), Arrays.deepToString(params));
}
finally
}

@ParameterizedTest
@MethodSource("data")
public void testContext(String white, String black, String host, String uri, String code, boolean byPath)
throws Exception
{
ContextHandler context = new ContextHandler(_server, "/ctx");
context.setHandler(_handler);
_server.setHandler(context);
_server.start();

white = white.replaceAll("\\|/", "|/ctx/");
black = black.replaceAll("\\|/", "|/ctx/");

Assumptions.assumeFalse(white.endsWith("|"));
Assumptions.assumeFalse(black.endsWith("|"));
_handler.setWhite(white.split(";", -1));
_handler.setBlack(black.split(";", -1));
_handler.setWhiteListByPath(byPath);

String request = "GET /ctx" + uri + " HTTP/1.1\n" + "Host: " + host + "\n\n";
Socket socket = new Socket("127.0.0.1", _connector.getLocalPort());
socket.setSoTimeout(5000);
try (OutputStream output = socket.getOutputStream();)
{
socket.close();
BufferedReader input = new BufferedReader(new InputStreamReader(socket.getInputStream()));

output.write(request.getBytes(StandardCharsets.UTF_8));
output.flush();

Response response = readResponse(input);
Object[] params = new Object[]{
"Request WBHUC", white, black, host, uri, code,
"Response", response.getCode()
};
assertEquals(code, response.getCode(), Arrays.deepToString(params));
}
}

Expand Down

0 comments on commit 9bb6840

Please sign in to comment.