Spring/spring-data-commons
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Oliver Gierke
2018-04-03 19:01:15 +02:00
parent 7ddd0ecac5
commit 3d8576fe4e
2 changed files with 34 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/org/springframework/data/mapping/PropertyPath.java
View File

@@ -46,6 +46,8 @@ import org.springframework.util.StringUtils;
@EqualsAndHashCode @EqualsAndHashCode
public class PropertyPath implements Streamable<PropertyPath> { public class PropertyPath implements Streamable<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 DELIMITERS = "_\\.";
private static final String ALL_UPPERCASE = "[A-Z0-9._$]+"; private static final String ALL_UPPERCASE = "[A-Z0-9._$]+";
private static final Pattern SPLITTER = Pattern.compile("(?:[%s]?([%s]*?[^%s]+))".replaceAll("%s", DELIMITERS)); private static final Pattern SPLITTER = Pattern.compile("(?:[%s]?([%s]*?[^%s]+))".replaceAll("%s", DELIMITERS));
@@ -342,6 +344,10 @@ public class PropertyPath implements Streamable<PropertyPath> {
*/ */
private static PropertyPath create(String source, TypeInformation<?> type, String addTail, List<PropertyPath> base) { 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; PropertyReferenceException exception = null;
PropertyPath current = null; PropertyPath current = null;

29
src/test/java/org/springframework/data/mapping/PropertyPathUnitTests.java
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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -350,6 +350,23 @@ public class PropertyPathUnitTests {
assertThat(from("userName", Foo.class)).isSameAs(from("userName", Foo.class)); assertThat(from("userName", Foo.class)).isSameAs(from("userName", 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).isGreaterThan(1000);
final String path = source;
assertThatExceptionOfType(IllegalArgumentException.class) //
.isThrownBy(() -> PropertyPath.from(path, Left.class));
}
private class Foo { private class Foo {
String userName; String userName;
@@ -384,4 +401,14 @@ public class PropertyPathUnitTests {
private FooBar user; private FooBar user;
private Foo _foo; private Foo _foo;
} }
// DATACMNS-1285
private class Left {
Right foo;
}
private class Right {
Left bar;
}
} }