From f29bb6d983f50305d0b0e5f6f7cdc789cee80b0e Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Tue, 2 Oct 2012 16:02:44 +0200 Subject: [PATCH] create global object for the anonymous user --- scm-core/src/main/java/sonia/scm/SCMContext.java | 9 +++++++++ .../sonia/scm/web/filter/BasicAuthenticationFilter.java | 3 +-- .../scm/api/rest/resources/AuthenticationResource.java | 5 +---- .../src/main/java/sonia/scm/filter/SecurityFilter.java | 3 +-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/scm-core/src/main/java/sonia/scm/SCMContext.java b/scm-core/src/main/java/sonia/scm/SCMContext.java index b376646de0..be14775fc3 100644 --- a/scm-core/src/main/java/sonia/scm/SCMContext.java +++ b/scm-core/src/main/java/sonia/scm/SCMContext.java @@ -35,6 +35,7 @@ package sonia.scm; //~--- non-JDK imports -------------------------------------------------------- +import sonia.scm.user.User; import sonia.scm.util.ServiceUtil; /** @@ -52,6 +53,14 @@ public class SCMContext /** Name of the anonymous user */ public static final String USER_ANONYMOUS = "anonymous"; + /** + * the anonymous user + * @since 1.21 + */ + public static final User ANONYMOUS = new User(USER_ANONYMOUS, + "SCM Anonymous", + "scm-anonymous@scm-manager.com"); + /** Singleton instance of {@link SCMContextProvider} */ private static volatile SCMContextProvider provider; diff --git a/scm-core/src/main/java/sonia/scm/web/filter/BasicAuthenticationFilter.java b/scm-core/src/main/java/sonia/scm/web/filter/BasicAuthenticationFilter.java index 2ac596b3ae..6e2f34c454 100644 --- a/scm-core/src/main/java/sonia/scm/web/filter/BasicAuthenticationFilter.java +++ b/scm-core/src/main/java/sonia/scm/web/filter/BasicAuthenticationFilter.java @@ -168,8 +168,7 @@ public class BasicAuthenticationFilter extends HttpFilter else if ((configuration != null) && configuration.isAnonymousAccessEnabled()) { - user = new User(SCMContext.USER_ANONYMOUS, "SCM Anonymous", - "scm-anonymous@scm-manager.com"); + user = SCMContext.ANONYMOUS; } diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/AuthenticationResource.java b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/AuthenticationResource.java index 75b8a562fa..b00cf19dd9 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/AuthenticationResource.java +++ b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/AuthenticationResource.java @@ -288,10 +288,7 @@ public class AuthenticationResource */ private ScmState createAnonymousState() { - User user = new User(SCMContext.USER_ANONYMOUS, "SCM Anonymous", - "scm-anonymous@scm-manager.com"); - - return createState(user, Collections.EMPTY_LIST); + return createState(SCMContext.ANONYMOUS, Collections.EMPTY_LIST); } /** diff --git a/scm-webapp/src/main/java/sonia/scm/filter/SecurityFilter.java b/scm-webapp/src/main/java/sonia/scm/filter/SecurityFilter.java index d9ef281c44..ea3deec0e0 100644 --- a/scm-webapp/src/main/java/sonia/scm/filter/SecurityFilter.java +++ b/scm-webapp/src/main/java/sonia/scm/filter/SecurityFilter.java @@ -164,8 +164,7 @@ public class SecurityFilter extends HttpFilter } else { - user = new User(SCMContext.USER_ANONYMOUS, "SCM Anonymous", - "scm-anonymous@scm-manager.com"); + user = SCMContext.ANONYMOUS; } return user;