From e080e587a0025535b83f3e0084d35dfcffaef106 Mon Sep 17 00:00:00 2001 From: Hai Nguyen Date: Tue, 14 Aug 2018 14:41:06 +0800 Subject: [PATCH] refactor spring config --- .../org/baeldung/security/Application.java | 23 ------ .../baeldung/security/ApplicationConfig.java | 40 ++++++++++ .../org/baeldung/security/HomeController.java | 2 - .../org/baeldung/security/SecurityConfig.java | 75 ------------------- .../src/main/webapp/WEB-INF/views/home.jsp | 28 ++++--- .../baeldung/security/HomeControllerTest.java | 2 +- 6 files changed, 54 insertions(+), 116 deletions(-) delete mode 100644 spring-boot-security-taglibs/src/main/java/org/baeldung/security/Application.java create mode 100644 spring-boot-security-taglibs/src/main/java/org/baeldung/security/ApplicationConfig.java delete mode 100644 spring-boot-security-taglibs/src/main/java/org/baeldung/security/SecurityConfig.java diff --git a/spring-boot-security-taglibs/src/main/java/org/baeldung/security/Application.java b/spring-boot-security-taglibs/src/main/java/org/baeldung/security/Application.java deleted file mode 100644 index eef41bd375..0000000000 --- a/spring-boot-security-taglibs/src/main/java/org/baeldung/security/Application.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.baeldung.security; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.builder.SpringApplicationBuilder; -import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; - -@SpringBootApplication -public class Application extends SpringBootServletInitializer { - - public Application() { - super(); - } - - public static void main(String[] args) { - SpringApplication.run(Application.class, args); - } - - @Override - protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) { - return builder.sources(Application.class); - } -} diff --git a/spring-boot-security-taglibs/src/main/java/org/baeldung/security/ApplicationConfig.java b/spring-boot-security-taglibs/src/main/java/org/baeldung/security/ApplicationConfig.java new file mode 100644 index 0000000000..6283a102aa --- /dev/null +++ b/spring-boot-security-taglibs/src/main/java/org/baeldung/security/ApplicationConfig.java @@ -0,0 +1,40 @@ +package org.baeldung.security; + +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; +import org.springframework.security.crypto.factory.PasswordEncoderFactories; +import org.springframework.security.crypto.password.PasswordEncoder; + +@SpringBootApplication +@Configuration +@EnableWebSecurity +public class ApplicationConfig extends WebSecurityConfigurerAdapter { + public static final String DEFAULT_PASSWORD = "password"; + + @Override + protected void configure(AuthenticationManagerBuilder auth) throws Exception { + PasswordEncoder encoder = PasswordEncoderFactories.createDelegatingPasswordEncoder(); + + auth.inMemoryAuthentication() + .passwordEncoder(encoder) + .withUser("testUser") + .password(encoder.encode(DEFAULT_PASSWORD)) + .roles("ADMIN"); + } + + @Override + protected void configure(HttpSecurity http) throws Exception { + http.csrf(); + + http.authorizeRequests() + .antMatchers("/**") + .permitAll() + .and() + .httpBasic(); + } +} diff --git a/spring-boot-security-taglibs/src/main/java/org/baeldung/security/HomeController.java b/spring-boot-security-taglibs/src/main/java/org/baeldung/security/HomeController.java index 0eb6ee242d..e697e7e301 100644 --- a/spring-boot-security-taglibs/src/main/java/org/baeldung/security/HomeController.java +++ b/spring-boot-security-taglibs/src/main/java/org/baeldung/security/HomeController.java @@ -9,10 +9,8 @@ import javax.servlet.http.HttpServletResponse; @Controller @RequestMapping("/") public class HomeController { - @RequestMapping("") public String home(HttpServletRequest request, HttpServletResponse response) { return "home"; } - } diff --git a/spring-boot-security-taglibs/src/main/java/org/baeldung/security/SecurityConfig.java b/spring-boot-security-taglibs/src/main/java/org/baeldung/security/SecurityConfig.java deleted file mode 100644 index 99c5f1e892..0000000000 --- a/spring-boot-security-taglibs/src/main/java/org/baeldung/security/SecurityConfig.java +++ /dev/null @@ -1,75 +0,0 @@ -package org.baeldung.security; - -import java.util.HashSet; -import java.util.Set; - -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.security.authentication.AuthenticationManager; -import org.springframework.security.config.BeanIds; -import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; -import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; -import org.springframework.security.core.GrantedAuthority; -import org.springframework.security.core.authority.SimpleGrantedAuthority; -import org.springframework.security.core.userdetails.User; -import org.springframework.security.core.userdetails.UserDetails; -import org.springframework.security.core.userdetails.UserDetailsService; -import org.springframework.security.core.userdetails.UsernameNotFoundException; -import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; -import org.springframework.security.crypto.password.PasswordEncoder; - -@Configuration -@EnableWebSecurity -public class SecurityConfig extends WebSecurityConfigurerAdapter { - private static final String ROLE_PREFIX = "ROLE_"; - public static final String DEFAULT_PASSWORD = "password"; - - @Bean - static PasswordEncoder bCryptPasswordEncoder() { - return new BCryptPasswordEncoder(10); - } - - @Bean - UserDetailsService customUserDetailsService() { - return new UserDetailsService() { - @Override - public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { - // authenticate, grant ADMIN role and return dummy user - Set authorities = new HashSet(); - authorities.add(new SimpleGrantedAuthority(ROLE_PREFIX + "ADMIN")); - return new User(username, bCryptPasswordEncoder().encode(DEFAULT_PASSWORD), authorities); - } - }; - } - - @Override - protected void configure(AuthenticationManagerBuilder auth) throws Exception { - auth.userDetailsService(customUserDetailsService()) - .passwordEncoder(bCryptPasswordEncoder()); - - } - - @Bean(name = BeanIds.AUTHENTICATION_MANAGER) - @Override - public AuthenticationManager authenticationManagerBean() throws Exception { - return super.authenticationManager(); - } - - @Override - protected void configure(HttpSecurity http) throws Exception { - http.csrf(); - http.headers() - .frameOptions() - .sameOrigin(); - - http.antMatcher("/**") - .userDetailsService(customUserDetailsService()) - .authorizeRequests() - .antMatchers("/**") - .permitAll() - .and() - .httpBasic(); - } -} diff --git a/spring-boot-security-taglibs/src/main/webapp/WEB-INF/views/home.jsp b/spring-boot-security-taglibs/src/main/webapp/WEB-INF/views/home.jsp index 1117749ded..fff93186a0 100644 --- a/spring-boot-security-taglibs/src/main/webapp/WEB-INF/views/home.jsp +++ b/spring-boot-security-taglibs/src/main/webapp/WEB-INF/views/home.jsp @@ -1,8 +1,5 @@ -<%@ page language="java" contentType="text/html; charset=ISO-8859-1" - pageEncoding="ISO-8859-1"%> -<%@ taglib prefix="sec" - uri="http://www.springframework.org/security/tags"%> - +<%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%> +<%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags"%> @@ -11,19 +8,20 @@ Home Page - + AUTHENTICATED - + ADMIN ROLE - -

principal.username:

- -
- - Text Field:
- - +

+ principal.username: + +

+
+ + Text Field:
+ + \ No newline at end of file diff --git a/spring-boot-security-taglibs/src/test/java/org/baeldung/security/HomeControllerTest.java b/spring-boot-security-taglibs/src/test/java/org/baeldung/security/HomeControllerTest.java index 995d5fa3df..c9c8698254 100644 --- a/spring-boot-security-taglibs/src/test/java/org/baeldung/security/HomeControllerTest.java +++ b/spring-boot-security-taglibs/src/test/java/org/baeldung/security/HomeControllerTest.java @@ -19,7 +19,7 @@ public class HomeControllerTest { @Test public void home() throws Exception { - String body = this.restTemplate.withBasicAuth("testUser", SecurityConfig.DEFAULT_PASSWORD) + String body = this.restTemplate.withBasicAuth("testUser", ApplicationConfig.DEFAULT_PASSWORD) .getForEntity("/", String.class) .getBody(); System.out.println(body);