Revert "CVE-2022-38752"

This reverts commit 94b1d7f.
ali-security · Sep 19, 2024 · b028e7d · b028e7d
1 parent b337e87
commit b028e7d
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 37 deletions.
diff --git a/src/main/java/org/yaml/snakeyaml/constructor/BaseConstructor.java b/src/main/java/org/yaml/snakeyaml/constructor/BaseConstructor.java
@@ -221,17 +221,21 @@ protected Object constructObject(Node node) {
     }
 
     protected Object constructObjectNoCheck(Node node) {
+        if (recursiveObjects.contains(node)) {
+            throw new ConstructorException(null, null, "found unconstructable recursive node",
+                    node.getStartMark());
+        }
         recursiveObjects.add(node);
         Construct constructor = getConstructor(node);
         Object data = (constructedObjects.containsKey(node)) ? constructedObjects.get(node)
                 : constructor.construct(node);
 
         finalizeConstruction(node, data);
         constructedObjects.put(node, data);
+        recursiveObjects.remove(node);
         if (node.isTwoStepsConstruction()) {
             constructor.construct2ndStep(node, data);
         }
-        recursiveObjects.remove(node);
         return data;
     }
 

diff --git a/src/main/java/org/yaml/snakeyaml/constructor/SafeConstructor.java b/src/main/java/org/yaml/snakeyaml/constructor/SafeConstructor.java
@@ -90,19 +90,12 @@ protected void processDuplicateKeys(MappingNode node) {
             if (!keyNode.getTag().equals(Tag.MERGE)) {
                 Object key = constructObject(keyNode);
                 if (key != null) {
-                    if (keyNode.isTwoStepsConstruction()) {
-                        if(!loadingConfig.getAllowRecursiveKeys()) {
-                          throw new YAMLException(
-                                "Recursive key is detected but it is not configured to be allowed.");
-                        } else {
-                            try {
-                                key.hashCode();// check circular dependencies
-                            } catch (Exception e) {
-                                throw new ConstructorException("while constructing a mapping",
-                                        node.getStartMark(), "found unacceptable key " + key,
-                                        tuple.getKeyNode().getStartMark(), e);
-                            }
-                        }
+                    try {
+                        key.hashCode();// check circular dependencies
+                    } catch (Exception e) {
+                        throw new ConstructorException("while constructing a mapping",
+                                node.getStartMark(), "found unacceptable key " + key,
+                                tuple.getKeyNode().getStartMark(), e);
                     }
                 }
 

diff --git a/src/test/java/org/yaml/snakeyaml/issues/issue73/RecursiveSetTest.java b/src/test/java/org/yaml/snakeyaml/issues/issue73/RecursiveSetTest.java
@@ -21,7 +21,6 @@
 
 import junit.framework.TestCase;
 
-import org.yaml.snakeyaml.LoaderOptions;
 import org.yaml.snakeyaml.Util;
 import org.yaml.snakeyaml.Yaml;
 
@@ -59,9 +58,7 @@ public void testLoadException() {
     public void testLoadRecursiveTest() {
         String doc = Util.getLocalResource("issues/issue73-recursive5.txt");
         // System.out.println(doc);
-        LoaderOptions options = new LoaderOptions();
-        options.setAllowRecursiveKeys(true);
-        Yaml yaml = new Yaml(options);
+        Yaml yaml = new Yaml();
         Bean1 obj = (Bean1) yaml.load(doc);
         Set<Object> set = obj.getSet();
         // System.out.println(set);

diff --git a/src/test/java/org/yaml/snakeyaml/issues/issue73/RecursiveSortedSetTest.java b/src/test/java/org/yaml/snakeyaml/issues/issue73/RecursiveSortedSetTest.java
@@ -21,7 +21,6 @@
 
 import junit.framework.TestCase;
 
-import org.yaml.snakeyaml.LoaderOptions;
 import org.yaml.snakeyaml.Util;
 import org.yaml.snakeyaml.Yaml;
 
@@ -58,9 +57,7 @@ public void testLoadException() {
     public void testLoadRecursiveTest() {
         String doc = Util.getLocalResource("issues/issue73-recursive9.txt");
         // System.out.println(doc);
-        LoaderOptions options = new LoaderOptions();
-        options.setAllowRecursiveKeys(true);
-        Yaml yaml = new Yaml(options);
+        Yaml yaml = new Yaml();
         Bean11 beanWithSet = (Bean11) yaml.load(doc);
         Set<Object> set = beanWithSet.getSet();
         assertEquals(TreeSet.class, set.getClass());

diff --git a/src/test/java/org/yaml/snakeyaml/recursive/HumanTest.java b/src/test/java/org/yaml/snakeyaml/recursive/HumanTest.java
@@ -137,10 +137,7 @@ public void testChildren() {
         assertEquals(etalon, output);
         TypeDescription humanDescription = new TypeDescription(Human.class);
         humanDescription.putMapPropertyType("children", Human.class, Object.class);
-            LoaderOptions loaderOptions = new LoaderOptions();
-        loaderOptions.setAllowRecursiveKeys(true);
-        Yaml beanLoader = new Yaml(new Constructor(humanDescription, loaderOptions));
-
+        Yaml beanLoader = new Yaml(new Constructor(humanDescription));
         //
         Human son2 = beanLoader.loadAs(output, Human.class);
         assertNotNull(son2);
@@ -213,10 +210,7 @@ public void testChildrenPretty() {
         assertEquals(etalon, output);
         TypeDescription humanDescription = new TypeDescription(Human.class);
         humanDescription.putMapPropertyType("children", Human.class, Object.class);
-        LoaderOptions loaderOptions = new LoaderOptions();
-        loaderOptions.setAllowRecursiveKeys(true);
-        Yaml beanLoader = new Yaml(new Constructor(humanDescription, loaderOptions));
-
+        Yaml beanLoader = new Yaml(new Constructor(humanDescription));
         //
         Human son2 = beanLoader.loadAs(output, Human.class);
         assertNotNull(son2);
@@ -640,10 +634,7 @@ public void testChildrenWithoutRootTag() {
         assertEquals(etalon, output);
         TypeDescription humanDescription = new TypeDescription(Human.class);
         humanDescription.putMapPropertyType("children", Human.class, Object.class);
-        LoaderOptions loaderOptions = new LoaderOptions();
-        loaderOptions.setAllowRecursiveKeys(true);
-        Yaml beanLoader = new Yaml(new Constructor(humanDescription, loaderOptions));
-
+        Yaml beanLoader = new Yaml(new Constructor(humanDescription));
         //
         Human son2 = beanLoader.loadAs(output, Human.class);
         assertNotNull(son2);

diff --git a/src/test/java/org/yaml/snakeyaml/recursive/generics/HumanGenericsTest.java b/src/test/java/org/yaml/snakeyaml/recursive/generics/HumanGenericsTest.java
@@ -145,9 +145,7 @@ public void testChildren() throws IOException, IntrospectionException {
         mother.setChildren(children);
         //
 
-        LoaderOptions options = new LoaderOptions();
-        options.setAllowRecursiveKeys(true);
-        Constructor constructor = new Constructor(options);
+        Constructor constructor = new Constructor();
         TypeDescription humanDescription = new TypeDescription(HumanGen.class);
         humanDescription.putMapPropertyType("children", HumanGen.class, Object.class);
         constructor.addTypeDescription(humanDescription);