mirror/Velocity
2
0
Fork 0
mirror of https://github.com/PaperMC/Velocity.git synced 2024-11-27 06:30:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Validate plugin dependency IDs in accordance to plugin ID requirements (#1231)

Browse Source
This commit is contained in:
itsTyrion 2024-02-08 03:30:55 +01:00 committed by GitHub
parent 5956751284
commit 10430a2115
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
api/src/ap/java/com/velocitypowered/api/plugin/ap/PluginAnnotationProcessor.java
View File

@ -9,6 +9,7 @@ package com.velocitypowered.api.plugin.ap;
import com.google.auto.service.AutoService;
import com.google.gson.Gson;
import com.velocitypowered.api.plugin.Dependency;
import com.velocitypowered.api.plugin.Plugin;
import java.io.BufferedWriter;
import java.io.IOException;
@ -87,6 +88,16 @@ public class PluginAnnotationProcessor extends AbstractProcessor {
return false;
}
for (Dependency dependency : plugin.dependencies()) {
if (!SerializedPluginDescription.ID_PATTERN.matcher(dependency.id()).matches()) {
environment.getMessager().printMessage(Diagnostic.Kind.ERROR,
"Invalid dependency ID '" + dependency.id() + "' for plugin " + qualifiedName
+ ". IDs must start alphabetically, have lowercase alphanumeric characters, and "
+ "can contain dashes or underscores.");
return false;
}
}
// All good, generate the velocity-plugin.json.
SerializedPluginDescription description = SerializedPluginDescription
.from(plugin, qualifiedName.toString());

8
proxy/src/main/java/com/velocitypowered/proxy/plugin/loader/java/JavaPluginLoader.java
View File

@ -72,6 +72,14 @@ public class JavaPluginLoader implements PluginLoader {
throw new InvalidPluginException("Plugin ID '" + pd.getId() + "' is invalid.");
}
for (SerializedPluginDescription.Dependency dependency : pd.getDependencies()) {
if (!SerializedPluginDescription.ID_PATTERN.matcher(dependency.getId()).matches()) {
throw new InvalidPluginException(
"Dependency ID '" + dependency.getId() + "' for plugin '" + pd.getId() + "' is invalid."
);
}
}
return createCandidateDescription(pd, source);
}