From fb59c4337961c92839be6169e609dd5904fe6911 Mon Sep 17 00:00:00 2001 From: felix Date: Wed, 6 Aug 2025 21:55:25 +0000 Subject: [PATCH] chore: upgrade org.yaml:snakeyaml --- pom.xml | 8 +++----- src/main/java/org/joychou/controller/Rce.java | 13 ++++++++----- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index c62d938c..6a92a514 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,5 @@ - + 4.0.0 sec @@ -267,7 +265,7 @@ org.yaml snakeyaml - 1.21 + 2.0 @@ -428,4 +426,4 @@ - \ No newline at end of file + diff --git a/src/main/java/org/joychou/controller/Rce.java b/src/main/java/org/joychou/controller/Rce.java index 7c5f30a9..f2c618db 100644 --- a/src/main/java/org/joychou/controller/Rce.java +++ b/src/main/java/org/joychou/controller/Rce.java @@ -6,8 +6,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.yaml.snakeyaml.Yaml; +import org.yaml.snakeyaml.LoaderOptions; import org.yaml.snakeyaml.constructor.SafeConstructor; - import javax.script.Bindings; import javax.script.ScriptContext; import javax.script.ScriptEngine; @@ -114,11 +114,14 @@ public void yarm(String content) { } @GetMapping("/sec/yarm") - public void secYarm(String content) { - Yaml y = new Yaml(new SafeConstructor()); - y.load(content); - } + public void secYarm(String content) { + + Yaml y = new Yaml(new SafeConstructor(new LoaderOptions())); + + y.load(content); + + } /** * http://localhost:8080/rce/groovy?content="open -a Calculator".execute() * @param content groovy shell