diff --git a/2024-03/spring-24/src/main/java/ru/otus/spring/controller/PagesController.java b/2024-03/spring-24/src/main/java/ru/otus/spring/controller/PagesController.java index f3f1bd48..7453cff6 100644 --- a/2024-03/spring-24/src/main/java/ru/otus/spring/controller/PagesController.java +++ b/2024-03/spring-24/src/main/java/ru/otus/spring/controller/PagesController.java @@ -15,8 +15,8 @@ public class PagesController { } @GetMapping("/public") - public String publicPage(@RequestParam(name = "SpecialValue") String specialValue) { - System.out.println(specialValue); + public String publicPage(/*@RequestParam(name = "SpecialValue") String specialValue*/) { +// System.out.println(specialValue); // SecurityContext securityContext = SecurityContextHolder.getContext(); // Authentication authentication = securityContext.getAuthentication(); // System.out.println(authentication.getPrincipal()); diff --git a/2024-03/spring-24/src/main/java/ru/otus/spring/security/SecurityConfiguration.java b/2024-03/spring-24/src/main/java/ru/otus/spring/security/SecurityConfiguration.java index 0f6b0714..5ab39389 100644 --- a/2024-03/spring-24/src/main/java/ru/otus/spring/security/SecurityConfiguration.java +++ b/2024-03/spring-24/src/main/java/ru/otus/spring/security/SecurityConfiguration.java @@ -23,19 +23,22 @@ import java.util.ArrayList; public class SecurityConfiguration { @Bean - public SecurityFilterChain securityFilterChain( HttpSecurity http ) throws Exception { + public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { http - .csrf( AbstractHttpConfigurer::disable ) - .sessionManagement( ( session ) -> session - .sessionCreationPolicy( SessionCreationPolicy.ALWAYS ) ) - .authorizeHttpRequests( ( authorize ) -> authorize - .requestMatchers( "/" ).permitAll() - .requestMatchers( "/public" ).permitAll() - .requestMatchers( "/authenticated", "/success" ).authenticated() + .csrf(AbstractHttpConfigurer::disable) + .sessionManagement((session) -> session + .sessionCreationPolicy(SessionCreationPolicy.ALWAYS)) + .authorizeHttpRequests((authorize) -> authorize + .requestMatchers("/").permitAll() + .requestMatchers("/public").permitAll() + .requestMatchers("/authenticated", "/success").authenticated() .anyRequest().permitAll() ) - .addFilterAfter(new MyOwnFilter(), AuthorizationFilter.class) - .formLogin( Customizer.withDefaults() ); + //.addFilterAfter(new MyOwnFilter(), AuthorizationFilter.class) + //.httpBasic(Customizer.withDefaults()) + .formLogin(Customizer.withDefaults()) + //.rememberMe(rm -> rm.tokenValiditySeconds(600)) + ; return http.build(); } @@ -49,11 +52,11 @@ public class SecurityConfiguration { public InMemoryUserDetailsManager userDetailsService() { UserDetails user = User .builder() - .username( "user" ) - .password( "password" ) - .roles( "USER" ) + .username("user") + .password("password") + .roles("USER") .build(); - return new InMemoryUserDetailsManager( user ); + return new InMemoryUserDetailsManager(user); } }