Skip to content

set DeserializationUtils snake parsing log leve to warning #1044

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
merged 1 commit into from
Mar 19, 2019
Merged

set DeserializationUtils snake parsing log leve to warning #1044

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 7 additions & 7 deletions modules/swagger-parser/src/main/java/io/swagger/parser/util/DeserializationUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,14 +138,14 @@ public static JsonNode readYamlTree(String contents) throws IOException {
if (options.isValidateYamlInput()) {
boolean res = exceedsLimits(o, null, new Integer(0), new IdentityHashMap<Object, Long>());
if (res) {
LOGGER.error("Error converting snake-parsed yaml to JsonNode");
LOGGER.warn("Error converting snake-parsed yaml to JsonNode");
return Yaml.mapper().readTree(contents);
}
}
JsonNode n = Json.mapper().convertValue(o, JsonNode.class);
return n;
} catch (Throwable e) {
LOGGER.error("Error snake-parsing yaml content", e);
LOGGER.warn("Error snake-parsing yaml content", e);
return Yaml.mapper().readTree(contents);
}
}
Expand All @@ -155,7 +155,7 @@ private static boolean exceedsLimits(Object o, Object parent, Integer depth, Map
if (o == null) return false;
if (!(o instanceof List) && !(o instanceof Map)) return false;
if (depth > options.getMaxYamlDepth()) {
LOGGER.error("snake-yaml result exceeds max depth {}; threshold can be increased if needed by setting system property `maxYamlDepth` to a higher value.", options.getMaxYamlDepth());
LOGGER.warn("snake-yaml result exceeds max depth {}; threshold can be increased if needed by setting system property `maxYamlDepth` to a higher value.", options.getMaxYamlDepth());
return true;
}
int currentDepth = depth;
Expand All @@ -171,7 +171,7 @@ private static boolean exceedsLimits(Object o, Object parent, Integer depth, Map
}
}
if (visited.get(o) > options.getMaxYamlReferences()) {
LOGGER.error("snake-yaml result exceeds max references {}; threshold can be increased if needed by setting system property `maxYamlReferences` to a higher value.", options.getMaxYamlReferences());
LOGGER.warn("snake-yaml result exceeds max references {}; threshold can be increased if needed by setting system property `maxYamlReferences` to a higher value.", options.getMaxYamlReferences());
return true;
}
visited.put(o, visited.get(o) + 1);
Expand Down Expand Up @@ -211,7 +211,7 @@ private static boolean hasReference(Object o, Object target, Integer depth, Map<
if (!(o instanceof List) && !(o instanceof Map)) return false;
if (!(target instanceof List) && !(target instanceof Map)) return false;
if (depth > options.getMaxYamlDepth()) {
LOGGER.error("snake-yaml result exceeds max depth {}; threshold can be increased if needed by setting system property `maxYamlDepth` to a higher value.", options.getMaxYamlDepth());
LOGGER.warn("snake-yaml result exceeds max depth {}; threshold can be increased if needed by setting system property `maxYamlDepth` to a higher value.", options.getMaxYamlDepth());
return true;
}
int currentDepth = depth;
Expand All @@ -229,7 +229,7 @@ private static boolean hasReference(Object o, Object target, Integer depth, Map<
}
for (Object v : children) {
if (v == target) {
LOGGER.error("detected cycle in snake-yaml result; cycle check can be disabled by setting system property `yamlCycleCheck` to false.");
LOGGER.warn("detected cycle in snake-yaml result; cycle check can be disabled by setting system property `yamlCycleCheck` to false.");
return true;
}
boolean res = hasReference(v, target, currentDepth + 1, visited);
Expand Down Expand Up @@ -280,7 +280,7 @@ public Object getSingleData(Class<?> type) {
if (node != null) {
if (node instanceof MappingNode) {
if (!checkNode((MappingNode) node, new Integer(0))) {
LOGGER.error("yaml tree depth exceeds max depth {}; threshold can be increased if needed by setting system property `maxYamlDepth` to a higher value.", options.getMaxYamlDepth());
LOGGER.warn("yaml tree depth exceeds max depth {}; threshold can be increased if needed by setting system property `maxYamlDepth` to a higher value.", options.getMaxYamlDepth());
throw new SnakeException("yaml tree depth exceeds max " + options.getMaxYamlDepth());
}
}
Expand Down