updating the spring security used by save and restore

Author: shroffk

services/save-and-restore/src/main/java/org/phoebus/service/saveandrestore/web/config/WebSecurityConfig.java

@@ -11,10 +11,12 @@
 import org.springframework.security.access.hierarchicalroles.RoleHierarchy;
 import org.springframework.security.access.hierarchicalroles.RoleHierarchyImpl;
 import org.springframework.security.authentication.AuthenticationManager;
-import org.springframework.security.config.annotation.ObjectPostProcessor;
+import org.springframework.security.authentication.ProviderManager;
+import org.springframework.security.config.Customizer;
+import org.springframework.security.config.ObjectPostProcessor;
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
 import org.springframework.security.config.annotation.authentication.configurers.ldap.LdapAuthenticationProviderConfigurer;
-import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
+import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity;
 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.WebSecurityCustomizer;
@@ -35,7 +37,7 @@
  */
 @Configuration
 @EnableWebSecurity
-@EnableGlobalMethodSecurity(prePostEnabled = true)
+@EnableMethodSecurity(prePostEnabled = true)
 @SuppressWarnings("unused")
 public class WebSecurityConfig {
 
@@ -188,8 +190,8 @@ public String authenticationImplementation(){
     public WebSecurityCustomizer ignoringCustomizer() {
         return web -> {
             // The below lists exceptions for authentication.
-            web.ignoring().antMatchers(HttpMethod.GET, "/**");
-            web.ignoring().antMatchers(HttpMethod.POST, "/**/login*");
+            web.ignoring().requestMatchers(HttpMethod.GET, "/**");
+            web.ignoring().requestMatchers(HttpMethod.POST, "/**/login*");
         };
     }
 
@@ -201,9 +203,9 @@ public WebSecurityCustomizer ignoringCustomizer() {
      */
     @Bean
     public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
-        http.csrf().disable();
-        http.authorizeRequests().anyRequest().authenticated();
-        http.httpBasic();
+        http.csrf(csrf -> csrf.disable());
+        http.authorizeHttpRequests(auth -> auth.anyRequest().authenticated());
+        http.httpBasic(Customizer.withDefaults());
         return http.build();
     }
 
@@ -284,12 +286,7 @@ public AuthenticationManager authenticationProvider() throws Exception {
         SimpleAuthorityMapper simpleAuthorityMapper = new SimpleAuthorityMapper();
         simpleAuthorityMapper.setConvertToUpperCase(true);
         adProvider.setAuthoritiesMapper(simpleAuthorityMapper);
-        return new AuthenticationManagerBuilder(new ObjectPostProcessor<>() {
-            @Override
-            public <O> O postProcess(O object) {
-                return object;
-            }
-        }).authenticationProvider(adProvider).build();
+        return new ProviderManager(adProvider);
     }
 
     /**
@@ -346,9 +343,7 @@ public ObjectMapper objectMapper() {
      */
     @Bean
     public RoleHierarchy roleHierarchy() {
-        RoleHierarchyImpl hierarchy = new RoleHierarchyImpl();
-        hierarchy.setHierarchy("ROLE_" + roleAdmin.toUpperCase() + " > ROLE_" + roleUser.toUpperCase());
-        return hierarchy;
+        return RoleHierarchyImpl.fromHierarchy("ROLE_" + roleAdmin.toUpperCase() + " > ROLE_" + roleUser.toUpperCase());
     }
 
     /**

services/save-and-restore/src/main/java/org/phoebus/service/saveandrestore/web/controllers/AuthenticationController.java

@@ -62,14 +62,10 @@ public ResponseEntity<UserData> login(@RequestBody LoginCredentials loginCredent
             authentication = authenticationManager.authenticate(authentication);
         } catch (AuthenticationException e) {
             Logger.getLogger(AuthenticationController.class.getName()).log(Level.WARNING, "Unable to authenticate user " + loginCredentials.username(), e);
-            return new ResponseEntity<>(
-                    null,
-                    HttpStatus.UNAUTHORIZED);
+            return ResponseEntity.status(HttpStatus.UNAUTHORIZED).build();
         }
         List<String> roles = authentication.getAuthorities().stream()
                 .map(GrantedAuthority::getAuthority).collect(Collectors.toList());
-        return new ResponseEntity<>(
-                new UserData(loginCredentials.username(), roles),
-                HttpStatus.OK);
+        return ResponseEntity.ok(new UserData(loginCredentials.username(), roles));
     }
 }

services/save-and-restore/src/test/java/org/phoebus/service/saveandrestore/web/config/ControllersTestConfig.java

@@ -36,10 +36,11 @@
 import org.springframework.messaging.simp.SimpMessagingTemplate;
 import org.springframework.messaging.simp.user.SimpUserRegistry;
 import org.springframework.mock.web.MockServletContext;
-import org.springframework.util.Base64Utils;
 import org.springframework.web.socket.WebSocketSession;
 
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
@@ -111,17 +112,17 @@ public SearchUtil searchUtil() {
 
     @Bean("userAuthorization")
     public String userAuthorization() {
-        return "Basic " + Base64Utils.encodeToString((demoUser + ":" + demoUserPassword).getBytes());
+        return "Basic " + Base64.getEncoder().encodeToString((demoUser + ":" + demoUserPassword).getBytes(StandardCharsets.UTF_8));
     }
 
     @Bean("adminAuthorization")
     public String adminAuthorization() {
-        return "Basic " + Base64Utils.encodeToString((demoAdmin + ":" + demoAdminPassword).getBytes());
+        return "Basic " + Base64.getEncoder().encodeToString((demoAdmin + ":" + demoAdminPassword).getBytes(StandardCharsets.UTF_8));
     }
 
     @Bean("readOnlyAuthorization")
     public String readOnlyAuthorization() {
-        return "Basic " + Base64Utils.encodeToString((demoReadOnly + ":" + demoReadOnlyPassword).getBytes());
+        return "Basic " + Base64.getEncoder().encodeToString((demoReadOnly + ":" + demoReadOnlyPassword).getBytes(StandardCharsets.UTF_8));
     }
 
     @Bean