OP-21723 : Reverting gate config

OpsMx · May 13, 2024 · 009ec53 · 009ec53
1 parent 2cf0495
commit 009ec53
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/gate-saml/src/main/groovy/com/opsmx/spinnaker/gate/security/saml/SamlSsoConfig.groovy b/gate-saml/src/main/groovy/com/opsmx/spinnaker/gate/security/saml/SamlSsoConfig.groovy
@@ -17,7 +17,7 @@
 package com.netflix.spinnaker.gate.security.saml
 
 import com.netflix.spectator.api.Registry
-import com.netflix.spinnaker.fiat.shared.FiatClientConfigurationProperties
+//import com.netflix.spinnaker.fiat.shared.FiatClientConfigurationProperties
 import com.netflix.spinnaker.gate.config.AuthConfig
 import com.netflix.spinnaker.gate.security.AllowedAccountsSupport
 import com.netflix.spinnaker.gate.security.SpinnakerAuthConfig
@@ -224,8 +224,8 @@ class SamlSsoConfig {
       @Autowired
       AllowedAccountsSupport allowedAccountsSupport
 
-      @Autowired
-      FiatClientConfigurationProperties fiatClientConfigurationProperties
+//      @Autowired
+//      FiatClientConfigurationProperties fiatClientConfigurationProperties
 
       @Autowired
       Registry registry
@@ -265,17 +265,18 @@ class SamlSsoConfig {
           id = id.withTag("success", true).withTag("fallback", "none")
         } catch (Exception e) {
           log.debug(
-            "Unsuccessful SAML authentication (user: {}, roleCount: {}, roles: {}, legacyFallback: {})",
+            "Unsuccessful SAML authentication (user: {}, roleCount: {}, roles: {})",
             username,
             roles.size(),
             roles,
-            fiatClientConfigurationProperties.legacyFallback,e
+//            fiatClientConfigurationProperties.legacyFallback,
+            e
           )
-          id = id.withTag("success", false).withTag("fallback", fiatClientConfigurationProperties.legacyFallback)
+          id = id.withTag("success", false).withTag("fallback", false)
 
-          if (!fiatClientConfigurationProperties.legacyFallback) {
-            throw e
-          }
+//          if (!fiatClientConfigurationProperties.legacyFallback) {
+//            throw e
+//          }
         } finally {
           registry.counter(id).increment()
         }

diff --git a/gate-web/config/gate.yml b/gate-web/config/gate.yml
@@ -3,6 +3,8 @@ server:
   compression:
     enabled: true
 
+fiat:
+  enabled: true
 
 services:
   deck: