Skip to content

Attribute array of values #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
smoufa wants to merge 7 commits into
base: stable
Choose a base branch
from
Open

Attribute array of values #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
873f1dd
Merge remote-tracking branch 'upstream/stable' into stable
smoufa May 9, 2025
ccd37d2
Merge remote-tracking branch 'upstream/stable' into stable
smoufa Sep 17, 2025
a43e373
SAML-26: Return multiple AttributeValues if array of values is found
smoufa Sep 17, 2025
0163ab7
SAML-26: Fix issue with test
smoufa Sep 17, 2025
d01121f
SAML-26: Fix test
smoufa Sep 17, 2025
1c9be87
SAML-26: Refactor test
smoufa Sep 17, 2025
34e8b80
SAML-26: Add tests
smoufa Sep 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion services/saml/response/SamlResponseBuilder.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,8 +235,14 @@ component {
} else {
xml &= '<saml:Attribute Name="#key#">';
}
if ( IsArray( arguments.attributes[ key ] ) ) {
for ( var val in arguments.attributes[ key ] ) {
xml &= '<saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xs:string">#XmlFormat( val )#</saml:AttributeValue>';
}
} else {
xml &= '<saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xs:string">#XmlFormat( arguments.attributes[ key ] )#</saml:AttributeValue>';
}

xml &= '<saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xs:string">#XmlFormat( arguments.attributes[ key ] )#</saml:AttributeValue>';
xml &= '</saml:Attribute>';
}

Expand Down
41 changes: 41 additions & 0 deletions tests/unit/ResponseBuilderTest.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,47 @@ component extends="testbox.system.BaseSpec" {
fail( "SAML did not validate" );
}
} );

it( "should include one AttributeValue element when attribute is a string with a single value", function(){
var builder = _getBuilder();
var response = builder.buildAuthenticationAssertion(
issuer = "http://www.thewebsite.com/"
, nameIdFormat = "urn:oasis:names:tc:SAML:2.0:nameid-format:persistent"
, nameIdValue = "test@test.com"
, inResponseTo = "aaf23196-1773-2113-474a-fe114412ab72"
, recipientUrl = "https://sp.example.com/SAML2/SSO/POST"
, audience = "https://sp.example.com/SAML2"
, sessionTimeout = 30
, sessionIndex = "C894146D-598F-4D9B-8733ACF80280C4B7"
, attributes = { expertise = "admin" }
, privateKey = testPk
, publicCertificate = testCert
);

var matches = ReMatchNoCase( "<(?:[A-Za-z0-9-]+:)?AttributeValue[ >]", response );
expect( ArrayLen( matches ) ).toBe( 1 );
} );

it( "should include two AttributeValue elements when attribute has multiple values", function(){
var builder = _getBuilder();
var response = builder.buildAuthenticationAssertion(
issuer = "http://www.thewebsite.com/"
, nameIdFormat = "urn:oasis:names:tc:SAML:2.0:nameid-format:persistent"
, nameIdValue = "test@test.com"
, inResponseTo = "aaf23196-1773-2113-474a-fe114412ab72"
, recipientUrl = "https://sp.example.com/SAML2/SSO/POST"
, audience = "https://sp.example.com/SAML2"
, sessionTimeout = 30
, sessionIndex = "C894146D-598F-4D9B-8733ACF80280C4B7"
, attributes = { expertise=[ "admin", "expert" ] }
, privateKey = testPk
, publicCertificate = testCert
);

var matches = ReMatchNoCase( "<(?:[A-Za-z0-9-]+:)?AttributeValue[ >]", response );
expect( ArrayLen( matches ) ).toBe( 2 );
} );

} );

describe( "buildErrorResponse()", function(){
Expand Down