root
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Clarify in Javadoc that expressionHandler should not be null 

Fixes: gh-2665
This commit is contained in:
Eleftheria Stein 2019-10-23 15:10:39 -04:00
parent b9f122230b
commit de7cbc82b5
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
config/src/main/java/org/springframework/security/config/annotation/web/builders/WebSecurity.java
View File

@ -204,8 +204,8 @@ public final class WebSecurity extends
}
/**
* Set the {@link WebInvocationPrivilegeEvaluator} to be used. If this is null, then a
* {@link DefaultWebInvocationPrivilegeEvaluator} will be created when
* Set the {@link WebInvocationPrivilegeEvaluator} to be used. If this is not specified,
* then a {@link DefaultWebInvocationPrivilegeEvaluator} will be created when
* {@link #securityInterceptor(FilterSecurityInterceptor)} is non null.
*
* @param privilegeEvaluator the {@link WebInvocationPrivilegeEvaluator} to use
@ -218,8 +218,8 @@ public final class WebSecurity extends
}
/**
* Set the {@link SecurityExpressionHandler} to be used. If this is null, then a
* {@link DefaultWebSecurityExpressionHandler} will be used.
* Set the {@link SecurityExpressionHandler} to be used. If this is not specified,
* then a {@link DefaultWebSecurityExpressionHandler} will be used.
*
* @param expressionHandler the {@link SecurityExpressionHandler} to use
* @return the {@link WebSecurity} for further customizations

19
config/src/test/java/org/springframework/security/config/annotation/web/configuration/WebSecurityConfigurationTests.java
View File

@ -253,6 +253,25 @@ public class WebSecurityConfigurationTests {
}
}
@Test
public void loadConfigWhenSecurityExpressionHandlerIsNullThenException() {
Throwable thrown = catchThrowable(() ->
this.spring.register(NullWebSecurityExpressionHandlerConfig.class).autowire()
);
assertThat(thrown).isInstanceOf(BeanCreationException.class);
assertThat(thrown).hasRootCauseExactlyInstanceOf(IllegalArgumentException.class);
}
@EnableWebSecurity
static class NullWebSecurityExpressionHandlerConfig extends WebSecurityConfigurerAdapter {
@Override
public void configure(WebSecurity web) {
web.expressionHandler(null);
}
}
@Test
public void loadConfigWhenDefaultSecurityExpressionHandlerThenDefaultIsRegistered() {
this.spring.register(WebSecurityExpressionHandlerDefaultsConfig.class).autowire();