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

added missing admin repository permission

Browse Source
This commit is contained in:
Sebastian Sdorra
2013-05-29 21:08:01 +02:00
parent c8d98fadb1
commit e69ddb06a4
1 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
scm-webapp/src/main/java/sonia/scm/security/AuthorizationCollector.java
View File

@@ -35,9 +35,8 @@ package sonia.scm.security;
import com.google.common.base.Preconditions; import com.google.common.base.Preconditions;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableList.Builder;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import com.google.common.collect.ImmutableSet.Builder;
import com.google.common.eventbus.Subscribe; import com.google.common.eventbus.Subscribe;
import com.google.inject.Inject; import com.google.inject.Inject;
import com.google.inject.Singleton; import com.google.inject.Singleton;
@@ -56,6 +55,7 @@ import org.slf4j.LoggerFactory;
import sonia.scm.cache.Cache; import sonia.scm.cache.Cache;
import sonia.scm.cache.CacheManager; import sonia.scm.cache.CacheManager;
import sonia.scm.group.GroupNames; import sonia.scm.group.GroupNames;
import sonia.scm.repository.PermissionType;
import sonia.scm.repository.Repository; import sonia.scm.repository.Repository;
import sonia.scm.repository.RepositoryDAO; import sonia.scm.repository.RepositoryDAO;
import sonia.scm.repository.RepositoryEvent; import sonia.scm.repository.RepositoryEvent;
@@ -372,6 +372,7 @@ public class AuthorizationCollector
GroupNames groups) GroupNames groups)
{ {
Set<String> roles; Set<String> roles;
Set<Permission> permissions;
if (user.isAdmin()) if (user.isAdmin())
{ {
@@ -381,19 +382,30 @@ public class AuthorizationCollector
} }
roles = ImmutableSet.of(Role.USER, Role.ADMIN); roles = ImmutableSet.of(Role.USER, Role.ADMIN);
//J-
Permission adminPermission = new RepositoryPermission(
RepositoryPermission.WILDCARD,
PermissionType.OWNER
);
//J+
permissions = ImmutableSet.of(adminPermission);
} }
else else
{ {
roles = ImmutableSet.of(Role.USER); roles = ImmutableSet.of(Role.USER);
Builder<Permission> builder = ImmutableSet.builder();
collectGlobalPermissions(builder, user, groups);
collectRepositoryPermissions(builder, user, groups);
permissions = builder.build();
} }
SimpleAuthorizationInfo info = new SimpleAuthorizationInfo(roles); SimpleAuthorizationInfo info = new SimpleAuthorizationInfo(roles);
Builder<Permission> permissions = ImmutableList.builder(); info.addObjectPermissions(permissions);
collectGlobalPermissions(permissions, user, groups);
collectRepositoryPermissions(permissions, user, groups);
info.addObjectPermissions(permissions.build());
return info; return info;
} }