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

DATACMNS-1264 - MapDataBinder now rejects improper property expressions.

Browse Source 
We now make sure that type expressions cannot be used in SpEL expressions handled by MapDataBinder. They're gonna be rejected by considering the property not writable. SpEL expression evaluation errors are now forwarded as NotWritablePropertyException to make sure the failure gets handled as if the property referred to doesn't exist.
This commit is contained in:
Oliver Gierke
2018-02-26 21:30:54 +01:00
parent 3dff7ead22
commit 613cf08f72
2 changed files with 36 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/test/java/org/springframework/data/web/MapDataBinderUnitTests.java
View File

@@ -28,8 +28,11 @@ import java.util.List;
import java.util.Map;
import org.junit.Test;
import org.springframework.beans.ConfigurablePropertyAccessor;
import org.springframework.beans.MutablePropertyValues;
import org.springframework.beans.NotWritablePropertyException;
import org.springframework.beans.PropertyValues;
import org.springframework.expression.spel.SpelEvaluationException;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.format.annotation.DateTimeFormat.ISO;
import org.springframework.format.support.DefaultFormattingConversionService;
@@ -91,7 +94,29 @@ public class MapDataBinderUnitTests {
MutablePropertyValues values = new MutablePropertyValues();
values.add("somethingWeird", "Value");
assertThat(bind(values)).isEqualTo(Collections.<String, Object> emptyMap());
assertThat(bind(values)).isEqualTo(Collections.emptyMap());
}
@Test // DATACMNS-1264
public void dropsMapExpressionsForCollectionReferences() {
ConfigurablePropertyAccessor accessor = new MapDataBinder(Bar.class, new DefaultFormattingConversionService())
.getPropertyAccessor();
assertThatExceptionOfType(NotWritablePropertyException.class) //
.isThrownBy(() -> accessor.setPropertyValue("fooBar['foo']", null)) //
.withCauseInstanceOf(SpelEvaluationException.class);
}
@Test // DATACMNS-1264
public void rejectsExpressionContainingTypeExpression() {
ConfigurablePropertyAccessor accessor = new MapDataBinder(Bar.class, new DefaultFormattingConversionService())
.getPropertyAccessor();
assertThatExceptionOfType(NotWritablePropertyException.class) //
.isThrownBy(() -> accessor.setPropertyValue("fooBar[T(java.lang.String)]", null)) //
.withCauseInstanceOf(SpelEvaluationException.class);
}
private static Map<String, Object> bind(PropertyValues values) {