Updated to FlowExecution.getAuthentication2 (#1002)

Author: jglick

plugin/pom.xml

@@ -62,6 +62,11 @@
                 <artifactId>support-core</artifactId>
                 <version>1575.v49b_01a_460e3b_</version>
             </dependency>
+            <dependency>
+                <groupId>org.jenkins-ci.plugins.workflow</groupId>
+                <artifactId>workflow-api</artifactId>
+                <version>1366.vf1fb_e1a_f6b_22</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
     <dependencies>

plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java

@@ -141,8 +141,6 @@
 import edu.umd.cs.findbugs.annotations.NonNull;
 import net.jcip.annotations.GuardedBy;
 
-import org.acegisecurity.Authentication;
-import org.acegisecurity.userdetails.UsernameNotFoundException;
 import java.nio.charset.StandardCharsets;
 import jenkins.util.SystemProperties;
 import org.codehaus.groovy.GroovyBugError;
@@ -154,6 +152,8 @@
 import org.jenkinsci.plugins.workflow.flow.FlowExecutionList;
 import org.jenkinsci.plugins.workflow.graph.FlowGraphWalker;
 import org.kohsuke.accmod.restrictions.DoNotUse;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
 
 /**
  * {@link FlowExecution} implemented with Groovy CPS.
@@ -421,8 +421,8 @@ public CpsFlowExecution(@NonNull String script, boolean sandbox, @NonNull  FlowE
         this.script = script;
         this.sandbox = sandbox;
         this.durabilityHint = durabilityHint;
-        Authentication auth = Jenkins.getAuthentication();
-        this.user = auth.equals(ACL.SYSTEM) ? null : auth.getName();
+        Authentication auth = Jenkins.getAuthentication2();
+        this.user = auth.equals(ACL.SYSTEM2) ? null : auth.getName();
         this.storage = createStorage();
         this.storage.setAvoidAtomicWrite(!this.getDurabilityHint().isAtomicWrite());
     }
@@ -1563,21 +1563,21 @@ void notifyListeners(List<FlowNode> nodes, boolean synchronous) {
         }
     }
 
-    @Override public Authentication getAuthentication() {
+    @Override public Authentication getAuthentication2() {
         if (user == null) {
-            return ACL.SYSTEM;
+            return ACL.SYSTEM2;
         }
         try {
             User u = User.getById(user, true);
             if (u == null) {
-                return Jenkins.ANONYMOUS;
+                return Jenkins.ANONYMOUS2;
             } else {
-                return u.impersonate();
+                return u.impersonate2();
             }
         } catch (UsernameNotFoundException x) {
             LOGGER.log(Level.WARNING, "could not restore authentication", x);
             // Should not expose this to callers.
-            return Jenkins.ANONYMOUS;
+            return Jenkins.ANONYMOUS2;
         }
     }
 

plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsVmExecutorService.java

@@ -169,7 +169,7 @@ void restore() {
 
     private ThreadContext setUp() {
         CpsFlowExecution execution = cpsThreadGroup.getExecution();
-        ACL.impersonate(execution.getAuthentication());
+        ACL.impersonate2(execution.getAuthentication2());
         CURRENT.set(cpsThreadGroup);
         cpsThreadGroup.busy = true;
         Thread t = Thread.currentThread();

plugin/src/test/java/org/jenkinsci/plugins/workflow/WorkflowTest.java

@@ -205,7 +205,7 @@ public static final class Execution extends AbstractStepExecutionImpl {
             @Override public void onResume() {
                 super.onResume();
                 try {
-                    listener.getLogger().println("again running as " + flow.getAuthentication().getName() + " from " + Thread.currentThread().getName());
+                    listener.getLogger().println("again running as " + flow.getAuthentication2().getName() + " from " + Thread.currentThread().getName());
                 } catch (Exception x) {
                     getContext().onFailure(x);
                 }
@@ -214,7 +214,7 @@ public static final class Execution extends AbstractStepExecutionImpl {
         public static void finish(final boolean terminate) {
             StepExecution.acceptAll(Execution.class, input -> {
                 try {
-                    input.listener.getLogger().println((terminate ? "finally" : "still") + " running as " + input.flow.getAuthentication().getName() + " from " + Thread.currentThread().getName());
+                    input.listener.getLogger().println((terminate ? "finally" : "still") + " running as " + input.flow.getAuthentication2().getName() + " from " + Thread.currentThread().getName());
                     if (terminate) {
                         input.getContext().onSuccess(null);
                     }