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:43:54 +01:00
parent ef88861852
commit a09d6379e6
2 changed files with 59 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/main/java/org/springframework/data/web/MapDataBinder.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2015 the original author or authors.
* Copyright 2015-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.
@@ -39,8 +39,12 @@ import org.springframework.data.mapping.PropertyReferenceException;
import org.springframework.data.util.TypeInformation;
import org.springframework.expression.AccessException;
import org.springframework.expression.EvaluationContext;
import org.springframework.expression.EvaluationException;
import org.springframework.expression.Expression;
import org.springframework.expression.TypeLocator;
import org.springframework.expression.TypedValue;
import org.springframework.expression.spel.SpelEvaluationException;
import org.springframework.expression.spel.SpelMessage;
import org.springframework.expression.spel.SpelParserConfiguration;
import org.springframework.expression.spel.standard.SpelExpressionParser;
import org.springframework.expression.spel.support.StandardEvaluationContext;
@@ -104,6 +108,13 @@ class MapDataBinder extends WebDataBinder {
private static final SpelExpressionParser PARSER = new SpelExpressionParser(
new SpelParserConfiguration(false, true));
private static final TypeLocator REJECTING_LOCATOR = new TypeLocator() {
@Override
public Class<?> findType(String typeName) throws EvaluationException {
throw new SpelEvaluationException(SpelMessage.TYPE_NOT_FOUND, typeName);
}
};
private final @NonNull Class<?> type;
private final @NonNull Map<String, Object> map;
@@ -164,6 +175,7 @@ class MapDataBinder extends WebDataBinder {
StandardEvaluationContext context = new StandardEvaluationContext();
context.addPropertyAccessor(new PropertyTraversingMapAccessor(type, conversionService));
context.setTypeConverter(new StandardTypeConverter(conversionService));
context.setTypeLocator(REJECTING_LOCATOR);
context.setRootObject(map);
Expression expression = PARSER.parseExpression(propertyName);
@@ -176,20 +188,24 @@ class MapDataBinder extends WebDataBinder {
if (conversionRequired(value, propertyType.getType())) {
PropertyDescriptor descriptor = BeanUtils
.getPropertyDescriptor(owningType.getType(), leafProperty.getSegment());
PropertyDescriptor descriptor = BeanUtils.getPropertyDescriptor(owningType.getType(),
leafProperty.getSegment());
MethodParameter methodParameter = new MethodParameter(descriptor.getReadMethod(), -1);
TypeDescriptor typeDescriptor = TypeDescriptor.nested(methodParameter, 0);
value = conversionService.convert(value, TypeDescriptor.forObject(value), typeDescriptor);
}
expression.setValue(context, value);
try {
expression.setValue(context, value);
} catch (SpelEvaluationException o_O) {
throw new NotWritablePropertyException(type, propertyName, "Could not write property!", o_O);
}
}
private boolean conversionRequired(Object source, Class<?> targetType) {
if (targetType.isInstance(source)) {
if (source == null || targetType.isInstance(source)) {
return false;
}
@@ -274,11 +290,12 @@ class MapDataBinder extends WebDataBinder {
Class<?> actualPropertyType = path.getType();
TypeDescriptor valueDescriptor = conversionService.canConvert(String.class, actualPropertyType) ? TypeDescriptor
.valueOf(String.class) : TypeDescriptor.valueOf(HashMap.class);
TypeDescriptor valueDescriptor = conversionService.canConvert(String.class, actualPropertyType)
? TypeDescriptor.valueOf(String.class)
: TypeDescriptor.valueOf(HashMap.class);
return path.isCollection() ? TypeDescriptor.collection(emptyValue.getClass(), valueDescriptor) : TypeDescriptor
.map(emptyValue.getClass(), TypeDescriptor.valueOf(String.class), valueDescriptor);
return path.isCollection() ? TypeDescriptor.collection(emptyValue.getClass(), valueDescriptor)
: TypeDescriptor.map(emptyValue.getClass(), TypeDescriptor.valueOf(String.class), valueDescriptor);
}
}

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

@@ -1,5 +1,5 @@
/*
* Copyright 2015-2017 the original author or authors.
* Copyright 2015-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.
@@ -28,9 +28,15 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.hamcrest.Matchers;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
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;
@@ -42,6 +48,8 @@ import org.springframework.format.support.DefaultFormattingConversionService;
*/
public class MapDataBinderUnitTests {
public @Rule ExpectedException exception = ExpectedException.none();
@Test // DATACMNS-630
public void honorsFormattingAnnotationOnAccessor() {
@@ -95,6 +103,30 @@ public class MapDataBinderUnitTests {
assertThat(bind(values), is(Collections.<String, Object> emptyMap()));
}
@Test // DATACMNS-1264
public void dropsMapExpressionsForCollectionReferences() {
ConfigurablePropertyAccessor accessor = new MapDataBinder(Bar.class, new DefaultFormattingConversionService())
.getPropertyAccessor();
exception.expect(NotWritablePropertyException.class);
exception.expectCause(is(Matchers.<Throwable> instanceOf(SpelEvaluationException.class)));
accessor.setPropertyValue("fooBar['foo']", null);
}
@Test // DATACMNS-1264
public void rejectsExpressionContainingTypeExpression() {
ConfigurablePropertyAccessor accessor = new MapDataBinder(Bar.class, new DefaultFormattingConversionService())
.getPropertyAccessor();
exception.expect(NotWritablePropertyException.class);
exception.expectCause(is(Matchers.<Throwable> instanceOf(SpelEvaluationException.class)));
accessor.setPropertyValue("fooBar[T(java.lang.String)]", null);
}
private static Map<String, Object> bind(PropertyValues values) {
MapDataBinder binder = new MapDataBinder(Root.class, new DefaultFormattingConversionService());