opendev/gerrit
Code Issues Proposed changes

Accept HEAD in RestApiServlet

Browse Source 
HEAD should be treated like GET, but omit the content body.

Change-Id: I7f83829f4850e8717191ca3f1772af2792a0adee
This commit is contained in:
Shawn Pearce
2014-04-26 19:20:15 -07:00
parent aace15c95a
commit 08725c857b
1 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
gerrit-httpd/src/main/java/com/google/gerrit/httpd/restapi/RestApiServlet.java
View File

@@ -206,7 +206,7 @@ public class RestApiServlet extends HttpServlet {
RestResource rsrc = TopLevelResource.INSTANCE;
ViewData viewData = new ViewData(null, null);
if (path.isEmpty()) {
if ("GET".equals(req.getMethod())) {
if (isGetOrHead(req)) {
viewData = new ViewData(null, rc.list());
} else if (rc instanceof AcceptsPost && "POST".equals(req.getMethod())) {
@SuppressWarnings("unchecked")
@@ -247,7 +247,7 @@ public class RestApiServlet extends HttpServlet {
(RestCollection<RestResource, RestResource>) viewData.view;
if (path.isEmpty()) {
if ("GET".equals(req.getMethod())) {
if (isGetOrHead(req)) {
viewData = new ViewData(null, c.list());
} else if (c instanceof AcceptsPost && "POST".equals(req.getMethod())) {
@SuppressWarnings("unchecked")
@@ -363,7 +363,7 @@ public class RestApiServlet extends HttpServlet {
}
private static boolean notModified(HttpServletRequest req, RestResource rsrc) {
if (!"GET".equals(req.getMethod())) {
if (!isGetOrHead(req)) {
return false;
}
@@ -386,7 +386,7 @@ public class RestApiServlet extends HttpServlet {
private static <T> void configureCaching(HttpServletRequest req,
HttpServletResponse res, RestResource rsrc, CacheControl c) {
if ("GET".equals(req.getMethod())) {
if (isGetOrHead(req)) {
switch (c.getType()) {
case NONE:
default:
@@ -716,11 +716,13 @@ public class RestApiServlet extends HttpServlet {
res.setHeader("Content-Length", Long.toString(len));
}
OutputStream dst = res.getOutputStream();
try {
bin.writeTo(dst);
} finally {
dst.close();
if (!"HEAD".equals(req.getMethod())) {
OutputStream dst = res.getOutputStream();
try {
bin.writeTo(dst);
} finally {
dst.close();
}
}
} finally {
appResult.close();
@@ -787,6 +789,8 @@ public class RestApiServlet extends HttpServlet {
// is chosen, look for the projection based upon GET as the method as
// the client thinks it is a nested collection.
method = "GET";
} else if ("HEAD".equals(method)) {
method = "GET";
}
List<String> p = splitProjection(projection);
@@ -879,9 +883,12 @@ public class RestApiServlet extends HttpServlet {
user.setAccessPath(AccessPath.REST_API);
}
private static boolean isGetOrHead(HttpServletRequest req) {
return "GET".equals(req.getMethod()) || "HEAD".equals(req.getMethod());
}
private static boolean isStateChange(HttpServletRequest req) {
String method = req.getMethod();
return !("GET".equals(method) || "HEAD".equals(method));
return !isGetOrHead(req);
}
private void checkRequiresCapability(ViewData viewData) throws AuthException {
@@ -918,7 +925,7 @@ public class RestApiServlet extends HttpServlet {
static void replyText(@Nullable HttpServletRequest req,
HttpServletResponse res, String text) throws IOException {
if ((req == null || "GET".equals(req.getMethod())) && isMaybeHTML(text)) {
if ((req == null || isGetOrHead(req)) && isMaybeHTML(text)) {
replyJson(req, res, ImmutableMultimap.of("pp", "0"), new JsonPrimitive(text));
} else {
if (!text.endsWith("\n")) {