mirror of
https://github.com/scm-manager/scm-manager.git
synced 2025-11-12 08:25:44 +01:00
replace scm-manager 1.x security api with apache shiro and use PasswordService for stronger password hashes
This commit is contained in:
@@ -53,7 +53,6 @@ import org.slf4j.LoggerFactory;
|
||||
import sonia.scm.SCMContext;
|
||||
import sonia.scm.group.GroupNames;
|
||||
import sonia.scm.security.Role;
|
||||
import sonia.scm.security.ScmRealm;
|
||||
import sonia.scm.user.User;
|
||||
import sonia.scm.util.AssertUtil;
|
||||
|
||||
@@ -75,6 +74,9 @@ public class DefaultAdministrationContext implements AdministrationContext
|
||||
public static final String SYSTEM_ACCOUNT =
|
||||
"/sonia/scm/web/security/system-account.xml";
|
||||
|
||||
/** Field description */
|
||||
private static final String REALM = "AdminRealm";
|
||||
|
||||
/** the logger for DefaultAdministrationContext */
|
||||
private static final Logger logger =
|
||||
LoggerFactory.getLogger(DefaultAdministrationContext.class);
|
||||
@@ -169,9 +171,9 @@ public class DefaultAdministrationContext implements AdministrationContext
|
||||
{
|
||||
SimplePrincipalCollection collection = new SimplePrincipalCollection();
|
||||
|
||||
collection.add(adminUser.getId(), ScmRealm.NAME);
|
||||
collection.add(adminUser, ScmRealm.NAME);
|
||||
collection.add(new GroupNames(), ScmRealm.NAME);
|
||||
collection.add(adminUser.getId(), REALM);
|
||||
collection.add(adminUser, REALM);
|
||||
collection.add(new GroupNames(), REALM);
|
||||
|
||||
return collection;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user