opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.10' into stable-2.11

Browse Source 
* stable-2.10:
  Fix NPE in GitWebServlet
  Update revision of the replication plugin

Change-Id: Ia34a94313f0b4500748a02e38b2b39c5c86afe55
This commit is contained in:
David Pursehouse 2015-04-15 18:07:56 +09:00
commit a853f7c148
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitWebServlet.java
View File

@ -360,15 +360,18 @@ class GitWebServlet extends HttpServlet {
}
final Map<String, String> params = getParameters(req);
if (deniedActions.contains(params.get("a"))) {
rsp.sendError(HttpServletResponse.SC_FORBIDDEN);
return;
}
String a = params.get("a");
if (a != null) {
if (deniedActions.contains(a)) {
rsp.sendError(HttpServletResponse.SC_FORBIDDEN);
return;
}
if (params.get("a").equals(PROJECT_LIST_ACTION)) {
rsp.sendRedirect(req.getContextPath() + "/#" + PageLinks.ADMIN_PROJECTS
+ "?filter=" + Url.encode(params.get("pf") + "/"));
return;
if (a.equals(PROJECT_LIST_ACTION)) {
rsp.sendRedirect(req.getContextPath() + "/#" + PageLinks.ADMIN_PROJECTS
+ "?filter=" + Url.encode(params.get("pf") + "/"));
return;
}
}
String name = params.get("p");