Replace deprecated Acegi security

jenkinsci · Dec 23, 2022 · dea9b3e · dea9b3e
1 parent 61f5f86
commit dea9b3e
Showing 1 changed file with 11 additions and 13 deletions.
diff --git a/src/main/java/jenkins/scm/api/SCMEvent.java b/src/main/java/jenkins/scm/api/SCMEvent.java
@@ -33,6 +33,7 @@
 import hudson.model.Run;
 import hudson.model.TaskListener;
 import hudson.security.ACL;
+import hudson.security.ACLContext;
 import hudson.util.ClassLoaderSanityThreadFactory;
 import hudson.util.DaemonThreadFactory;
 import hudson.util.NamingThreadFactory;
@@ -47,8 +48,6 @@
 import javax.servlet.http.HttpServletRequest;
 import jenkins.security.ImpersonatingScheduledExecutorService;
 import jenkins.util.SystemProperties;
-import org.acegisecurity.context.SecurityContext;
-import org.acegisecurity.context.SecurityContextHolder;
 import org.apache.commons.lang.StringUtils;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
@@ -541,17 +540,16 @@ public void run() {
                         event.getClass(), event.getTimestamp(), oldName)
                 );
                 for (final SCMEventListener l : ExtensionList.lookup(SCMEventListener.class)) {
-                    SecurityContext context = ACL.impersonate(ACL.SYSTEM);
-                    try {
-                        fire(l, event);
-                    } catch (LinkageError e) {
-                        log(l, e);
-                    } catch (Error e) {
-                        throw e;
-                    } catch (Throwable e) {
-                        log(l, e);
-                    } finally {
-                        SecurityContextHolder.setContext(context);
+                    try (ACLContext ctx = ACL.as2(ACL.SYSTEM2)) {
+                        try {
+                            fire(l, event);
+                        } catch (LinkageError e) {
+                            log(l, e);
+                        } catch (Error e) {
+                            throw e;
+                        } catch (Throwable e) {
+                            log(l, e);
+                        }
                     }
                 }
             } finally {