OP-21881: Bugfix

OpsMx · Mar 21, 2024 · 66c3b96 · 66c3b96
1 parent f00c107
commit 66c3b96
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 19 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
@@ -81,11 +81,6 @@ class LdapSsoConfig {
   @Autowired
   LoginProps loginProps
 
- /* @Autowired
-  public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
-    auth.userDetailsService(userDataService).passwordEncoder(passwordEncoder());
-  }*/
-
   @Bean
   public PasswordEncoder passwordEncoder() {
     return new BCryptPasswordEncoder();
@@ -140,19 +135,6 @@ class LdapSsoConfig {
     }
     return http.build() as SecurityFilterChain
 
-/*    def authenticationManager = ctx.getBean("authenticationManager") as AuthenticationManager
-    defaultCookieSerializer.setSameSite(null)
-    http.formLogin()
-    if (loginProps.mode == null || loginProps.mode.equalsIgnoreCase("session"))
-    {
-      authConfig.configure(http)
-      http.addFilterBefore(new BasicAuthenticationFilter(authenticationManager), UsernamePasswordAuthenticationFilter)
-      http.csrf().disable();
-    }
-    else if (loginProps.mode !=null && loginProps.mode.equalsIgnoreCase("token")) {
-      authConfig.jwtconfigure(http)
-    }
-    return http.build() as SecurityFilterChain*/
   }
 
   @Bean

diff --git a/gate-web/gate-web.gradle b/gate-web/gate-web.gradle
@@ -61,7 +61,10 @@ dependencies {
   }
   implementation 'commons-fileupload:commons-fileupload:1.5'
   implementation 'org.apache.camel:camel-core:3.14.1'
-  implementation 'org.apache.camel:camel-rabbitmq:3.14.1'
+  implementation ('org.apache.camel:camel-rabbitmq:3.14.1') {
+    exclude group: 'com.rabbitmq', module: 'amqp-client'
+  }
+  implementation group: 'com.rabbitmq', name: 'amqp-client', version: '5.18.0'
   implementation 'org.apache.camel:camel-jackson:3.14.1'
 
   runtimeOnly "io.spinnaker.kork:kork-runtime"