Skip to content

Return 404 for non-existent routes #6186

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 24, 2018
Merged

Return 404 for non-existent routes #6186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions java/server/src/org/openqa/grid/web/servlet/DisplayHelpServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ protected void process(HttpServletRequest request, HttpServletResponse response)
if (in == null) {
response.sendError(HttpServletResponse.SC_NOT_FOUND);
} else {
response.setStatus(200);
response.setStatus(HttpServletResponse.SC_OK);
ByteStreams.copy(in, response.getOutputStream());
}
} else {
Expand All @@ -116,10 +116,14 @@ protected void process(HttpServletRequest request, HttpServletResponse response)
new BufferedReader(new InputStreamReader(in, "UTF-8")).lines().collect(Collectors.joining("\n"));
final String updatedTemplate =
htmlTemplate.replace(HELPER_SERVLET_TEMPLATE_CONFIG_JSON_VAR, json);
if (resource.equals("/")) {
response.setStatus(HttpServletResponse.SC_OK);
} else {
response.setStatus(HttpServletResponse.SC_NOT_FOUND);
}

response.setContentType("text/html");
response.setCharacterEncoding("UTF-8");
response.setStatus(200);
response.getOutputStream().print(updatedTemplate);
}
}
Expand Down
16 changes: 9 additions & 7 deletions java/server/test/org/openqa/grid/web/servlet/DisplayHelpServletTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,8 @@
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;

import org.hamcrest.CoreMatchers;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
import org.openqa.grid.web.servlet.console.ConsoleServlet;
import org.openqa.testing.FakeHttpServletResponse;
import org.seleniumhq.jetty9.server.handler.ContextHandler;
Expand Down Expand Up @@ -77,11 +74,16 @@ public void testGetHelpPageAsset() throws IOException, ServletException {
assertTrue(response.getBody().contains("#help-heading #logo"));
}

@Test(expected = UnsupportedOperationException.class)
@Test
public void testNoSuchAsset() throws IOException, ServletException {
// will result in a call to sendError ..
// FakeHttpServlet will then turn that into an UnsupportedOperationException
sendCommand("GET", "/assets/foo.bar");
FakeHttpServletResponse response = sendCommand("GET", "/assets/foo.bar");
assertEquals(HttpServletResponse.SC_NOT_FOUND, response.getStatus());
}

@Test
public void testAccessRoot() throws IOException, ServletException {
FakeHttpServletResponse response = sendCommand("GET", "/");
assertEquals(HttpServletResponse.SC_OK, response.getStatus());
}

}
2 changes: 1 addition & 1 deletion java/server/test/org/openqa/testing/FakeHttpServletResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ public void sendError(int i, String s) {
}

public void sendError(int i) {
throw new UnsupportedOperationException();
setStatus(i);
}

public void sendRedirect(String s) {
Expand Down