Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-10 23:45:44 +01:00
Code Issues Packages Projects Releases Activity

fix bug with group permissions

Browse Source
This commit is contained in:
Sebastian Sdorra
2012-08-30 16:34:43 +02:00
parent 1749feaf63
commit 2a48dcf4d5
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scm-webapp/src/main/java/sonia/scm/security/ScmRealm.java
View File

@@ -96,10 +96,10 @@ public class ScmRealm extends AuthorizingRealm
{ {
/** Field description */ /** Field description */
private static final String CACHE_NAME = "sonia.cache.authorizing"; public static final String NAME = "scm";
/** Field description */ /** Field description */
private static final String NAME = "scm"; private static final String CACHE_NAME = "sonia.cache.authorizing";
/** Field description */ /** Field description */
private static final String SCM_CREDENTIALS = "SCM_CREDENTIALS"; private static final String SCM_CREDENTIALS = "SCM_CREDENTIALS";
@@ -460,7 +460,7 @@ public class ScmRealm extends AuthorizingRealm
* @return * @return
*/ */
private List<org.apache.shiro.authz.Permission> collectRepositoryPermissions( private List<org.apache.shiro.authz.Permission> collectRepositoryPermissions(
User user, Collection<String> groups) User user, GroupNames groups)
{ {
List<org.apache.shiro.authz.Permission> permissions = Lists.newArrayList(); List<org.apache.shiro.authz.Permission> permissions = Lists.newArrayList();
@@ -489,7 +489,7 @@ public class ScmRealm extends AuthorizingRealm
*/ */
private void collectRepositoryPermissions( private void collectRepositoryPermissions(
List<org.apache.shiro.authz.Permission> permissions, Repository repository, List<org.apache.shiro.authz.Permission> permissions, Repository repository,
User user, Collection<String> groups) User user, GroupNames groups)
{ {
List<Permission> repositoryPermissions = repository.getPermissions(); List<Permission> repositoryPermissions = repository.getPermissions();
@@ -582,7 +582,7 @@ public class ScmRealm extends AuthorizingRealm
} }
else else
{ {
permissions = collectRepositoryPermissions(user, roles); permissions = collectRepositoryPermissions(user, groups);
} }
SimpleAuthorizationInfo info = new SimpleAuthorizationInfo(roles); SimpleAuthorizationInfo info = new SimpleAuthorizationInfo(roles);