Issue #5859 Ensure inheritedAccessContext doesn't pin classloader

Signed-off-by: Jan Bartel <janb@webtide.com>
jetty · Jan 20, 2021 · 7f270a0 · 7f270a0
1 parent 399db82
commit 7f270a0
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 7 deletions.
diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/thread/QueuedThreadPool.java b/jetty-util/src/main/java/org/eclipse/jetty/util/thread/QueuedThreadPool.java
@@ -20,6 +20,8 @@
 
 import java.io.Closeable;
 import java.io.IOException;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
@@ -685,12 +687,19 @@ private boolean addCounts(int deltaThreads, int deltaIdle)
     @Override
     public Thread newThread(Runnable runnable)
     {
-        Thread thread = new Thread(_threadGroup, runnable);
-        thread.setDaemon(isDaemon());
-        thread.setPriority(getThreadsPriority());
-        thread.setName(_name + "-" + thread.getId());
-        thread.setContextClassLoader(this.getClass().getClassLoader());
-        return thread;
+        return (AccessController.doPrivileged(new PrivilegedAction<Thread>()
+        {
+            @Override
+            public Thread run()
+            {
+                Thread thread = new Thread(_threadGroup, runnable);
+                thread.setDaemon(isDaemon());
+                thread.setPriority(getThreadsPriority());
+                thread.setName(_name + "-" + thread.getId());
+                thread.setContextClassLoader(this.getClass().getClassLoader());
+                return thread;
+            }
+        }));
     }
 
     protected void removeThread(Thread thread)

diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/thread/ShutdownThread.java b/jetty-util/src/main/java/org/eclipse/jetty/util/thread/ShutdownThread.java
@@ -18,6 +18,8 @@
 
 package org.eclipse.jetty.util.thread;
 
+import java.security.AccessController;
+import java.security.PrivilegedAction;
 import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
@@ -36,7 +38,15 @@
 public class ShutdownThread extends Thread
 {
     private static final Logger LOG = Log.getLogger(ShutdownThread.class);
-    private static final ShutdownThread _thread = new ShutdownThread();
+    private static final ShutdownThread _thread = AccessController.doPrivileged(new PrivilegedAction<ShutdownThread>()
+        {
+            @Override
+            public ShutdownThread run()
+            {
+                return new ShutdownThread();
+            }
+
+        });
 
     private boolean _hooked;
     private final List<LifeCycle> _lifeCycles = new CopyOnWriteArrayList<LifeCycle>();