commit 1bb1875fb2bd68fd503b07dc8c9faffd6979f51a
author Paladox none <thomasmulhall410@yahoo.com> Sat Oct 21 12:30:31 2017 +0000
committer Paladox none <thomasmulhall410@yahoo.com> Mon Nov 06 10:52:20 2017 +0000
tree 0580cd92ccae518d987343e4a02aa85d3d18c55c
parent 1e519065b5c86c4d7061f374ece9e3f110fc4c89

Replace canAdministrateServer test with PermissionBackend

Change-Id: I06fc64fd54116353cfc0c7e6dbe5af8619ed9f46

src/main/java/com/googlesource/gerrit/plugins/serverconfig/HideFromNonAdmins.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/serverconfig/HideFromNonAdmins.java b/src/main/java/com/googlesource/gerrit/plugins/serverconfig/HideFromNonAdmins.java
index acc4303..269d68f 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/serverconfig/HideFromNonAdmins.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/serverconfig/HideFromNonAdmins.java
@@ -14,7 +14,11 @@
 
 package com.googlesource.gerrit.plugins.serverconfig;
 
+import com.google.gerrit.extensions.restapi.AuthException;
 import com.google.gerrit.server.CurrentUser;
+import com.google.gerrit.server.permissions.GlobalPermission;
+import com.google.gerrit.server.permissions.PermissionBackend;
+import com.google.gerrit.server.permissions.PermissionBackendException;
 import com.google.inject.Inject;
 import com.google.inject.Provider;
 import com.google.inject.Singleton;
@@ -35,17 +39,21 @@
 @Singleton
 public class HideFromNonAdmins implements Filter {
 
-  private Provider<CurrentUser> user;
+  private final Provider<CurrentUser> user;
+  private final PermissionBackend permissionBackend;
 
   @Inject
-  public HideFromNonAdmins(Provider<CurrentUser> user) {
+  public HideFromNonAdmins(Provider<CurrentUser> user, PermissionBackend permissionBackend) {
     this.user = user;
+    this.permissionBackend = permissionBackend;
   }
 
   @Override
   public void doFilter(ServletRequest req, ServletResponse rsp,
       FilterChain chain) throws IOException, ServletException {
-    if (!user.get().getCapabilities().canAdministrateServer()) {
+    try {
+      permissionBackend.user(user).check(GlobalPermission.ADMINISTRATE_SERVER);
+    } catch (AuthException | PermissionBackendException e) {
       ((HttpServletResponse) rsp).sendError(HttpServletResponse.SC_NOT_FOUND,
           "Not Found");
       return;