From 7993673de9ace7fb74228fd52af033eb2fa5ee18 Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Mon, 3 Mar 2025 10:09:02 -0800
Subject: [PATCH] `FlowExecution#getAuthentication2`
---
.../plugins/workflow/flow/FlowExecution.java | 23 ++++++++++++++++---
.../workflow/log/LogStorageTestBase.java | 4 ++--
2 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/jenkinsci/plugins/workflow/flow/FlowExecution.java b/src/main/java/org/jenkinsci/plugins/workflow/flow/FlowExecution.java
index e1f8dc91..ac1af2fb 100644
--- a/src/main/java/org/jenkinsci/plugins/workflow/flow/FlowExecution.java
+++ b/src/main/java/org/jenkinsci/plugins/workflow/flow/FlowExecution.java
@@ -47,10 +47,10 @@
import edu.umd.cs.findbugs.annotations.NonNull;
import jenkins.model.Jenkins;
import jenkins.model.queue.AsynchronousExecution;
-import org.acegisecurity.Authentication;
import org.jenkinsci.plugins.workflow.steps.FlowInterruptedException;
import org.kohsuke.accmod.Restricted;
import org.kohsuke.accmod.restrictions.NoExternalUse;
+import org.springframework.security.core.Authentication;
/**
* State of a currently executing workflow.
@@ -248,10 +248,27 @@ public boolean blocksRestart() {
* Looks up authentication associated with this flow execution.
* For example, if a flow is configured to be a trusted agent of a user, that would be set here.
* A flow run triggered by a user manually might be associated with the runtime, or it might not.
- * @return an authentication; {@link ACL#SYSTEM} as a fallback, or {@link Jenkins#ANONYMOUS} if the flow is supposed to be limited to a specific user but that user cannot now be looked up
+ * @return an authentication; {@link ACL#SYSTEM2} as a fallback, or {@link Jenkins#ANONYMOUS2} if the flow is supposed to be limited to a specific user but that user cannot now be looked up
*/
- public abstract @NonNull Authentication getAuthentication();
+ public /* abstract */ @NonNull Authentication getAuthentication2() {
+ return Util.ifOverridden(
+ () -> getAuthentication().toSpring(),
+ org.acegisecurity.Authentication.class,
+ getClass(),
+ "getAuthentication");
+ }
+ /**
+ * @deprecated use {@link #getAuthentication2()}
+ */
+ @Deprecated
+ public /* abstract */ @NonNull org.acegisecurity.Authentication getAuthentication() {
+ return Util.ifOverridden(
+ () -> org.acegisecurity.Authentication.fromSpring(getAuthentication2()),
+ Authentication.class,
+ getClass(),
+ "getAuthentication2");
+ }
/** @see GraphLookupView#isActive(FlowNode)
* @throws IllegalArgumentException If the input {@link FlowNode} does not belong to this execution
diff --git a/src/test/java/org/jenkinsci/plugins/workflow/log/LogStorageTestBase.java b/src/test/java/org/jenkinsci/plugins/workflow/log/LogStorageTestBase.java
index 47b55c8a..a8cabbb8 100644
--- a/src/test/java/org/jenkinsci/plugins/workflow/log/LogStorageTestBase.java
+++ b/src/test/java/org/jenkinsci/plugins/workflow/log/LogStorageTestBase.java
@@ -51,7 +51,6 @@
import java.util.logging.Level;
import jenkins.model.CauseOfInterruption;
import jenkins.security.MasterToSlaveCallable;
-import org.acegisecurity.Authentication;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.output.NullOutputStream;
import org.apache.commons.io.output.NullWriter;
@@ -68,6 +67,7 @@
import org.junit.Test;
import org.jvnet.hudson.test.JenkinsRule;
import org.jvnet.hudson.test.LoggerRule;
+import org.springframework.security.core.Authentication;
/**
* Foundation for compliance tests of {@link LogStorage} implementations.
@@ -393,7 +393,7 @@ public FlowNode getNode(String id) {
@NonNull
@Override
- public Authentication getAuthentication() {
+ public Authentication getAuthentication2() {
throw new UnsupportedOperationException();
}