Skip to content

HDDS-7760. Let ContainerDataConstructor extend SafeConstructor #4162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adoroszlai merged 3 commits into from
Jan 11, 2023
Merged

HDDS-7760. Let ContainerDataConstructor extend SafeConstructor #4162

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f9bbb4d
Workaround for CVE-2022-1471
rohit-kb Jan 9, 2023
cacbccd
Passing SafeConstructor's instance during Yaml Object creations
rohit-kb Jan 10, 2023
b6aa62f
Revert "Passing SafeConstructor's instance during Yaml Object creations"
adoroszlai Jan 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ...ervice/src/main/java/org/apache/hadoop/ozone/container/common/impl/ContainerDataYaml.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
import org.slf4j.LoggerFactory;
import org.yaml.snakeyaml.Yaml;
import org.yaml.snakeyaml.constructor.AbstractConstruct;
import org.yaml.snakeyaml.constructor.Constructor;
import org.yaml.snakeyaml.constructor.SafeConstructor;
import org.yaml.snakeyaml.introspector.BeanAccess;
import org.yaml.snakeyaml.introspector.Property;
import org.yaml.snakeyaml.introspector.PropertyUtils;
Expand Down Expand Up @@ -160,7 +160,7 @@ public static ContainerData readContainer(InputStream input)
KeyValueContainerData.getYamlFields());
representer.setPropertyUtils(propertyUtils);

Constructor containerDataConstructor = new ContainerDataConstructor();
SafeConstructor containerDataConstructor = new ContainerDataConstructor();

Yaml yaml = new Yaml(containerDataConstructor, representer);
yaml.setBeanAccess(BeanAccess.FIELD);
Expand Down Expand Up @@ -200,7 +200,7 @@ public static Yaml getYamlForContainerType(ContainerType containerType,
KeyValueContainerData.class,
KEYVALUE_YAML_TAG);

Constructor keyValueDataConstructor = new ContainerDataConstructor();
SafeConstructor keyValueDataConstructor = new ContainerDataConstructor();

return new Yaml(keyValueDataConstructor, representer);
}
Expand Down Expand Up @@ -255,7 +255,7 @@ protected NodeTuple representJavaBeanProperty(
/**
* Constructor class for KeyValueData, which will be used by Yaml.
*/
private static class ContainerDataConstructor extends Constructor {
private static class ContainerDataConstructor extends SafeConstructor {
ContainerDataConstructor() {
//Adding our own specific constructors for tags.
// When a new Container type is added, we need to add yamlConstructor
Expand Down