Skip to content

Commit

Permalink
HV-912 Not exposing accessible-made members
Browse files Browse the repository at this point in the history
  • Loading branch information
@gunnarmorling @hferentschik
gunnarmorling authored and hferentschik committed Jul 24, 2014
1 parent ea88f45 commit ab21ca9
Show file tree
Hide file tree
Showing 4 changed files with 97 additions and 61 deletions.
104 changes: 96 additions & 8 deletions engine/src/main/java/org/hibernate/validator/internal/engine/ValidatorImpl.java
View file
Expand Up @@ -17,16 +17,20 @@
package org.hibernate.validator.internal.engine;

import java.lang.annotation.ElementType;
import java.lang.reflect.AccessibleObject;
import java.lang.reflect.Field;
import java.lang.reflect.Member;
import java.lang.reflect.Method;
import java.lang.reflect.Type;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.Arrays;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentMap;
import javax.validation.ConstraintValidatorFactory;
import javax.validation.ConstraintViolation;
import javax.validation.MessageInterpolator;
Expand All @@ -37,20 +41,24 @@
import javax.validation.metadata.BeanDescriptor;

import org.hibernate.validator.internal.engine.groups.Group;
import org.hibernate.validator.internal.engine.groups.Sequence;
import org.hibernate.validator.internal.engine.groups.ValidationOrder;
import org.hibernate.validator.internal.engine.groups.ValidationOrderGenerator;
import org.hibernate.validator.internal.engine.groups.Sequence;
import org.hibernate.validator.internal.engine.resolver.SingleThreadCachedTraversableResolver;
import org.hibernate.validator.internal.metadata.BeanMetaDataManager;
import org.hibernate.validator.internal.metadata.aggregated.BeanMetaData;
import org.hibernate.validator.internal.metadata.aggregated.MethodMetaData;
import org.hibernate.validator.internal.metadata.aggregated.ParameterMetaData;
import org.hibernate.validator.internal.metadata.core.MetaConstraint;
import org.hibernate.validator.internal.util.ConcurrentReferenceHashMap;
import org.hibernate.validator.internal.util.Contracts;
import org.hibernate.validator.internal.util.ReflectionHelper;
import org.hibernate.validator.internal.util.TypeHelper;
import org.hibernate.validator.internal.util.logging.Log;
import org.hibernate.validator.internal.util.logging.LoggerFactory;
import org.hibernate.validator.internal.util.privilegedactions.GetDeclaredField;
import org.hibernate.validator.internal.util.privilegedactions.GetDeclaredMethod;
import org.hibernate.validator.internal.util.privilegedactions.SetAccessibility;
import org.hibernate.validator.method.MethodConstraintViolation;
import org.hibernate.validator.method.MethodValidator;
import org.hibernate.validator.method.metadata.TypeDescriptor;
Expand Down Expand Up @@ -108,14 +116,25 @@ public class ValidatorImpl implements Validator, MethodValidator {
*/
private final boolean failFast;

/**
* Keeps an accessible version for each non-accessible member whose value needs to be accessed during validation.
*/
private final ConcurrentMap<Member, Member> accessibleMembers;

public ValidatorImpl(ConstraintValidatorFactory constraintValidatorFactory, MessageInterpolator messageInterpolator, TraversableResolver traversableResolver, BeanMetaDataManager beanMetaDataManager, boolean failFast) {
this.constraintValidatorFactory = constraintValidatorFactory;
this.messageInterpolator = messageInterpolator;
this.traversableResolver = traversableResolver;
this.beanMetaDataManager = beanMetaDataManager;
this.failFast = failFast;

validationOrderGenerator = new ValidationOrderGenerator();
this.validationOrderGenerator = new ValidationOrderGenerator();

this.accessibleMembers = new ConcurrentReferenceHashMap<Member, Member>(
100,
ConcurrentReferenceHashMap.ReferenceType.SOFT,
ConcurrentReferenceHashMap.ReferenceType.SOFT
);
}

public final <T> Set<ConstraintViolation<T>> validate(T object, Class<?>... groups) {
Expand Down Expand Up @@ -428,7 +447,9 @@ private <T, U, V> void validateConstraintsForNonDefaultGroup(ValidationContext<T
);
}

private <T, U, V> boolean validateConstraint(ValidationContext<T, ?> validationContext, ValueContext<U, V> valueContext, MetaConstraint<?> metaConstraint) {
private <T, U, V> boolean validateConstraint(ValidationContext<T, ?> validationContext,
ValueContext<U, V> valueContext,
MetaConstraint<?> metaConstraint) {
boolean validationSuccessful = true;

if ( metaConstraint.getElementType() != ElementType.TYPE ) {
Expand All @@ -437,7 +458,7 @@ private <T, U, V> boolean validateConstraint(ValidationContext<T, ?> validationC

if ( isValidationRequired( validationContext, valueContext, metaConstraint ) ) {
@SuppressWarnings("unchecked")
V valueToValidate = (V) metaConstraint.getValue( valueContext.getCurrentBean() );
V valueToValidate = (V) getValue( metaConstraint.getLocation().getMember(), valueContext.getCurrentBean() );
valueContext.setCurrentValidatedValue( valueToValidate );
validationSuccessful = metaConstraint.validateConstraint( validationContext, valueContext );
}
Expand All @@ -461,7 +482,7 @@ private <T, U, V> void validateCascadedConstraints(ValidationContext<T, ?> valid
valueContext.appendNode( newNode );

if ( isCascadeRequired( validationContext, valueContext, member ) ) {
Object value = ReflectionHelper.getValue( member, valueContext.getCurrentBean() );
Object value = getValue( member, valueContext.getCurrentBean() );
if ( value != null ) {
Type type = value.getClass();
Iterator<?> iter = createIteratorForCascadedValue( type, value, valueContext );
Expand Down Expand Up @@ -752,7 +773,10 @@ private <T, U, V> int validatePropertyForNonDefaultGroup(ValueContext<U, V> valu
if ( isValidationRequired( validationContext, valueContext, metaConstraint ) ) {
if ( valueContext.getCurrentBean() != null ) {
@SuppressWarnings("unchecked")
V valueToValidate = (V) metaConstraint.getValue( valueContext.getCurrentBean() );
V valueToValidate = (V) getValue(
metaConstraint.getLocation().getMember(),
valueContext.getCurrentBean()
);
valueContext.setCurrentValidatedValue( valueToValidate );
}
metaConstraint.validateConstraint( validationContext, valueContext );
Expand Down Expand Up @@ -814,7 +838,10 @@ && isValidationRequired( validationContext, valueContext, metaConstraint ) ) {

if ( valueContext.getCurrentBean() != null ) {
@SuppressWarnings("unchecked")
V valueToValidate = (V) metaConstraint.getValue( valueContext.getCurrentBean() );
V valueToValidate = (V) getValue(
metaConstraint.getLocation().getMember(),
valueContext.getCurrentBean()
);
valueContext.setCurrentValidatedValue( valueToValidate );
}
boolean tmp = metaConstraint.validateConstraint( validationContext, valueContext );
Expand Down Expand Up @@ -1157,7 +1184,7 @@ private <T, U, V> ValueContext<U, V> collectMetaConstraintsForPath(Class<T> claz
for ( Member m : cascadedMembers ) {
if ( ReflectionHelper.getPropertyName( m ).equals( elem.getName() ) ) {
Type type = ReflectionHelper.typeOf( m );
newValue = newValue == null ? null : ReflectionHelper.getValue( m, newValue );
newValue = newValue == null ? null : getValue( m, newValue );
if ( elem.isInIterable() ) {
if ( newValue != null && elem.getIndex() != null ) {
newValue = ReflectionHelper.getIndexedValue( newValue, elem.getIndex() );
Expand Down Expand Up @@ -1284,5 +1311,66 @@ private boolean isCascadeRequired(ValidationContext<?, ?> validationContext, Val
private boolean shouldFailFast(ValidationContext context) {
return context.isFailFastModeEnabled() && !context.getFailingConstraints().isEmpty();
}

private Object getValue(Member member, Object object) {
if ( member == null ) {
return object;
}

member = getAccessible( member );

if ( member instanceof Method ) {
return ReflectionHelper.getValue( (Method) member, object );
}
else if ( member instanceof Field ) {
return ReflectionHelper.getValue( (Field) member, object );
}
return null;
}

/**
* Returns an accessible version of the given member. Will be the given member itself in case it is accessible,
* otherwise a copy which is set accessible. These copies are maintained in the
* {@link ValidatorImpl#accessibleMembers} cache.
*/
private Member getAccessible(Member original) {
if ( ( (AccessibleObject) original ).isAccessible() ) {
return original;
}

Member member = accessibleMembers.get( original );

if ( member != null ) {
return member;
}

Class<?> clazz = original.getDeclaringClass();

if ( original instanceof Field ) {
member = run( GetDeclaredField.action( clazz, original.getName() ) );
}
else {
member = run( GetDeclaredMethod.action( clazz, original.getName() ) );
}

run( SetAccessibility.action( member ) );

Member cached = accessibleMembers.putIfAbsent( original, member );
if ( cached != null ) {
member = cached;
}

return member;
}

/**
* Runs the given privileged action, using a privileged block if required.
* <p>
* <b>NOTE:</b> This must never be changed into a publicly available method to avoid execution of arbitrary
* privileged actions within HV's protection domain.
*/
private <T> T run(PrivilegedAction<T> action) {
return System.getSecurityManager() != null ? AccessController.doPrivileged( action ) : action.run();
}
}

2 changes: 1 addition & 1 deletion ...ain/java/org/hibernate/validator/internal/engine/resolver/DefaultTraversableResolver.java
View file
Expand Up @@ -99,7 +99,7 @@ private void detectJPA() {
// unfortunately there are several incomplete implementations out there (see HV-374)
try {
Object persistence = run( NewInstance.action( persistenceClass, "persistence provider" ) );
ReflectionHelper.getValue(persistenceUtilGetter, persistence );
ReflectionHelper.getValue( persistenceUtilGetter, persistence );
}
catch ( Exception e ) {
log.debugf(
Expand Down
16 changes: 0 additions & 16 deletions engine/src/main/java/org/hibernate/validator/internal/metadata/core/MetaConstraint.java
View file
Expand Up @@ -26,7 +26,6 @@
import org.hibernate.validator.internal.engine.ValueContext;
import org.hibernate.validator.internal.metadata.descriptor.ConstraintDescriptorImpl;
import org.hibernate.validator.internal.metadata.location.ConstraintLocation;
import org.hibernate.validator.internal.util.ReflectionHelper;

/**
* Instances of this class abstract the constraint type (class, method or field constraint) and give access to
Expand Down Expand Up @@ -94,21 +93,6 @@ protected final Type typeOfAnnotatedElement() {
return location.typeOfAnnotatedElement();
}

/**
* @param o the object from which to retrieve the value.
*
* @return Returns the value for this constraint from the specified object. Depending on the type either the value itself
* is returned of method or field access is used to access the value.
*/
public Object getValue(Object o) {
if ( location.getMember() == null ) {
return o;
}
else {
return ReflectionHelper.getValue( location.getMember(), o );
}
}

@Override
public boolean equals(Object o) {
if ( this == o ) {
Expand Down
36 changes: 0 additions & 36 deletions engine/src/main/java/org/hibernate/validator/internal/metadata/raw/ConstrainedField.java
View file
Expand Up @@ -16,14 +16,10 @@
*/
package org.hibernate.validator.internal.metadata.raw;

import java.lang.reflect.Member;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.Set;

import org.hibernate.validator.internal.metadata.core.MetaConstraint;
import org.hibernate.validator.internal.metadata.location.BeanConstraintLocation;
import org.hibernate.validator.internal.util.privilegedactions.SetAccessibility;

/**
* Represents a field of a Java type and all its associated meta-data relevant
Expand All @@ -48,41 +44,9 @@ public ConstrainedField(ConfigurationSource source,
boolean isCascading) {

super( source, ConstrainedElementKind.FIELD, location, constraints, isCascading );

Member member = location.getMember();
if ( member != null && isConstrained() ) {
run( SetAccessibility.action( member ) );
}
}

public BeanConstraintLocation getLocation() {
return (BeanConstraintLocation) super.getLocation();
}

@Override
public boolean equals(Object obj) {
if ( this == obj ) {
return true;
}
if ( !super.equals( obj ) ) {
return false;
}
if ( getClass() != obj.getClass() ) {
return false;
}
ConstrainedField other = (ConstrainedField) obj;
if ( getLocation().getMember() == null ) {
if ( other.getLocation().getMember() != null ) {
return false;
}
}
else if ( !getLocation().getMember().equals( other.getLocation().getMember() ) ) {
return false;
}
return true;
}

private <T> T run(PrivilegedAction<T> action) {
return System.getSecurityManager() != null ? AccessController.doPrivileged( action ) : action.run();
}
}

0 comments on commit ab21ca9

Please sign in to comment.