[JENKINS-22469] Do not perform authentication when readResolve is cal…

…led on startup.
jenkinsci · Apr 5, 2014 · ac6f88b · ac6f88b
1 parent 6451b35
commit ac6f88b
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/...a/org/jenkinsci/plugins/authorizeproject/strategy/SpecificUsersAuthorizationStrategy.java b/...a/org/jenkinsci/plugins/authorizeproject/strategy/SpecificUsersAuthorizationStrategy.java
@@ -38,8 +38,8 @@
 import hudson.model.AbstractProject;
 import hudson.model.Descriptor;
 import hudson.model.Descriptor.FormException;
+import hudson.security.ACL;
 import hudson.util.FormValidation;
-
 import net.sf.json.JSONObject;
 
 import org.acegisecurity.Authentication;
@@ -191,11 +191,15 @@ protected static SpecificUsersAuthorizationStrategy getCurrentStrategy(AbstractP
      * @throws IOException authentication failed.
      */
     private Object readResolve() throws IOException {
-        // There's no way to retrieve current strategy.
-        if (isAuthenticateionRequired(this, null)) {
-            // As REST/CLI interface saves configuration after successfully load object from the XML,
-            // this prevents the new configuration saved.
-            throw new IOException(Messages.SpecificUsersAuthorizationStrategy_userid_readResolve());
+        if (!ACL.SYSTEM.equals(Jenkins.getAuthentication())) {
+            // This is called via REST/CLI.
+
+            // There's no way to retrieve current strategy.
+            if (isAuthenticateionRequired(this, null)) {
+                // As REST/CLI interface saves configuration after successfully load object from the XML,
+                // this prevents the new configuration saved.
+                throw new IOException(Messages.SpecificUsersAuthorizationStrategy_userid_readResolve());
+            }
         }
         return this;
     }