diff options
3 files changed, 4 insertions, 5 deletions
diff --git a/gerrit-common/src/main/java/com/google/gerrit/common/data/Permission.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/Permission.java index 5cb7787505..fd408887cf 100644 --- a/gerrit-common/src/main/java/com/google/gerrit/common/data/Permission.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/Permission.java @@ -80,9 +80,6 @@ public class Permission implements Comparable<Permission> { if (AccessSection.ALL.equals(ref)) { return !OWNER.equals(permissionName); } - if (AccessSection.REF_CONFIG.equals(ref)) { - return !PUSH.equals(permissionName); - } return true; } diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Daemon.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Daemon.java index c164d48483..a826c88b81 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Daemon.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Daemon.java @@ -356,6 +356,9 @@ public class Daemon extends SiteProgram { private Injector createWebInjector() { final List<Module> modules = new ArrayList<Module>(); + if (sshd) { + modules.add(new ProjectQoSFilter.Module()); + } modules.add(RequestContextFilter.module()); modules.add(AllRequestFilter.module()); modules.add(CacheBasedWebSession.module()); @@ -365,7 +368,6 @@ public class Daemon extends SiteProgram { modules.add(new HttpPluginModule()); if (sshd) { modules.add(sshInjector.getInstance(WebSshGlueModule.class)); - modules.add(new ProjectQoSFilter.Module()); } else { modules.add(new NoSshModule()); } diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/ProjectQoSFilter.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/ProjectQoSFilter.java index 2d6db635ee..8d320d4cd8 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/ProjectQoSFilter.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/ProjectQoSFilter.java @@ -71,7 +71,7 @@ public class ProjectQoSFilter implements Filter { private static final String CANCEL = ATT_SPACE + "/CANCEL"; private static final String FILTER_RE = - "^/p/(.*)/(git-upload-pack|git-receive-pack)$"; + "^/(.*)/(git-upload-pack|git-receive-pack)$"; private static final Pattern URI_PATTERN = Pattern.compile(FILTER_RE); public static class Module extends ServletModule { |