opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.13'

Browse Source 
* stable-2.13:
  Filter Git LFS HTTP requests through auth filter

Change-Id: Ie30440231c4a14b3be4be575cb0b05f91811d57d
This commit is contained in:
David Pursehouse
2017-02-21 14:17:08 +09:00
parent 4049ba2a62 70642f1358
commit 3d24bb475b
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gerrit-httpd/src/main/java/com/google/gerrit/httpd/GitOverHttpModule.java
View File

@@ -15,6 +15,7 @@
package com.google.gerrit.httpd; package com.google.gerrit.httpd;
import static com.google.gerrit.extensions.client.AuthType.OAUTH; import static com.google.gerrit.extensions.client.AuthType.OAUTH;
import static com.google.gerrit.httpd.plugins.LfsPluginServlet.LFS_REST;
import com.google.gerrit.reviewdb.client.CoreDownloadSchemes; import com.google.gerrit.reviewdb.client.CoreDownloadSchemes;
import com.google.gerrit.server.config.AuthConfig; import com.google.gerrit.server.config.AuthConfig;
@@ -25,6 +26,9 @@ import javax.servlet.Filter;
/** Configures Git access over HTTP with authentication. */ /** Configures Git access over HTTP with authentication. */
public class GitOverHttpModule extends ServletModule { public class GitOverHttpModule extends ServletModule {
private static final String LFS_URL_REGEX =
"^(?:(?!/a/))" + LFS_REST;
private final AuthConfig authConfig; private final AuthConfig authConfig;
private final DownloadConfig downloadConfig; private final DownloadConfig downloadConfig;
@@ -55,6 +59,7 @@ public class GitOverHttpModule extends ServletModule {
serveRegex(git).with(GitOverHttpServlet.class); serveRegex(git).with(GitOverHttpServlet.class);
} }
filterRegex(LFS_URL_REGEX).through(authFilter);
filter("/a/*").through(authFilter); filter("/a/*").through(authFilter);
} }

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

@@ -53,7 +53,10 @@ public class LfsPluginServlet extends HttpServlet
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private static final Logger log = LoggerFactory.getLogger(LfsPluginServlet.class); private static final Logger log = LoggerFactory.getLogger(LfsPluginServlet.class);
public static final String URL_REGEX = "^(?:/a)?(?:/p/|/)(.+)(?:/info/lfs/objects/batch)$"; public static final String LFS_REST =
"(?:/p/|/)(.+)(?:/info/lfs/objects/batch)$";
public static final String URL_REGEX =
"^(?:/a)?" + LFS_REST;
private static final String CONTENTTYPE_VND_GIT_LFS_JSON = private static final String CONTENTTYPE_VND_GIT_LFS_JSON =
"application/vnd.git-lfs+json; charset=utf-8"; "application/vnd.git-lfs+json; charset=utf-8";