Merge branch 'hotfix-6.0.7' into stable

pixl8 · Dec 10, 2024 · 4eb9b42 · 4eb9b42
2 parents 614e017 + a6eec69
commit 4eb9b42
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## v6.0.7
+
+* Fix for RequestedAuthnContext and AuthnContextClassRef being the wrong way around in built SAML requests
+
 ## v6.0.6
 
 * Github build fixes

diff --git a/services/saml/request/SamlRequestBuilder.cfc b/services/saml/request/SamlRequestBuilder.cfc
@@ -23,8 +23,8 @@ component {
 		, required string nameIdFormat
 		, required string privateSigningKey
 		, required string publicSigningCert
-		,          string acClassRef        = "exact" // backward compat
-		,          string acClassComparison = "urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport"
+		,          string acClassRef        = "urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport"
+		,          string acClassComparison = "exact" // backward compat
 	) {
 		var nowish  = getInstant();
 		var xml  = _getXmlHeader();

diff --git a/tests/unit/SamlIdentityProviderServiceTest.cfc b/tests/unit/SamlIdentityProviderServiceTest.cfc
@@ -96,8 +96,8 @@ component extends="testbox.system.BaseSpec" {
 				, postAuthHandler   = "some.handler"
 				, entityIdSuffix    = ""
 				, loginUrl          = "/test/"
-				, acClassRef        = "exact"
-				, acClassComparison = "test"
+				, acClassRef        = "test"
+				, acClassComparison = "exact"
 			},
 			"JumpCloud" : {}
 		};