From 9c663045500f9796339f5d8dd8b9bab744cd7e8a Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Sun, 21 Apr 2013 09:24:01 +0200 Subject: [PATCH] added group for all authenticated users --- scm-core/src/main/java/sonia/scm/group/GroupNames.java | 7 +++++++ .../src/main/java/sonia/scm/security/ScmRealm.java | 9 ++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/scm-core/src/main/java/sonia/scm/group/GroupNames.java b/scm-core/src/main/java/sonia/scm/group/GroupNames.java index 867e575e64..4774903c2b 100644 --- a/scm-core/src/main/java/sonia/scm/group/GroupNames.java +++ b/scm-core/src/main/java/sonia/scm/group/GroupNames.java @@ -30,6 +30,7 @@ */ + package sonia.scm.group; //~--- non-JDK imports -------------------------------------------------------- @@ -53,6 +54,12 @@ import java.util.Iterator; public final class GroupNames implements Serializable, Iterable { + /** + * Group for all authenticated users + * @since 1.31 + */ + public static final String AUTHENTICATED = "_authenticated"; + /** Field description */ private static final long serialVersionUID = 8615685985213897947L; diff --git a/scm-webapp/src/main/java/sonia/scm/security/ScmRealm.java b/scm-webapp/src/main/java/sonia/scm/security/ScmRealm.java index 8863ffc926..2cfa12e64b 100644 --- a/scm-webapp/src/main/java/sonia/scm/security/ScmRealm.java +++ b/scm-webapp/src/main/java/sonia/scm/security/ScmRealm.java @@ -74,6 +74,7 @@ import sonia.scm.repository.PermissionType; import sonia.scm.repository.Repository; import sonia.scm.repository.RepositoryDAO; import sonia.scm.repository.RepositoryEvent; +import sonia.scm.repository.RepositoryManager; import sonia.scm.user.User; import sonia.scm.user.UserDAO; import sonia.scm.user.UserEvent; @@ -95,7 +96,6 @@ import java.util.Set; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import sonia.scm.repository.RepositoryManager; /** * @@ -134,6 +134,7 @@ public class ScmRealm extends AuthorizingRealm * @param repositoryDAO * @param userDAO * @param authenticator + * @param manager * @param requestProvider * @param responseProvider */ @@ -141,8 +142,7 @@ public class ScmRealm extends AuthorizingRealm public ScmRealm(ScmConfiguration configuration, CacheManager cacheManager, UserManager userManager, GroupManager groupManager, RepositoryDAO repositoryDAO, UserDAO userDAO, - AuthenticationManager authenticator, - RepositoryManager manager, + AuthenticationManager authenticator, RepositoryManager manager, Provider requestProvider, Provider responseProvider) { @@ -625,6 +625,9 @@ public class ScmRealm extends AuthorizingRealm { Set groupSet = Sets.newHashSet(); + // add group for all authenticated users + groupSet.add(GroupNames.AUTHENTICATED); + // load external groups Collection extGroups = ar.getGroups();