From a0918dd6d40c9a1e8af61da4c83e7f6894820b58 Mon Sep 17 00:00:00 2001 From: Rob Winch Date: Mon, 5 Feb 2018 14:53:50 -0600 Subject: [PATCH] NamespaceAuthenticationProviderTests groovy->java Issue: gh-4939 --- ...amespaceAuthenticationProviderTests.groovy | 81 ---------------- .../NamespaceAuthenticationProviderTests.java | 92 +++++++++++++++++++ 2 files changed, 92 insertions(+), 81 deletions(-) delete mode 100644 config/src/test/groovy/org/springframework/security/config/annotation/authentication/NamespaceAuthenticationProviderTests.groovy create mode 100644 config/src/test/java/org/springframework/security/config/annotation/authentication/NamespaceAuthenticationProviderTests.java diff --git a/config/src/test/groovy/org/springframework/security/config/annotation/authentication/NamespaceAuthenticationProviderTests.groovy b/config/src/test/groovy/org/springframework/security/config/annotation/authentication/NamespaceAuthenticationProviderTests.groovy deleted file mode 100644 index 9de84e8ec5..0000000000 --- a/config/src/test/groovy/org/springframework/security/config/annotation/authentication/NamespaceAuthenticationProviderTests.groovy +++ /dev/null @@ -1,81 +0,0 @@ -/* - * Copyright 2002-2013 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.config.annotation.authentication - -import org.springframework.context.annotation.Bean -import org.springframework.context.annotation.Configuration -import org.springframework.security.authentication.AuthenticationManager -import org.springframework.security.authentication.dao.DaoAuthenticationProvider -import org.springframework.security.config.annotation.BaseSpringSpec -import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; -import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; -import org.springframework.security.provisioning.InMemoryUserDetailsManager - -/** - * - * @author Rob Winch - * - */ -class NamespaceAuthenticationProviderTests extends BaseSpringSpec { - def "authentication-provider@ref"() { - when: - loadConfig(AuthenticationProviderRefConfig) - then: - authenticationProviders()[1] == AuthenticationProviderRefConfig.expected - } - - @EnableWebSecurity - static class AuthenticationProviderRefConfig extends WebSecurityConfigurerAdapter { - static DaoAuthenticationProvider expected = new DaoAuthenticationProvider() - protected void configure(AuthenticationManagerBuilder auth) throws Exception { - auth - .authenticationProvider(expected) - } - - // Only necessary to have access to verify the AuthenticationManager - @Bean - @Override - public AuthenticationManager authenticationManagerBean() - throws Exception { - return super.authenticationManagerBean(); - } - } - - def "authentication-provider@user-service-ref"() { - when: - loadConfig(UserServiceRefConfig) - then: - findAuthenticationProvider(DaoAuthenticationProvider).userDetailsService == UserServiceRefConfig.expected - } - - @EnableWebSecurity - static class UserServiceRefConfig extends WebSecurityConfigurerAdapter { - static InMemoryUserDetailsManager expected = new InMemoryUserDetailsManager([] as Collection) - protected void configure(AuthenticationManagerBuilder auth) throws Exception { - auth - .userDetailsService(expected) - } - - // Only necessary to have access to verify the AuthenticationManager - @Bean - @Override - public AuthenticationManager authenticationManagerBean() - throws Exception { - return super.authenticationManagerBean(); - } - } -} diff --git a/config/src/test/java/org/springframework/security/config/annotation/authentication/NamespaceAuthenticationProviderTests.java b/config/src/test/java/org/springframework/security/config/annotation/authentication/NamespaceAuthenticationProviderTests.java new file mode 100644 index 0000000000..6bf89392fa --- /dev/null +++ b/config/src/test/java/org/springframework/security/config/annotation/authentication/NamespaceAuthenticationProviderTests.java @@ -0,0 +1,92 @@ +/* + * 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.config.annotation.authentication; + +import org.junit.Rule; +import org.junit.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Bean; +import org.springframework.security.authentication.dao.DaoAuthenticationProvider; +import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; +import org.springframework.security.config.test.SpringTestRule; +import org.springframework.security.core.userdetails.PasswordEncodedUser; +import org.springframework.security.core.userdetails.UserDetailsService; +import org.springframework.security.provisioning.InMemoryUserDetailsManager; +import org.springframework.test.web.servlet.MockMvc; + +import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestBuilders.formLogin; +import static org.springframework.security.test.web.servlet.response.SecurityMockMvcResultMatchers.authenticated; + +/** + * @author Rob Winch + */ +public class NamespaceAuthenticationProviderTests { + + @Rule + public final SpringTestRule spring = new SpringTestRule(); + + @Autowired + private MockMvc mockMvc; + + @Test + // authentication-provider@ref + public void authenticationProviderRef() throws Exception { + this.spring.register(AuthenticationProviderRefConfig.class).autowire(); + + this.mockMvc.perform(formLogin()) + .andExpect(authenticated().withUsername("user")); + } + + @EnableWebSecurity + static class AuthenticationProviderRefConfig extends WebSecurityConfigurerAdapter { + protected void configure(AuthenticationManagerBuilder auth) throws Exception { + auth + .authenticationProvider(authenticationProvider()); + } + + @Bean + public DaoAuthenticationProvider authenticationProvider() { + DaoAuthenticationProvider result = new DaoAuthenticationProvider(); + result.setUserDetailsService(new InMemoryUserDetailsManager(PasswordEncodedUser.user())); + return result; + } + } + + @Test + // authentication-provider@user-service-ref + public void authenticationProviderUserServiceRef() throws Exception { + this.spring.register(AuthenticationProviderRefConfig.class).autowire(); + + this.mockMvc.perform(formLogin()) + .andExpect(authenticated().withUsername("user")); + } + + @EnableWebSecurity + static class UserServiceRefConfig extends WebSecurityConfigurerAdapter { + protected void configure(AuthenticationManagerBuilder auth) throws Exception { + auth + .userDetailsService(userDetailsService()); + } + + @Bean + public UserDetailsService userDetailsService() { + return new InMemoryUserDetailsManager(PasswordEncodedUser.user()); + } + } +}