فهرست منبع

fix deprecated code

rajah 5 ماه پیش
والد
کامیت
3d4dc4ebfd

+ 4 - 4
src/main/java/fr/triplea/demovote/security/GlobalExceptionHandler.java

@@ -27,7 +27,7 @@ public class GlobalExceptionHandler
   @ResponseStatus(HttpStatus.FORBIDDEN)
   public ResponseEntity<JsonErrorResponse> handleTokenRefreshException(RefreshTokenException ex) 
   {
-    LOG.error(ex.getMessage());
+    LOG.error(ex.getMessage()); //ex.printStackTrace();
     
     JsonErrorResponse jer = new JsonErrorResponse(HttpStatus.FORBIDDEN.value(), ex.getMessage());
 
@@ -38,7 +38,7 @@ public class GlobalExceptionHandler
   @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
   public ResponseEntity<JsonErrorResponse> handleAllExceptions(Exception ex) 
   {
-    LOG.error(ex.getMessage());
+    LOG.error(ex.getMessage()); //ex.printStackTrace();
     
     String message =  ex.getMessage();
     
@@ -53,7 +53,7 @@ public class GlobalExceptionHandler
   @ResponseStatus(HttpStatus.BAD_REQUEST)
   public ResponseEntity<JsonErrorResponse> handleNullPointerException(NullPointerException ex) 
   {
-    LOG.error(ex.getMessage());
+    LOG.error(ex.getMessage()); //ex.printStackTrace();
     
     JsonErrorResponse jer = new JsonErrorResponse(HttpStatus.BAD_REQUEST.value(), ex.getMessage());
 
@@ -63,7 +63,7 @@ public class GlobalExceptionHandler
   @ExceptionHandler(ResourceNotFoundException.class)
   public ResponseEntity<JsonErrorResponse> handleNotFound(ResourceNotFoundException ex) 
   {
-    LOG.error(ex.getMessage());
+    LOG.error(ex.getMessage()); //ex.printStackTrace();
     
     JsonErrorResponse jer = new JsonErrorResponse(HttpStatus.NOT_FOUND.value(), ex.getMessage());
     

+ 6 - 5
src/main/java/fr/triplea/demovote/security/SecurityConfig.java

@@ -14,16 +14,18 @@ import org.springframework.security.core.session.SessionRegistryImpl;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.security.web.SecurityFilterChain;
-import org.springframework.security.web.access.channel.ChannelProcessingFilter;
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
 import org.springframework.security.web.context.SecurityContextRepository;
 import org.springframework.security.web.csrf.CsrfTokenRepository;
 import org.springframework.security.web.csrf.HttpSessionCsrfTokenRepository;
 import org.springframework.security.web.header.writers.ReferrerPolicyHeaderWriter.ReferrerPolicy;
 import org.springframework.security.web.header.writers.XXssProtectionHeaderWriter;
+import org.springframework.security.web.transport.HttpsRedirectFilter;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 import org.springframework.security.web.csrf.CsrfFilter;
 
+import static org.springframework.security.config.Customizer.withDefaults;
+
 import fr.triplea.demovote.security.cors.CorsFilter;
 import fr.triplea.demovote.security.csrf.CsrfHeaderFilter;
 import fr.triplea.demovote.security.jwt.JwtTokenFilter;
@@ -58,9 +60,8 @@ public class SecurityConfig
   @Bean
   public AuthenticationManager authenticationManager() throws Exception 
   {
-    DaoAuthenticationProvider authProvider = new DaoAuthenticationProvider();
+    DaoAuthenticationProvider authProvider = new DaoAuthenticationProvider(myUserDetailsService);
     
-    authProvider.setUserDetailsService(myUserDetailsService);
     authProvider.setPasswordEncoder(passwordEncoder());
     
     return new ProviderManager(authProvider);
@@ -83,7 +84,7 @@ public class SecurityConfig
   @Bean
   public CorsFilter corsFilter() { return new CorsFilter(); }
  
-  Class<? extends ChannelProcessingFilter> cpf_clazz = ChannelProcessingFilter.class;
+  Class<? extends HttpsRedirectFilter> cpf_clazz = HttpsRedirectFilter.class;
 
   private CsrfTokenRepository csrfTokenRepository() 
   {
@@ -103,7 +104,7 @@ public class SecurityConfig
   SecurityFilterChain securityFilterChain(HttpSecurity http, SecurityContextRepository securityContextRepository) throws Exception 
   {
     http.csrf(csrf -> csrf.csrfTokenRepository(csrfTokenRepository()))
-        .requiresChannel(channel -> channel.anyRequest().requiresSecure())
+        .redirectToHttps(withDefaults())
         .authenticationManager(authenticationManager())
         .authorizeHttpRequests((ahreq) -> ahreq
           .requestMatchers("/divers/**", "/sign/**", "/webcam/**").permitAll()

+ 1 - 1
src/main/java/fr/triplea/demovote/security/xss/XssRequestWrapper.java

@@ -93,7 +93,7 @@ public class XssRequestWrapper extends HttpServletRequestWrapper
     {
       ObjectNode objectNode = (ObjectNode) node;
     
-      objectNode.fields().forEachRemaining(entry -> 
+      objectNode.properties().forEach(entry -> 
       {
         JsonNode valueNode = entry.getValue();