From 3b0482657acbad4dee4e0a68bd36d5e859cf9b95 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Thu, 30 Aug 2012 10:40:19 +0200 Subject: [PATCH] fix missing group permission check --- .../java/sonia/scm/repository/PermissionUtil.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/scm-core/src/main/java/sonia/scm/repository/PermissionUtil.java b/scm-core/src/main/java/sonia/scm/repository/PermissionUtil.java index caf964d907..c755ef6895 100644 --- a/scm-core/src/main/java/sonia/scm/repository/PermissionUtil.java +++ b/scm-core/src/main/java/sonia/scm/repository/PermissionUtil.java @@ -44,6 +44,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import sonia.scm.config.ScmConfiguration; +import sonia.scm.group.GroupNames; import sonia.scm.security.Role; import sonia.scm.security.ScmSecurityException; import sonia.scm.util.AssertUtil; @@ -51,7 +52,6 @@ import sonia.scm.web.security.WebSecurityContext; //~--- JDK imports ------------------------------------------------------------ -import java.util.Collection; import java.util.List; /** @@ -171,13 +171,11 @@ public class PermissionUtil if (permissions != null) { + GroupNames groupNames = + subject.getPrincipals().oneByType(GroupNames.class); - // TODO + result = hasPermission(permissions, username, groupNames, pt); - /* - * result = hasPermission(permissions, username, - * securityContext.getGroups(), pt); - */ } } } @@ -249,7 +247,7 @@ public class PermissionUtil * @return */ private static boolean hasPermission(List permissions, - String username, Collection groups, PermissionType pt) + String username, GroupNames groups, PermissionType pt) { boolean result = false;