twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-11 02:02:04 -07:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Also limit to once per plugin/provider pair

By: md_5 <git@md-5.net>
This commit is contained in:
Bukkit/Spigot
2020-01-27 16:46:29 +11:00
parent 0fc1ae9b1c
commit ffa5a5dba7
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
paper-api/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
View File

@@ -10,6 +10,7 @@ import java.net.URLClassLoader;
import java.security.CodeSigner;
import java.security.CodeSource;
import java.util.Enumeration;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
@@ -38,6 +39,7 @@ final class PluginClassLoader extends URLClassLoader {
final JavaPlugin plugin;
private JavaPlugin pluginInit;
private IllegalStateException pluginState;
private final Set<String> seenIllegalAccess = new HashSet<>();
static {
ClassLoader.registerAsParallelCapable();
@@ -105,13 +107,16 @@ final class PluginClassLoader extends URLClassLoader {
if (result != null) {
JavaPlugin provider = ((PluginClassLoader) result.getClassLoader()).plugin;
String providerName = provider.getName();
if (provider != plugin
&& !description.getDepend().contains(provider.getName())
&& !description.getSoftDepend().contains(provider.getName())
&& !seenIllegalAccess.contains(providerName)
&& !description.getDepend().contains(providerName)
&& !description.getSoftDepend().contains(providerName)
&& !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()});
}
}
}