OP-21881: Addressed the review comments and upgraded com.graphql-java…

… dependency
OpsMx · Mar 26, 2024 · 5aa1200 · 5aa1200
1 parent c2b0302
commit 5aa1200
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 21 deletions.
diff --git a/gate-ldap/src/main/groovy/com/netflix/spinnaker/gate/security/ldap/LdapSsoConfig.groovy b/gate-ldap/src/main/groovy/com/netflix/spinnaker/gate/security/ldap/LdapSsoConfig.groovy
@@ -26,7 +26,6 @@ import groovy.util.logging.Slf4j
 import org.apache.commons.lang3.StringUtils
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression
-import org.springframework.boot.autoconfigure.security.SecurityProperties
 import org.springframework.boot.context.properties.ConfigurationProperties
 import org.springframework.context.ApplicationContext
 import org.springframework.context.annotation.Bean
@@ -41,9 +40,6 @@ import org.springframework.security.config.annotation.web.configuration.EnableWe
 import org.springframework.security.config.annotation.web.configuration.WebSecurityCustomizer
 import org.springframework.security.core.GrantedAuthority
 import org.springframework.security.core.userdetails.UserDetails
-import org.springframework.security.core.userdetails.UserDetailsService
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder
-import org.springframework.security.crypto.password.PasswordEncoder
 import org.springframework.security.ldap.userdetails.UserDetailsContextMapper
 import org.springframework.security.web.SecurityFilterChain
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter
@@ -70,28 +66,12 @@ class LdapSsoConfig {
   @Autowired
   LdapUserContextMapper ldapUserContextMapper
 
-  @Autowired
-  SecurityProperties securityProperties
-
   @Autowired
   DefaultCookieSerializer defaultCookieSerializer
 
-  @Autowired
-  private UserDetailsService userDataService
-
   @Autowired
   LoginProps loginProps
 
-  @Bean
-  public void configure(AuthenticationManagerBuilder auth) throws Exception {
-    auth.userDetailsService(userDataService).passwordEncoder(passwordEncoder());
-  }
-
-  @Bean
-  public PasswordEncoder passwordEncoder() {
-    return new BCryptPasswordEncoder();
-  }
-
   @Autowired
   void ldapConfigure(AuthenticationManagerBuilder auth) throws Exception {
 
@@ -120,7 +100,7 @@ class LdapSsoConfig {
       ldapConfigurer.userSearchFilter(ldapConfigProps.userSearchFilter)
     }
   }
-  
+
 
   @Bean
   public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {

diff --git a/gate-web/gate-web.gradle b/gate-web/gate-web.gradle
@@ -50,6 +50,9 @@ dependencies {
 
   implementation "com.graphql-java-kickstart:graphql-spring-boot-starter:7.0.1"
   implementation "com.graphql-java-kickstart:graphql-java-tools:6.0.2"
+  implementation ("com.graphql-java:graphql-java:21.4") {
+    force(true)
+  }
 
   implementation "org.apache.groovy:groovy-json"
   implementation 'org.springframework.boot:spring-boot-starter-cache'