From e7608f1b6aceacfe4adfee25811196fd51cd6073 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Sun, 26 May 2013 14:29:35 +0200
Subject: [PATCH] simplify collection of admin permissions

---
 .../scm/security/PermissionCollector.java     | 22 +++++++++++++++++--
 .../java/sonia/scm/security/ScmRealm.java     | 14 +-----------
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/scm-webapp/src/main/java/sonia/scm/security/PermissionCollector.java b/scm-webapp/src/main/java/sonia/scm/security/PermissionCollector.java
index dad5d91910..a226ab03d6 100644
--- a/scm-webapp/src/main/java/sonia/scm/security/PermissionCollector.java
+++ b/scm-webapp/src/main/java/sonia/scm/security/PermissionCollector.java
@@ -46,6 +46,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import sonia.scm.group.GroupNames;
+import sonia.scm.repository.PermissionType;
 import sonia.scm.repository.Repository;
 import sonia.scm.repository.RepositoryDAO;
 import sonia.scm.user.User;
@@ -103,8 +104,25 @@ public class PermissionCollector
   {
     Builder<Permission> builder = ImmutableList.builder();
 
-    collectRepositoryPermissions(builder, user, groups);
-    collectGlobalPermissions(builder, user, groups);
+    if (user.isActive())
+    {
+      if (user.isAdmin())
+      {
+        //J-
+        builder.add(
+          new RepositoryPermission(
+            RepositoryPermission.WILDCARD, 
+            PermissionType.OWNER
+          )
+        );
+        //J+
+      }
+      else
+      {
+        collectRepositoryPermissions(builder, user, groups);
+        collectGlobalPermissions(builder, user, groups);
+      }
+    }
 
     return builder.build();
   }
diff --git a/scm-webapp/src/main/java/sonia/scm/security/ScmRealm.java b/scm-webapp/src/main/java/sonia/scm/security/ScmRealm.java
index 382d56e99b..121ac7450e 100644
--- a/scm-webapp/src/main/java/sonia/scm/security/ScmRealm.java
+++ b/scm-webapp/src/main/java/sonia/scm/security/ScmRealm.java
@@ -36,7 +36,6 @@ package sonia.scm.security;
 //~--- non-JDK imports --------------------------------------------------------
 
 import com.google.common.base.Joiner;
-import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 import com.google.common.eventbus.Subscribe;
 import com.google.inject.Inject;
@@ -69,7 +68,6 @@ import sonia.scm.event.Subscriber;
 import sonia.scm.group.Group;
 import sonia.scm.group.GroupManager;
 import sonia.scm.group.GroupNames;
-import sonia.scm.repository.PermissionType;
 import sonia.scm.repository.RepositoryEvent;
 import sonia.scm.repository.RepositoryManager;
 import sonia.scm.user.User;
@@ -88,7 +86,6 @@ import sonia.scm.web.security.AuthenticationState;
 import java.io.IOException;
 
 import java.util.Collection;
-import java.util.List;
 import java.util.Set;
 
 import javax.servlet.http.HttpServletRequest;
@@ -535,8 +532,6 @@ public class ScmRealm extends AuthorizingRealm
     GroupNames groups)
   {
     Set<String> roles = Sets.newHashSet();
-    List<org.apache.shiro.authz.Permission> permissions;
-    List<String> globalPermissions = null;
 
     roles.add(Role.USER);
 
@@ -548,18 +543,11 @@ public class ScmRealm extends AuthorizingRealm
       }
 
       roles.add(Role.ADMIN);
-      permissions = Lists.newArrayList();
-      permissions.add(new RepositoryPermission(RepositoryPermission.WILDCARD,
-        PermissionType.OWNER));
-    }
-    else
-    {
-      permissions = collector.collect(user, groups);
     }
 
     SimpleAuthorizationInfo info = new SimpleAuthorizationInfo(roles);
 
-    info.addObjectPermissions(permissions);
+    info.addObjectPermissions(collector.collect(user, groups));
 
     return info;
   }