|
|
@ -1,7 +1,7 @@ |
|
|
|
package org.ros.chatto; |
|
|
|
|
|
|
|
import org.ros.chatto.logged.MyLogoutSuccessHandler; |
|
|
|
import org.ros.chatto.logged.MySimpleUrlAuthenticationSuccessHandler; |
|
|
|
import org.ros.chatto.logged.UserSessionLoggingLoginSuccessHandler; |
|
|
|
import org.ros.chatto.logged.UserSessionLoggingLogoutSuccessHandler; |
|
|
|
import org.ros.chatto.security.CustomBasicAuthenticationFilter; |
|
|
|
import org.ros.chatto.security.MyUserDetailsService; |
|
|
|
import org.ros.chatto.security.TokenAuthenticationFilter; |
|
|
@ -18,15 +18,12 @@ import org.springframework.security.config.annotation.web.configuration.WebSecur |
|
|
|
import org.springframework.security.config.http.SessionCreationPolicy; |
|
|
|
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; |
|
|
|
import org.springframework.security.crypto.password.PasswordEncoder; |
|
|
|
import org.springframework.security.web.authentication.AuthenticationSuccessHandler; |
|
|
|
import org.springframework.security.web.authentication.www.BasicAuthenticationFilter; |
|
|
|
|
|
|
|
@Configuration |
|
|
|
@EnableWebSecurity |
|
|
|
public class WebSecurityConfiguration extends WebSecurityConfigurerAdapter { |
|
|
|
|
|
|
|
@Autowired |
|
|
|
private AuthenticationSuccessHandler authenticationSuccessHandler; |
|
|
|
@Autowired |
|
|
|
private MyUserDetailsService myUserDetailsService; |
|
|
|
@Autowired |
|
|
@ -117,10 +114,10 @@ public class WebSecurityConfiguration extends WebSecurityConfigurerAdapter { |
|
|
|
@Order(2) |
|
|
|
public static class FormWebSecurity extends WebSecurityConfigurerAdapter { |
|
|
|
@Autowired |
|
|
|
private MySimpleUrlAuthenticationSuccessHandler mySimpleUrlAuthenticationSuccessHandler; |
|
|
|
private UserSessionLoggingLoginSuccessHandler loginSuccessHandler; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
private MyLogoutSuccessHandler myLogoutSuccessHandler; |
|
|
|
private UserSessionLoggingLogoutSuccessHandler logoutSuccessHandler; |
|
|
|
|
|
|
|
@Override |
|
|
|
protected void configure(HttpSecurity httpSecurity) throws Exception { |
|
|
@ -142,8 +139,8 @@ public class WebSecurityConfiguration extends WebSecurityConfigurerAdapter { |
|
|
|
.and() |
|
|
|
|
|
|
|
.formLogin().loginPage("/login").permitAll().loginProcessingUrl("/perform_login") |
|
|
|
.successHandler(mySimpleUrlAuthenticationSuccessHandler).and().logout() |
|
|
|
.logoutSuccessHandler(myLogoutSuccessHandler) |
|
|
|
.successHandler(loginSuccessHandler).and().logout() |
|
|
|
.logoutSuccessHandler(logoutSuccessHandler) |
|
|
|
// .failureUrl("/?login_error") |
|
|
|
// .and() |
|
|
|
// .logout().invalidateHttpSession(true) |
|
|
@ -179,38 +176,4 @@ public class WebSecurityConfiguration extends WebSecurityConfigurerAdapter { |
|
|
|
// auth.eraseCredentials(false); |
|
|
|
// } |
|
|
|
|
|
|
|
// @Override |
|
|
|
// protected void configure(AuthenticationManagerBuilder auth) throws Exception { |
|
|
|
// auth.inMemoryAuthentication() |
|
|
|
// .withUser("user") |
|
|
|
// .password("{noop}user") |
|
|
|
// .roles("USER") |
|
|
|
// .and() |
|
|
|
// .withUser("admin") |
|
|
|
// .password("{noop}admin") |
|
|
|
// .roles("ADMIN"); |
|
|
|
//// auth.userDetailsService(myUserDetailsService); |
|
|
|
// |
|
|
|
// } |
|
|
|
// @Bean |
|
|
|
// @Override |
|
|
|
// public UserDetailsService userDetailsService(String usern) { |
|
|
|
//// UserDetails user = |
|
|
|
//// User.withDefaultPasswordEncoder() |
|
|
|
//// .username("user") |
|
|
|
//// .password("password") |
|
|
|
//// .roles("USER") |
|
|
|
//// .build(); |
|
|
|
//// |
|
|
|
//// return new InMemoryUserDetailsManager(user); |
|
|
|
// myUserDetailsService.loadUserByUsername(username) |
|
|
|
// |
|
|
|
// } |
|
|
|
// @Override |
|
|
|
// protected void configure(AuthenticationManagerBuilder auth) throws Exception { |
|
|
|
// auth.userDetailsService(myUserDetailsService); |
|
|
|
// } |
|
|
|
// auth.userDetailsService(myUserDetailsService); |
|
|
|
|
|
|
|
// } |
|
|
|
} |