AccessDeniedHandler->ServerAccessDeniedHandler

Issue gh-4615

config/src/test/groovy/org/springframework/security/config/annotation/web/configurers/NamespaceHttpServerAccessDeniedHandlerTests.groovy

@@ -36,7 +36,7 @@ import org.springframework.security.web.access.ExceptionTranslationFilter;
  * @author Rob Winch
  *
  */
-public class NamespaceHttpAccessDeniedHandlerTests extends BaseSpringSpec {
+public class NamespaceHttpServerAccessDeniedHandlerTests extends BaseSpringSpec {
 	def "http/access-denied-handler@error-page"() {
 		when:
 		loadConfig(AccessDeniedPageConfig)

webflux/src/main/java/org/springframework/security/web/server/authorization/ExceptionTranslationWebFilter.java

@@ -35,25 +35,26 @@ import org.springframework.web.server.WebFilterChain;
 public class ExceptionTranslationWebFilter implements WebFilter {
 	private ServerAuthenticationEntryPoint serverAuthenticationEntryPoint = new HttpBasicServerAuthenticationEntryPoint();
 
-	private AccessDeniedHandler accessDeniedHandler = new HttpStatusAccessDeniedHandler(HttpStatus.FORBIDDEN);
+	private ServerAccessDeniedHandler serverAccessDeniedHandler = new HttpStatusServerAccessDeniedHandler(HttpStatus.FORBIDDEN);
 
 	@Override
 	public Mono<Void> filter(ServerWebExchange exchange, WebFilterChain chain) {
 		return chain.filter(exchange)
 			.onErrorResume(AccessDeniedException.class, denied -> exchange.getPrincipal()
 				.switchIfEmpty( commenceAuthentication(exchange, denied))
-				.flatMap( principal -> this.accessDeniedHandler.handle(exchange, denied))
+				.flatMap( principal -> this.serverAccessDeniedHandler
+					.handle(exchange, denied))
 			);
 	}
 
 	/**
 	 * Sets the access denied handler.
-	 * @param accessDeniedHandler the access denied handler to use. Default is
+	 * @param serverAccessDeniedHandler the access denied handler to use. Default is
 	 * HttpStatusAccessDeniedHandler with HttpStatus.FORBIDDEN
 	 */
-	public void setAccessDeniedHandler(AccessDeniedHandler accessDeniedHandler) {
+	public void setServerAccessDeniedHandler(ServerAccessDeniedHandler serverAccessDeniedHandler) {
-		Assert.notNull(accessDeniedHandler, "accessDeniedHandler cannot be null");
+		Assert.notNull(serverAccessDeniedHandler, "accessDeniedHandler cannot be null");
-		this.accessDeniedHandler = accessDeniedHandler;
+		this.serverAccessDeniedHandler = serverAccessDeniedHandler;
 	}
 
 	/**

webflux/src/main/java/org/springframework/security/web/server/authorization/HttpStatusServerAccessDeniedHandler.java

@@ -28,10 +28,10 @@ import org.springframework.web.server.ServerWebExchange;
  * @author Rob Winch
  * @since 5.0
  */
-public class HttpStatusAccessDeniedHandler implements AccessDeniedHandler {
+public class HttpStatusServerAccessDeniedHandler implements ServerAccessDeniedHandler {
 	private final HttpStatus httpStatus;
 
-	public HttpStatusAccessDeniedHandler(HttpStatus httpStatus) {
+	public HttpStatusServerAccessDeniedHandler(HttpStatus httpStatus) {
 		Assert.notNull(httpStatus, "httpStatus cannot be null");
 		this.httpStatus = httpStatus;
 	}

webflux/src/main/java/org/springframework/security/web/server/authorization/ServerAccessDeniedHandler.java

@@ -25,7 +25,7 @@ import reactor.core.publisher.Mono;
  * @author Rob Winch
  * @since 5.0
  */
-public interface AccessDeniedHandler {
+public interface ServerAccessDeniedHandler {
 
 	Mono<Void> handle(ServerWebExchange exchange, AccessDeniedException denied);
 }

webflux/src/test/java/org/springframework/security/web/server/authorization/ExceptionTranslationWebFilterTests.java

@@ -51,7 +51,7 @@ public class ExceptionTranslationWebFilterTests {
 	@Mock
 	private WebFilterChain chain;
 	@Mock
-	private AccessDeniedHandler deniedHandler;
+	private ServerAccessDeniedHandler deniedHandler;
 	@Mock
 	private ServerAuthenticationEntryPoint entryPoint;
 
@@ -67,7 +67,7 @@ public class ExceptionTranslationWebFilterTests {
 		when(this.entryPoint.commence(any(), any())).thenReturn(this.entryPointPublisher.mono());
 
 		this.filter.setServerAuthenticationEntryPoint(this.entryPoint);
-		this.filter.setAccessDeniedHandler(this.deniedHandler);
+		this.filter.setServerAccessDeniedHandler(this.deniedHandler);
 	}
 
 	@Test
@@ -150,7 +150,7 @@ public class ExceptionTranslationWebFilterTests {
 
 	@Test(expected = IllegalArgumentException.class)
 	public void setAccessDeniedHandlerWhenNullThenException() {
-		this.filter.setAccessDeniedHandler(null);
+		this.filter.setServerAccessDeniedHandler(null);
 	}
 
 	@Test(expected = IllegalArgumentException.class)

webflux/src/test/java/org/springframework/security/web/server/authorization/HttpStatusServerAccessDeniedHandlerTests.java

@@ -34,17 +34,17 @@ import static org.mockito.Mockito.verifyZeroInteractions;
  * @since 5.0
  */
 @RunWith(MockitoJUnitRunner.class)
-public class HttpStatusAccessDeniedHandlerTests {
+public class HttpStatusServerAccessDeniedHandlerTests {
 	@Mock
 	private ServerWebExchange exchange;
 	private final HttpStatus httpStatus = HttpStatus.FORBIDDEN;
-	private HttpStatusAccessDeniedHandler handler = new HttpStatusAccessDeniedHandler(this.httpStatus);
+	private HttpStatusServerAccessDeniedHandler handler = new HttpStatusServerAccessDeniedHandler(this.httpStatus);
 
 	private AccessDeniedException exception = new AccessDeniedException("Forbidden");
 
 	@Test(expected = IllegalArgumentException.class)
 	public void constructorHttpStatusWhenNullThenException() {
-		new HttpStatusAccessDeniedHandler((HttpStatus) null);
+		new HttpStatusServerAccessDeniedHandler((HttpStatus) null);
 	}
 
 	@Test