Update dependencies

Brokkonaut · Sep 20, 2023 · 441ddf3 · 441ddf3
1 parent 8d1c5b9
commit 441ddf3
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,9 +6,9 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <build.number>DEV</build.number>
-        <log4j.version>2.17.1</log4j.version>
-        <jline.version>3.21.0</jline.version>
-        <snakeyaml.version>1.32</snakeyaml.version>
+        <log4j.version>2.20.0</log4j.version>
+        <jline.version>3.23.0</jline.version>
+        <snakeyaml.version>2.2</snakeyaml.version>
     </properties>
     <repositories></repositories>
     <dependencies>

diff --git a/src/main/java/de/cubeside/globalserver/GlobalServer.java b/src/main/java/de/cubeside/globalserver/GlobalServer.java
@@ -56,6 +56,7 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.io.IoBuilder;
+import org.yaml.snakeyaml.LoaderOptions;
 import org.yaml.snakeyaml.TypeDescription;
 import org.yaml.snakeyaml.Yaml;
 import org.yaml.snakeyaml.constructor.Constructor;
@@ -118,7 +119,10 @@ public GlobalServer() throws PluginLoadException {
         LOGGER.info("Starting GlobalServer...");
 
         executor = new ThreadPoolExecutor(1, Integer.MAX_VALUE, 300L, TimeUnit.SECONDS, new SynchronousQueue<>());
-        Constructor constructor = new Constructor(ServerConfig.class);
+        LoaderOptions loaderOptions = new LoaderOptions();
+        loaderOptions.setCodePointLimit(Integer.MAX_VALUE);
+        loaderOptions.setNestingDepthLimit(Integer.MAX_VALUE);
+        Constructor constructor = new Constructor(ServerConfig.class, loaderOptions);
         TypeDescription serverConfigDescription = new TypeDescription(ServerConfig.class);
         serverConfigDescription.addPropertyParameters("clientConfigs", ClientConfig.class);
         constructor.addTypeDescription(serverConfigDescription);

diff --git a/src/main/java/de/cubeside/globalserver/plugin/PluginDescription.java b/src/main/java/de/cubeside/globalserver/plugin/PluginDescription.java
@@ -18,6 +18,7 @@
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 import java.util.regex.Pattern;
+import org.yaml.snakeyaml.LoaderOptions;
 import org.yaml.snakeyaml.Yaml;
 import org.yaml.snakeyaml.constructor.SafeConstructor;
 import org.yaml.snakeyaml.error.YAMLException;
@@ -39,7 +40,10 @@ public PluginDescription(File jarFile) throws PluginDescriptionException {
             if (pluginYmlEntry == null) {
                 throw new PluginDescriptionException("The plugin jar " + jarFile.getName() + " does not contain a plugin.yml");
             }
-            root = new Yaml(new SafeConstructor()).load(new InputStreamReader(new BufferedInputStream(jarJarFile.getInputStream(pluginYmlEntry)), StandardCharsets.UTF_8));
+            LoaderOptions loaderOptions = new LoaderOptions();
+            loaderOptions.setCodePointLimit(Integer.MAX_VALUE);
+            loaderOptions.setNestingDepthLimit(Integer.MAX_VALUE);
+            root = new Yaml(new SafeConstructor(loaderOptions)).load(new InputStreamReader(new BufferedInputStream(jarJarFile.getInputStream(pluginYmlEntry)), StandardCharsets.UTF_8));
         } catch (IOException e) {
             throw new PluginDescriptionException("Could not load plugin jar " + jarFile.getName() + ": " + e.getMessage(), e);
         } catch (YAMLException e) {