From 1e093db1b622984f76c6e387530715390f69ac45 Mon Sep 17 00:00:00 2001 From: stnor Date: Sat, 6 May 2023 19:53:08 +0200 Subject: [PATCH 1/2] gh-13136 fixed log level related bug --- .../service/authentication/OpenSamlAuthenticationProvider.java | 2 +- .../service/authentication/OpenSaml4AuthenticationProvider.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/saml2/saml2-service-provider/src/opensaml3Main/java/org/springframework/security/saml2/provider/service/authentication/OpenSamlAuthenticationProvider.java b/saml2/saml2-service-provider/src/opensaml3Main/java/org/springframework/security/saml2/provider/service/authentication/OpenSamlAuthenticationProvider.java index 18ec5f77eb..38d0f8f3d4 100644 --- a/saml2/saml2-service-provider/src/opensaml3Main/java/org/springframework/security/saml2/provider/service/authentication/OpenSamlAuthenticationProvider.java +++ b/saml2/saml2-service-provider/src/opensaml3Main/java/org/springframework/security/saml2/provider/service/authentication/OpenSamlAuthenticationProvider.java @@ -507,7 +507,7 @@ public final class OpenSamlAuthenticationProvider implements AuthenticationProvi if (result.hasErrors()) { Collection errors = result.getErrors(); - if (logger.isTraceEnabled()) { + if (logger.isDebugEnabled()) { logger.debug("Found " + errors.size() + " validation errors in SAML response [" + response.getID() + "]: " + errors); } diff --git a/saml2/saml2-service-provider/src/opensaml4Main/java/org/springframework/security/saml2/provider/service/authentication/OpenSaml4AuthenticationProvider.java b/saml2/saml2-service-provider/src/opensaml4Main/java/org/springframework/security/saml2/provider/service/authentication/OpenSaml4AuthenticationProvider.java index 92ece427ce..ab246094b7 100644 --- a/saml2/saml2-service-provider/src/opensaml4Main/java/org/springframework/security/saml2/provider/service/authentication/OpenSaml4AuthenticationProvider.java +++ b/saml2/saml2-service-provider/src/opensaml4Main/java/org/springframework/security/saml2/provider/service/authentication/OpenSaml4AuthenticationProvider.java @@ -559,7 +559,7 @@ public final class OpenSaml4AuthenticationProvider implements AuthenticationProv if (result.hasErrors()) { Collection errors = result.getErrors(); - if (this.logger.isTraceEnabled()) { + if (this.logger.isDebugEnabled()) { this.logger.debug("Found " + errors.size() + " validation errors in SAML response [" + response.getID() + "]: " + errors); } From b4083f1b9e2be6f8238153e0cb8079d5604429c8 Mon Sep 17 00:00:00 2001 From: Josh Cummings Date: Mon, 8 May 2023 15:23:17 -0600 Subject: [PATCH 2/2] Revert "gh-13136 fixed log level related bug" This reverts commit 1e093db1b622984f76c6e387530715390f69ac45. --- .../service/authentication/OpenSamlAuthenticationProvider.java | 2 +- .../service/authentication/OpenSaml4AuthenticationProvider.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/saml2/saml2-service-provider/src/opensaml3Main/java/org/springframework/security/saml2/provider/service/authentication/OpenSamlAuthenticationProvider.java b/saml2/saml2-service-provider/src/opensaml3Main/java/org/springframework/security/saml2/provider/service/authentication/OpenSamlAuthenticationProvider.java index 38d0f8f3d4..18ec5f77eb 100644 --- a/saml2/saml2-service-provider/src/opensaml3Main/java/org/springframework/security/saml2/provider/service/authentication/OpenSamlAuthenticationProvider.java +++ b/saml2/saml2-service-provider/src/opensaml3Main/java/org/springframework/security/saml2/provider/service/authentication/OpenSamlAuthenticationProvider.java @@ -507,7 +507,7 @@ public final class OpenSamlAuthenticationProvider implements AuthenticationProvi if (result.hasErrors()) { Collection errors = result.getErrors(); - if (logger.isDebugEnabled()) { + if (logger.isTraceEnabled()) { logger.debug("Found " + errors.size() + " validation errors in SAML response [" + response.getID() + "]: " + errors); } diff --git a/saml2/saml2-service-provider/src/opensaml4Main/java/org/springframework/security/saml2/provider/service/authentication/OpenSaml4AuthenticationProvider.java b/saml2/saml2-service-provider/src/opensaml4Main/java/org/springframework/security/saml2/provider/service/authentication/OpenSaml4AuthenticationProvider.java index ab246094b7..92ece427ce 100644 --- a/saml2/saml2-service-provider/src/opensaml4Main/java/org/springframework/security/saml2/provider/service/authentication/OpenSaml4AuthenticationProvider.java +++ b/saml2/saml2-service-provider/src/opensaml4Main/java/org/springframework/security/saml2/provider/service/authentication/OpenSaml4AuthenticationProvider.java @@ -559,7 +559,7 @@ public final class OpenSaml4AuthenticationProvider implements AuthenticationProv if (result.hasErrors()) { Collection errors = result.getErrors(); - if (this.logger.isDebugEnabled()) { + if (this.logger.isTraceEnabled()) { this.logger.debug("Found " + errors.size() + " validation errors in SAML response [" + response.getID() + "]: " + errors); }