Merge branch 'branches/rudder/6.2' into branches/rudder/7.0

Normation · Apr 26, 2022 · a1b0c36 · a1b0c36
2 parents 87aa2bd + 0e5e919
commit a1b0c36
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/auth-backends/pom-template.xml b/auth-backends/pom-template.xml
@@ -93,7 +93,7 @@
       <version>3.1.0</version>
       <scope>provided</scope>
     </dependency>
-    <!-- undeclared needed dependency -->
+    <!-- undeclared needed dependency - be careful, check compat of nimbus-jose with spring version too! -->
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
@@ -102,7 +102,7 @@
     <dependency>
       <groupId>com.nimbusds</groupId>
       <artifactId>nimbus-jose-jwt</artifactId>
-      <version>8.22</version>
+      <version>9.12.1</version>
       <exclusions>
         <exclusion>
           <groupId>net.minidev</groupId>

diff --git a/auth-backends/src/main/scala/bootstrap/rudder/plugin/AuthBackendsConf.scala b/auth-backends/src/main/scala/bootstrap/rudder/plugin/AuthBackendsConf.scala
@@ -90,6 +90,7 @@ import org.springframework.security.oauth2.core.user.OAuth2User
 import org.springframework.security.oauth2.core.oidc.user.OidcUserAuthority
 import org.springframework.security.oauth2.core.user.OAuth2UserAuthority
 import org.springframework.security.web.DefaultSecurityFilterChain
+import org.springframework.security.web.authentication.AuthenticationFailureHandler
 import org.springframework.security.web.authentication.AuthenticationSuccessHandler
 import org.springframework.security.web.authentication.SimpleUrlAuthenticationSuccessHandler
 
@@ -213,7 +214,7 @@ class AuthBackendsSpringConfiguration extends ApplicationContextAware {
         authenticationFilter.setFilterProcessesUrl(loginProcessingUrl)
         authenticationFilter.setAuthorizationRequestRepository(authorizationRequestRepository)
         authenticationFilter.setAuthenticationSuccessHandler(rudderOauth2AuthSuccessHandler)
-
+        authenticationFilter.setAuthenticationFailureHandler(applicationContext.getBean("rudderWebAuthenticationFailureHandler").asInstanceOf[AuthenticationFailureHandler])
         (authorizationRequestFilter, authenticationFilter)
       }