From ca9cd20832c1947b270993ba01af2de84d9fd7ff Mon Sep 17 00:00:00 2001 From: Rob Winch Date: Fri, 27 Apr 2018 12:35:54 -0500 Subject: [PATCH] Add DelegatingServerAuthenticationSuccessHandler Fixes: gh-5332 --- ...ingServerAuthenticationSuccessHandler.java | 49 ++++++++++ ...rverAuthenticationSuccessHandlerTests.java | 91 +++++++++++++++++++ 2 files changed, 140 insertions(+) create mode 100644 web/src/main/java/org/springframework/security/web/server/authentication/DelegatingServerAuthenticationSuccessHandler.java create mode 100644 web/src/test/groovy/org/springframework/security/web/server/authentication/DelegatingServerAuthenticationSuccessHandlerTests.java diff --git a/web/src/main/java/org/springframework/security/web/server/authentication/DelegatingServerAuthenticationSuccessHandler.java b/web/src/main/java/org/springframework/security/web/server/authentication/DelegatingServerAuthenticationSuccessHandler.java new file mode 100644 index 0000000000..87e4450b82 --- /dev/null +++ b/web/src/main/java/org/springframework/security/web/server/authentication/DelegatingServerAuthenticationSuccessHandler.java @@ -0,0 +1,49 @@ +/* + * Copyright 2002-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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.security.web.server.authentication; + +import org.springframework.security.core.Authentication; +import org.springframework.security.web.server.WebFilterExchange; +import org.springframework.util.Assert; +import reactor.core.publisher.Mono; + +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +/** + * Delegates to a collection of {@link ServerAuthenticationSuccessHandler} implementations. + * + * @author Rob Winch + * @since 5.1 + */ +public class DelegatingServerAuthenticationSuccessHandler implements ServerAuthenticationSuccessHandler { + private final List delegates; + + public DelegatingServerAuthenticationSuccessHandler(ServerAuthenticationSuccessHandler... delegates) { + Assert.notEmpty(delegates, "delegates cannot be null or empty"); + this.delegates = Arrays.asList(delegates); + } + + @Override + public Mono onAuthenticationSuccess(WebFilterExchange exchange, + Authentication authentication) { + Stream> results = this.delegates.stream().map(delegate -> delegate.onAuthenticationSuccess(exchange, authentication)); + return Mono.when(results.collect(Collectors.toList())); + } +} diff --git a/web/src/test/groovy/org/springframework/security/web/server/authentication/DelegatingServerAuthenticationSuccessHandlerTests.java b/web/src/test/groovy/org/springframework/security/web/server/authentication/DelegatingServerAuthenticationSuccessHandlerTests.java new file mode 100644 index 0000000000..b2a216d927 --- /dev/null +++ b/web/src/test/groovy/org/springframework/security/web/server/authentication/DelegatingServerAuthenticationSuccessHandlerTests.java @@ -0,0 +1,91 @@ +/* + * Copyright 2002-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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.security.web.server.authentication; + +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.when; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.junit.MockitoJUnitRunner; +import org.springframework.security.core.Authentication; +import org.springframework.security.web.server.WebFilterExchange; + +import reactor.test.publisher.PublisherProbe; + +/** + * @author Rob Winch + * @since 5.1 + */ +@RunWith(MockitoJUnitRunner.class) +public class DelegatingServerAuthenticationSuccessHandlerTests { + @Mock + private ServerAuthenticationSuccessHandler delegate1; + + @Mock + private ServerAuthenticationSuccessHandler delegate2; + private PublisherProbe delegate1Result = PublisherProbe.empty(); + private PublisherProbe delegate2Result = PublisherProbe.empty(); + + @Mock + private WebFilterExchange exchange; + + @Mock + private Authentication authentication; + + @Before + public void setup() { + when(this.delegate1.onAuthenticationSuccess(any(), any())).thenReturn(this.delegate1Result.mono()); + when(this.delegate2.onAuthenticationSuccess(any(), any())).thenReturn(this.delegate2Result.mono()); + } + + @Test + public void constructorWhenNullThenIllegalArgumentException() { + assertThatThrownBy(() -> new DelegatingServerAuthenticationSuccessHandler((ServerAuthenticationSuccessHandler[]) null)) + .isInstanceOf(IllegalArgumentException.class); + } + + @Test + public void constructorWhenEmptyThenIllegalArgumentException() { + assertThatThrownBy(() -> new DelegatingServerAuthenticationSuccessHandler(new ServerAuthenticationSuccessHandler[0])) + .isInstanceOf(IllegalArgumentException.class); + } + + @Test + public void onAuthenticationSuccessWhenSingleThenExecuted() { + DelegatingServerAuthenticationSuccessHandler handler = new DelegatingServerAuthenticationSuccessHandler( + this.delegate1); + + handler.onAuthenticationSuccess(this.exchange, this.authentication).block(); + + this.delegate1Result.assertWasSubscribed(); + } + + @Test + public void onAuthenticationSuccessWhenMultipleThenExecuted() { + DelegatingServerAuthenticationSuccessHandler handler = new DelegatingServerAuthenticationSuccessHandler( + this.delegate1, this.delegate2); + + handler.onAuthenticationSuccess(this.exchange, this.authentication).block(); + + this.delegate1Result.assertWasSubscribed(); + this.delegate2Result.assertWasSubscribed(); + } +}