opendev/gerrit
Code Issues Proposed changes

Merge "Return meaningful message when LFS plugin is not configured"

Browse Source
This commit is contained in:
David Pursehouse
2016-08-19 01:08:49 +00:00
committed by Gerrit Code Review
parent 1f1fadc6a9 92884c387c
commit f15659d36f
1 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
gerrit-httpd/src/main/java/com/google/gerrit/httpd/plugins/LfsPluginServlet.java
View File

@@ -14,6 +14,7 @@
package com.google.gerrit.httpd.plugins; package com.google.gerrit.httpd.plugins;
import static java.nio.charset.StandardCharsets.UTF_8;
import static javax.servlet.http.HttpServletResponse.SC_NOT_IMPLEMENTED; import static javax.servlet.http.HttpServletResponse.SC_NOT_IMPLEMENTED;
import com.google.gerrit.extensions.registration.RegistrationHandle; import com.google.gerrit.extensions.registration.RegistrationHandle;
@@ -31,7 +32,10 @@ import org.eclipse.jgit.lib.Config;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import java.io.BufferedWriter;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStreamWriter;
import java.io.Writer;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReference;
@@ -56,6 +60,11 @@ public class LfsPluginServlet extends HttpServlet
public static final String URL_REGEX = public static final String URL_REGEX =
"^(?:/a)?(?:/p/|/)(.+)(?:/info/lfs/objects/batch)$"; "^(?:/a)?(?:/p/|/)(.+)(?:/info/lfs/objects/batch)$";
private static final String CONTENTTYPE_VND_GIT_LFS_JSON =
"application/vnd.git-lfs+json; charset=utf-8";
private static final String MESSAGE_LFS_NOT_CONFIGURED =
"{\"message\":\"No LFS plugin is configured to handle LFS requests.\"}";
private List<Plugin> pending = new ArrayList<>(); private List<Plugin> pending = new ArrayList<>();
private final String pluginName; private final String pluginName;
private final FilterChain chain; private final FilterChain chain;
@@ -79,8 +88,7 @@ public class LfsPluginServlet extends HttpServlet
protected void service(HttpServletRequest req, HttpServletResponse res) protected void service(HttpServletRequest req, HttpServletResponse res)
throws ServletException, IOException { throws ServletException, IOException {
if (filter.get() == null) { if (filter.get() == null) {
CacheHeaders.setNotCacheable(res); responseLfsNotConfigured(res);
res.sendError(SC_NOT_IMPLEMENTED);
return; return;
} }
filter.get().doFilter(req, res, chain); filter.get().doFilter(req, res, chain);
@@ -110,6 +118,17 @@ public class LfsPluginServlet extends HttpServlet
install(newPlugin); install(newPlugin);
} }
private void responseLfsNotConfigured(HttpServletResponse res)
throws IOException {
CacheHeaders.setNotCacheable(res);
res.setContentType(CONTENTTYPE_VND_GIT_LFS_JSON);
res.setStatus(SC_NOT_IMPLEMENTED);
Writer w = new BufferedWriter(
new OutputStreamWriter(res.getOutputStream(), UTF_8));
w.write(MESSAGE_LFS_NOT_CONFIGURED);
w.flush();
}
private void install(Plugin plugin) { private void install(Plugin plugin) {
if (!plugin.getName().equals(pluginName)) { if (!plugin.getName().equals(pluginName)) {
return; return;