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

fix IllegalArgumentException with nested privileged actions

Browse Source
This commit is contained in:
Sebastian Sdorra
2012-12-17 15:54:16 +01:00
parent 739318699b
commit a299183ba1
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
scm-webapp/src/main/java/sonia/scm/web/security/DefaultAdministrationContext.java
View File

@@ -52,6 +52,7 @@ import org.slf4j.LoggerFactory;
import sonia.scm.SCMContext; import sonia.scm.SCMContext;
import sonia.scm.group.GroupNames; import sonia.scm.group.GroupNames;
import sonia.scm.security.Role;
import sonia.scm.security.ScmRealm; import sonia.scm.security.ScmRealm;
import sonia.scm.user.User; import sonia.scm.user.User;
import sonia.scm.util.AssertUtil; import sonia.scm.util.AssertUtil;
@@ -122,9 +123,19 @@ public class DefaultAdministrationContext implements AdministrationContext
AssertUtil.assertIsNotNull(action); AssertUtil.assertIsNotNull(action);
if (ThreadContext.getSecurityManager() != null) if (ThreadContext.getSecurityManager() != null)
{
Subject subject = SecurityUtils.getSubject();
if (subject.hasRole(Role.ADMIN))
{
logger.debug(
"user is already an admin, we need no system account session");
}
else
{ {
doRunAsInWebSessionContext(action); doRunAsInWebSessionContext(action);
} }
}
else else
{ {
doRunAsInNonWebSessionContext(action); doRunAsInNonWebSessionContext(action);