-
Notifications
You must be signed in to change notification settings - Fork 88
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #553 from AdoptOpenJDK/extractInnerClasses
Extract inner classes
- Loading branch information
Showing
20 changed files
with
387 additions
and
346 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
155 changes: 155 additions & 0 deletions
155
core/src/main/java/net/sourceforge/jnlp/runtime/classloader/CodeBaseClassLoader.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,155 @@ | ||
| package net.sourceforge.jnlp.runtime.classloader; | ||
|
|
||
| import net.sourceforge.jnlp.NullJnlpFileException; | ||
|
|
||
| import java.io.IOException; | ||
| import java.net.URL; | ||
| import java.net.URLClassLoader; | ||
| import java.security.AccessController; | ||
| import java.security.PrivilegedActionException; | ||
| import java.security.PrivilegedExceptionAction; | ||
| import java.util.Arrays; | ||
| import java.util.Enumeration; | ||
| import java.util.Vector; | ||
| import java.util.concurrent.ConcurrentHashMap; | ||
|
|
||
| /** | ||
| * ... | ||
| */ /* | ||
| * Helper class to expose protected URLClassLoader methods. | ||
| * Classes loaded from the codebase are absolutely NOT signed, by definition! | ||
| * If the CodeBaseClassLoader is used to load any classes in JNLPClassLoader, | ||
| * then you *MUST* check if the JNLPClassLoader is set to FULL signing. If so, | ||
| * then it must be set instead to PARTIAL, and the user prompted if it is okay | ||
| * to proceed. If the JNLPClassLoader is already PARTIAL or NONE signing, then | ||
| * nothing must be done. This is required so that we can support partial signing | ||
| * of applets but also ensure that using codebase loading in conjunction with | ||
| * signed JARs still results in the user having to confirm that this is | ||
| * acceptable. | ||
| */ | ||
| public class CodeBaseClassLoader extends URLClassLoader { | ||
|
|
||
| JNLPClassLoader parentJNLPClassLoader; | ||
|
|
||
| /** | ||
| * Classes that are not found, so that findClass can skip them next time | ||
| */ | ||
| ConcurrentHashMap<String, URL[]> notFoundResources = new ConcurrentHashMap<>(); | ||
|
|
||
| CodeBaseClassLoader(URL[] urls, JNLPClassLoader cl) { | ||
| super(urls, cl); | ||
| parentJNLPClassLoader = cl; | ||
| } | ||
|
|
||
| @Override | ||
| public void addURL(URL url) { | ||
| super.addURL(url); | ||
| } | ||
|
|
||
| /* | ||
| * Use with care! Check the class-level Javadoc before calling this. | ||
| */ | ||
| Class<?> findClassNonRecursive(final String name) throws ClassNotFoundException { | ||
| // If we have searched this path before, don't try again | ||
| if (Arrays.equals(super.getURLs(), notFoundResources.get(name))) { | ||
| throw new ClassNotFoundException(name); | ||
| } | ||
|
|
||
| try { | ||
| return AccessController.doPrivileged( | ||
| (PrivilegedExceptionAction<Class<?>>) () -> { | ||
| Class<?> c = CodeBaseClassLoader.super.findClass(name); | ||
| parentJNLPClassLoader.checkPartialSigningWithUser(); | ||
| return c; | ||
| }, parentJNLPClassLoader.getAccessControlContextForClassLoading()); | ||
| } catch (PrivilegedActionException pae) { | ||
| notFoundResources.put(name, super.getURLs()); | ||
| throw new ClassNotFoundException("Could not find class " + name, pae); | ||
| } catch (NullJnlpFileException njf) { | ||
| notFoundResources.put(name, super.getURLs()); | ||
| throw new ClassNotFoundException("Could not find class " + name, njf); | ||
| } | ||
| } | ||
|
|
||
| /* | ||
| * Use with care! Check the class-level Javadoc before calling this. | ||
| */ | ||
| @Override | ||
| public Class<?> findClass(String name) throws ClassNotFoundException { | ||
| // Calls JNLPClassLoader#findClass which may call into this.findClassNonRecursive | ||
| Class<?> c = getParentJNLPClassLoader().findClass(name); | ||
| parentJNLPClassLoader.checkPartialSigningWithUser(); | ||
| return c; | ||
| } | ||
|
|
||
| /** | ||
| * Returns the output of super.findLoadedClass(). | ||
| * <p> | ||
| * The method is renamed because ClassLoader.findLoadedClass() is final | ||
| * | ||
| * @param name The name of the class to find | ||
| * @return Output of ClassLoader.findLoadedClass() which is the class if | ||
| * found, null otherwise | ||
| * @see ClassLoader#findLoadedClass(String) | ||
| */ | ||
| Class<?> findLoadedClassFromParent(String name) { | ||
| return findLoadedClass(name); | ||
| } | ||
|
|
||
| /** | ||
| * Returns JNLPClassLoader that encompasses this loader | ||
| * | ||
| * @return parent JNLPClassLoader | ||
| */ | ||
| public JNLPClassLoader getParentJNLPClassLoader() { | ||
| return parentJNLPClassLoader; | ||
| } | ||
|
|
||
| @Override | ||
| public Enumeration<URL> findResources(String name) throws IOException { | ||
|
|
||
| // If we have searched this path before, don't try again | ||
| if (Arrays.equals(super.getURLs(), notFoundResources.get(name))) { | ||
| return (new Vector<URL>(0)).elements(); | ||
| } | ||
|
|
||
| if (!name.startsWith("META-INF")) { | ||
| Enumeration<URL> urls = super.findResources(name); | ||
|
|
||
| if (!urls.hasMoreElements()) { | ||
| notFoundResources.put(name, super.getURLs()); | ||
| } | ||
|
|
||
| return urls; | ||
| } | ||
|
|
||
| return (new Vector<URL>(0)).elements(); | ||
| } | ||
|
|
||
| @Override | ||
| public URL findResource(String name) { | ||
|
|
||
| // If we have searched this path before, don't try again | ||
| if (Arrays.equals(super.getURLs(), notFoundResources.get(name))) { | ||
| return null; | ||
| } | ||
|
|
||
| URL url = null; | ||
| if (!name.startsWith("META-INF")) { | ||
| try { | ||
| final String fName = name; | ||
| url = AccessController.doPrivileged( | ||
| (PrivilegedExceptionAction<URL>) () -> CodeBaseClassLoader.super.findResource(fName), parentJNLPClassLoader.getAccessControlContextForClassLoading()); | ||
| } catch (PrivilegedActionException ignored) { | ||
| } | ||
|
|
||
| if (url == null) { | ||
| notFoundResources.put(name, super.getURLs()); | ||
| } | ||
|
|
||
| return url; | ||
| } | ||
|
|
||
| return null; | ||
| } | ||
| } |
Oops, something went wrong.