Skip to content

Commit 6f65f34

Browse files
committed
pom: bump org.yaml:snakeyaml to 2.4
This fixes CVE-2022-1471. Signed-off-by: Jean-Louis Dupond <[email protected]>
1 parent 4100d65 commit 6f65f34

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

Diff for: backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/rsdl/RsdlManager.java

+6-1
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,11 @@
2020
import org.ovirt.engine.api.model.ObjectFactory;
2121
import org.ovirt.engine.api.model.Rsdl;
2222
import org.ovirt.engine.api.utils.ApiRootLinksCreator;
23+
import org.yaml.snakeyaml.LoaderOptions;
2324
import org.yaml.snakeyaml.Yaml;
2425
import org.yaml.snakeyaml.constructor.Constructor;
2526
import org.yaml.snakeyaml.constructor.CustomClassLoaderConstructor;
27+
import org.yaml.snakeyaml.inspector.TagInspector;
2628

2729
public class RsdlManager {
2830

@@ -112,7 +114,10 @@ private static MetaData loadMetaData() throws IOException {
112114
}
113115

114116
private static MetaData loadMetaData(InputStream in) throws IOException {
115-
Constructor constructor = new CustomClassLoaderConstructor(Thread.currentThread().getContextClassLoader());
117+
LoaderOptions loaderOptions = new LoaderOptions();
118+
TagInspector tagInspector = tag -> tag.getClassName().equals(MetaData.class.getName());
119+
loaderOptions.setTagInspector(tagInspector);
120+
Constructor constructor = new CustomClassLoaderConstructor(Thread.currentThread().getContextClassLoader(), loaderOptions);
116121
MetaData metaData = (MetaData) new Yaml(constructor).load(in);
117122
if (metaData == null) {
118123
throw new IOException("Can't load metadata from input stream");

Diff for: i18n/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<maven.compiler.target>11</maven.compiler.target>
1515
<maven-resources-plugin.version>2.5</maven-resources-plugin.version>
1616
<slf4j.version>1.7.22</slf4j.version>
17-
<snakeyaml.version>1.33</snakeyaml.version>
17+
<snakeyaml.version>2.4</snakeyaml.version>
1818

1919
<working-zanata-directory>target/zanata</working-zanata-directory>
2020
</properties>

Diff for: pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108
<reflections.version>0.9.9</reflections.version>
109109
<resteasy.version>3.9.3.Final</resteasy.version>
110110
<slf4j.version>1.7.22</slf4j.version>
111-
<snakeyaml.version>1.33</snakeyaml.version>
111+
<snakeyaml.version>2.4</snakeyaml.version>
112112
<spring.version>5.3.39</spring.version>
113113
<sshd-core.version>2.14.0</sshd-core.version>
114114
<validation-api.version>2.0.1.Final</validation-api.version>

0 commit comments

Comments
 (0)