Merge pull request #200 from basil/acegi

Migrate from Acegi to Spring Security

Author: jglick

src/main/java/org/jenkinsci/plugins/workflow/steps/AbstractSynchronousNonBlockingStepExecution.java

@@ -6,7 +6,7 @@
 import edu.umd.cs.findbugs.annotations.NonNull;
 import jenkins.model.Jenkins;
 import jenkins.security.NotReallyRoleSensitiveCallable;
-import org.acegisecurity.Authentication;
+import org.springframework.security.core.Authentication;
 
 /**
  * Similar to {@link AbstractSynchronousStepExecution} (it executes synchronously too) but it does not block the CPS VM thread.
@@ -36,12 +36,12 @@ protected AbstractSynchronousNonBlockingStepExecution(StepContext context) {
 
     @Override
     public final boolean start() throws Exception {
-        final Authentication auth = Jenkins.getAuthentication();
+        final Authentication auth = Jenkins.getAuthentication2();
         task = SynchronousNonBlockingStepExecution.getExecutorService().submit(new Runnable() {
             @SuppressFBWarnings(value="SE_BAD_FIELD", justification="not serializing anything here")
             @Override public void run() {
                 try {
-                    getContext().onSuccess(ACL.impersonate(auth, new NotReallyRoleSensitiveCallable<T, Exception>() {
+                    getContext().onSuccess(ACL.impersonate2(auth, new NotReallyRoleSensitiveCallable<T, Exception>() {
                         @Override public T call() throws Exception {
                             threadName = Thread.currentThread().getName();
                             return AbstractSynchronousNonBlockingStepExecution.this.run();

src/main/java/org/jenkinsci/plugins/workflow/steps/GeneralNonBlockingStepExecution.java

@@ -30,7 +30,7 @@
 import java.util.concurrent.Future;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import jenkins.model.Jenkins;
-import org.acegisecurity.Authentication;
+import org.springframework.security.core.Authentication;
 
 /**
  * Generalization of {@link SynchronousNonBlockingStepExecution} that can be used for {@linkplain StepDescriptor#takesImplicitBlockArgument block-scoped steps}.
@@ -69,11 +69,11 @@ protected final void run(Block block) {
         if (stopCause != null) {
             return;
         }
-        final Authentication auth = Jenkins.getAuthentication();
+        final Authentication auth = Jenkins.getAuthentication2();
         task = SynchronousNonBlockingStepExecution.getExecutorService().submit(() -> {
             threadName = Thread.currentThread().getName();
             try {
-                try (ACLContext acl = ACL.as(auth)) {
+                try (ACLContext acl = ACL.as2(auth)) {
                     block.run();
                 }
             } catch (Throwable x) {

src/main/java/org/jenkinsci/plugins/workflow/steps/SynchronousNonBlockingStepExecution.java

@@ -10,7 +10,7 @@
 import java.util.concurrent.Future;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import jenkins.model.Jenkins;
-import org.acegisecurity.Authentication;
+import org.springframework.security.core.Authentication;
 
 /**
  * Similar to {@link SynchronousStepExecution} (it executes synchronously too) but it does not block the CPS VM thread.
@@ -38,12 +38,12 @@ protected SynchronousNonBlockingStepExecution(@NonNull StepContext context) {
 
     @Override
     public final boolean start() throws Exception {
-        final Authentication auth = Jenkins.getAuthentication();
+        final Authentication auth = Jenkins.getAuthentication2();
         task = getExecutorService().submit(() -> {
             threadName = Thread.currentThread().getName();
             try {
                 T ret;
-                try (ACLContext acl = ACL.as(auth)) {
+                try (ACLContext acl = ACL.as2(auth)) {
                     ret = run();
                 }
                 getContext().onSuccess(ret);