From e1d0f2cd3e68d41bd88500069d14452fb9c299f9 Mon Sep 17 00:00:00 2001 From: Ludy Date: Mon, 19 Aug 2024 16:03:05 +0200 Subject: [PATCH] Fix: YamlFile - String length limit disable (#1716) Co-authored-by: Anthony Stirling <77850077+Frooodle@users.noreply.github.com> --- .../software/SPDF/config/ConfigInitializer.java | 14 ++++++++++++++ .../SPDF/config/security/InitialSecuritySetup.java | 5 +++++ 2 files changed, 19 insertions(+) diff --git a/src/main/java/stirling/software/SPDF/config/ConfigInitializer.java b/src/main/java/stirling/software/SPDF/config/ConfigInitializer.java index c7af78f4..c6853782 100644 --- a/src/main/java/stirling/software/SPDF/config/ConfigInitializer.java +++ b/src/main/java/stirling/software/SPDF/config/ConfigInitializer.java @@ -14,6 +14,8 @@ import java.util.List; import org.simpleyaml.configuration.comments.CommentType; import org.simpleyaml.configuration.file.YamlFile; +import org.simpleyaml.configuration.implementation.SimpleYamlImplementation; +import org.simpleyaml.configuration.implementation.snakeyaml.lib.DumperOptions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.ApplicationContextInitializer; @@ -71,9 +73,17 @@ public class ConfigInitializer } final YamlFile settingsTemplateFile = new YamlFile(tempTemplatePath.toFile()); + DumperOptions yamlOptionsSettingsTemplateFile = + ((SimpleYamlImplementation) settingsTemplateFile.getImplementation()) + .getDumperOptions(); + yamlOptionsSettingsTemplateFile.setSplitLines(false); settingsTemplateFile.loadWithComments(); final YamlFile settingsFile = new YamlFile(settingsPath.toFile()); + DumperOptions yamlOptionsSettingsFile = + ((SimpleYamlImplementation) settingsFile.getImplementation()) + .getDumperOptions(); + yamlOptionsSettingsFile.setSplitLines(false); settingsFile.loadWithComments(); // Load headers and comments @@ -81,6 +91,10 @@ public class ConfigInitializer // Create a new file for temporary settings final YamlFile tempSettingFile = new YamlFile(settingsPath.toFile()); + DumperOptions yamlOptionsTempSettingFile = + ((SimpleYamlImplementation) tempSettingFile.getImplementation()) + .getDumperOptions(); + yamlOptionsTempSettingFile.setSplitLines(false); tempSettingFile.createNewFile(true); tempSettingFile.setHeader(header); diff --git a/src/main/java/stirling/software/SPDF/config/security/InitialSecuritySetup.java b/src/main/java/stirling/software/SPDF/config/security/InitialSecuritySetup.java index 689b5df0..b7442c5b 100644 --- a/src/main/java/stirling/software/SPDF/config/security/InitialSecuritySetup.java +++ b/src/main/java/stirling/software/SPDF/config/security/InitialSecuritySetup.java @@ -6,6 +6,8 @@ import java.nio.file.Paths; import java.util.UUID; import org.simpleyaml.configuration.file.YamlFile; +import org.simpleyaml.configuration.implementation.SimpleYamlImplementation; +import org.simpleyaml.configuration.implementation.snakeyaml.lib.DumperOptions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -92,6 +94,9 @@ public class InitialSecuritySetup { Path path = Paths.get("configs", "settings.yml"); // Target the configs/settings.yml final YamlFile settingsYml = new YamlFile(path.toFile()); + DumperOptions yamlOptionssettingsYml = + ((SimpleYamlImplementation) settingsYml.getImplementation()).getDumperOptions(); + yamlOptionssettingsYml.setSplitLines(false); settingsYml.loadWithComments();