Merge pull request #5 from jenkinsci-cert/SECURITY-166

Fixes for SECURITY-166

core/src/main/java/hudson/model/User.java

@@ -106,11 +106,17 @@ import javax.annotation.Nonnull;
 @ExportedBean
 public class User extends AbstractModelObject implements AccessControlled, DescriptorByNameOwner, Saveable, Comparable<User>, ModelObjectWithContextMenu {
 
+    /**
+     * The username of the 'unknown' user used to avoid null user references.
+     */
+    private static final String UKNOWN_USERNAME = "unknown";
+
     /**
      * These usernames should not be used by real users logging into Jenkins. Therefore, we prevent
      * users with these names from being saved.
      */
-    public static final String[] ILLEGAL_PERSISTED_USERNAMES = new String[]{"anonymous", "system", "unknown"};
+    private static final String[] ILLEGAL_PERSISTED_USERNAMES = new String[]{ACL.ANONYMOUS_USERNAME,
+            ACL.SYSTEM_USERNAME, UKNOWN_USERNAME};
     private transient final String id;
 
     private volatile String fullName;
@@ -291,7 +297,7 @@ public class User extends AbstractModelObject implements AccessControlled, Descr
      * This is used to avoid null {@link User} instance.
      */
     public static @Nonnull User getUnknown() {
-        return get("unknown");
+        return get(UKNOWN_USERNAME);
     }
 
     /**

core/src/main/java/hudson/security/ACL.java

@@ -32,6 +32,8 @@ import org.acegisecurity.context.SecurityContextHolder;
 import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
 import org.acegisecurity.acls.sid.PrincipalSid;
 import org.acegisecurity.acls.sid.Sid;
+import org.kohsuke.accmod.Restricted;
+import org.kohsuke.accmod.restrictions.NoExternalUse;
 
 /**
  * Gate-keeper that controls access to Hudson's model objects.
@@ -92,23 +94,34 @@ public abstract class ACL {
         }
     };
 
+    /**
+     * The username for the anonymous user
+     */
+    @Restricted(NoExternalUse.class)
+    public static final String ANONYMOUS_USERNAME = "anonymous";
     /**
      * {@link Sid} that represents the anonymous unauthenticated users.
      * <p>
      * {@link HudsonFilter} sets this up, so this sid remains the same
      * regardless of the current {@link SecurityRealm} in use.
      */
-    public static final Sid ANONYMOUS = new PrincipalSid("anonymous");
+    public static final Sid ANONYMOUS = new PrincipalSid(ANONYMOUS_USERNAME);
 
     protected static final Sid[] AUTOMATIC_SIDS = new Sid[]{EVERYONE,ANONYMOUS};
 
+    /**
+     * The username for the system user
+     */
+    @Restricted(NoExternalUse.class)
+    public static final String SYSTEM_USERNAME = "SYSTEM";
+
     /**
      * {@link Sid} that represents the Hudson itself.
      * <p>
      * This is used when Hudson is performing computation for itself, instead
      * of acting on behalf of an user, such as doing builds.
      */
-    public static final Authentication SYSTEM = new UsernamePasswordAuthenticationToken("SYSTEM","SYSTEM");
+    public static final Authentication SYSTEM = new UsernamePasswordAuthenticationToken(SYSTEM_USERNAME,"SYSTEM");
 
     /**
      * Changes the {@link Authentication} associated with the current thread

test/src/test/java/hudson/security/HudsonPrivateSecurityRealm2Test.java

+/*
+ * The MIT License
+ *
+ * Copyright (c) 2015, CloudBees, Inc
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
 package hudson.security;
 
 import com.gargoylesoftware.htmlunit.html.HtmlPage;