SteamWar/Paper
13
0
Fork 0
geforkt von Mirrors/Paper
Code Issues Pull-Requests 1 Aktivität

SPIGOT-5546: Fix bad depend access using wrong provider in message

Quellcode durchsuchen 
Also limit to once per plugin/provider pair

By: md_5 <git@md-5.net>
Dieser Commit ist enthalten in:
Bukkit/Spigot 2020-01-27 16:46:29 +11:00
Ursprung 0fc1ae9b1c
Commit ffa5a5dba7
1 geänderte Dateien mit 8 neuen und 3 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

11
paper-api/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
Datei anzeigen

@ -10,6 +10,7 @@ import java.net.URLClassLoader;
import java.security.CodeSigner; import java.security.CodeSigner;
import java.security.CodeSource; import java.security.CodeSource;
import java.util.Enumeration; import java.util.Enumeration;
import java.util.HashSet;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
@ -38,6 +39,7 @@ final class PluginClassLoader extends URLClassLoader {
final JavaPlugin plugin; final JavaPlugin plugin;
private JavaPlugin pluginInit; private JavaPlugin pluginInit;
private IllegalStateException pluginState; private IllegalStateException pluginState;
private final Set<String> seenIllegalAccess = new HashSet<>();
static { static {
ClassLoader.registerAsParallelCapable(); ClassLoader.registerAsParallelCapable();
@ -105,13 +107,16 @@ final class PluginClassLoader extends URLClassLoader {
if (result != null) { if (result != null) {
JavaPlugin provider = ((PluginClassLoader) result.getClassLoader()).plugin; JavaPlugin provider = ((PluginClassLoader) result.getClassLoader()).plugin;
String providerName = provider.getName();
if (provider != plugin if (provider != plugin
&& !description.getDepend().contains(provider.getName()) && !seenIllegalAccess.contains(providerName)
&& !description.getSoftDepend().contains(provider.getName()) && !description.getDepend().contains(providerName)
&& !description.getSoftDepend().contains(providerName)
&& !provider.getDescription().getLoadBefore().contains(description.getName())) { && !provider.getDescription().getLoadBefore().contains(description.getName())) {
plugin.getLogger().log(Level.WARNING, "Loaded class {0} from {1} which is not a depend, softdepend or loadbefore of this plugin.", new Object[]{name, description.getFullName()}); seenIllegalAccess.add(providerName);
plugin.getLogger().log(Level.WARNING, "Loaded class {0} from {1} which is not a depend, softdepend or loadbefore of this plugin.", new Object[]{name, provider.getDescription().getFullName()});
} }
} }
} }