DATACMNS-1285 - PropertyPath now limits the depth of its parsing to 1000 segments.

This commit is contained in:
Oliver Gierke
2018-04-03 19:01:15 +02:00
parent 999d26436b
commit 371f6590c5
2 changed files with 35 additions and 1 deletions

View File

@@ -36,6 +36,8 @@ import org.springframework.util.StringUtils;
*/
public class PropertyPath implements Iterable<PropertyPath> {
private static final String PARSE_DEPTH_EXCEEDED = "Trying to parse a path with depth greater than 1000! This has been disabled for security reasons to prevent parsing overflows.";
private static final String DELIMITERS = "_\\.";
private static final String ALL_UPPERCASE = "[A-Z0-9._$]+";
private static final Pattern SPLITTER = Pattern.compile("(?:[%s]?([%s]*?[^%s]+))".replaceAll("%s", DELIMITERS));
@@ -321,6 +323,10 @@ public class PropertyPath implements Iterable<PropertyPath> {
*/
private static PropertyPath create(String source, TypeInformation<?> type, String addTail, List<PropertyPath> base) {
if (base.size() > 1000) {
throw new IllegalArgumentException(PARSE_DEPTH_EXCEEDED);
}
PropertyReferenceException exception = null;
PropertyPath current = null;

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2011-2017 the original author or authors.
* Copyright 2011-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -346,6 +346,24 @@ public class PropertyPathUnitTests {
from("userAme", Foo.class);
}
@Test // DATACMNS-1285
public void rejectsTooLongPath() {
String source = "foo.bar";
for (int i = 0; i < 9; i++) {
source = source + "." + source;
}
assertThat(source.split("\\.").length, is(greaterThan(1000)));
final String path = source;
exception.expect(IllegalArgumentException.class);
PropertyPath.from(path, Left.class);
}
private class Foo {
String userName;
@@ -379,4 +397,14 @@ public class PropertyPathUnitTests {
private FooBar user;
private Foo _foo;
}
// DATACMNS-1285
private class Left {
Right foo;
}
private class Right {
Left bar;
}
}