Skip to content
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

Jump to bottom

fix: attrValueMapper fails to parse complex AttributeValue tags (#245) #427

Closed
wants to merge 1 commit into from
Closed

fix: attrValueMapper fails to parse complex AttributeValue tags (#245) #427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 14 additions & 6 deletions lib/passport-saml/saml.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1008,10 +1008,6 @@ SAML.prototype.processValidlySignedAssertion = function(xml, samlResponseXml, in
.map(attr => attr.Attribute)
);

var attrValueMapper = function(value) {
return typeof value === 'string' ? value : value._;
};

if (attributes) {
attributes.forEach(attribute => {
if(!Object.prototype.hasOwnProperty.call(attribute, 'AttributeValue')) {
Expand All @@ -1020,9 +1016,9 @@ SAML.prototype.processValidlySignedAssertion = function(xml, samlResponseXml, in
}
var value = attribute.AttributeValue;
if (value.length === 1) {
profile[attribute.$.Name] = attrValueMapper(value[0]);
profile[attribute.$.Name] = this.attributeValueMapper(value[0]);
} else {
profile[attribute.$.Name] = value.map(attrValueMapper);
profile[attribute.$.Name] = value.map(this.attributeValueMapper);
}
});
}
Expand Down Expand Up @@ -1305,4 +1301,16 @@ SAML.prototype.keyToPEM = function (key) {
return wrappedKey;
};

SAML.prototype.attributeValueMapper = function (value) {
if(typeof value === 'string') {
return value;
} else if (typeof value._ === 'string') {
return value._;
} else if (value.NameID && value.NameID[0]) {
return Object.assign({
Value: value.NameID[0]._
}, value.NameID[0].$ || {});
}
};

exports.SAML = SAML;
109 changes: 109 additions & 0 deletions test/static/attributes-values-sample.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
module.exports = [
{
$: {
FriendlyName: "mail",
Name: "urn:oid:0.9.2342.19200300.100.1.3",
NameFormat: "urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
},
AttributeValue: [
{
_: "example-user@example-university.edu",
$: {
"xmlns:xsd": "http://www.w3.org/2001/XMLSchema",
"xmlns:xsi": "http://www.w3.org/2001/XMLSchema-instance",
"xsi:type": "xsd:string"
}
}
]
},
{
$: {
FriendlyName: "eduPersonTargetedID",
Name: "urn:oid:1.3.6.1.4.1.5923.1.1.1.10",
NameFormat: "urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
},
AttributeValue: [
{
NameID: [
{
_: "SBJMMcDv00BWSefyNqumyK0A+Jb=",
$: {
Format: "urn:oasis:names:tc:SAML:2.0:nameid-format:persistent",
NameQualifier:
"https://idp.example-university.edu/idp/shibboleth",
SPNameQualifier: "https://www.example-service-provider.com/entity"
}
}
]
}
]
},
{
$: {
FriendlyName: "eduPersonPrimaryAffiliation",
Name: "urn:oid:1.3.6.1.4.1.5923.1.1.1.5",
NameFormat: "urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
},
AttributeValue: [
{
_: "staff",
$: {
"xmlns:xsd": "http://www.w3.org/2001/XMLSchema",
"xmlns:xsi": "http://www.w3.org/2001/XMLSchema-instance",
"xsi:type": "xsd:string"
}
}
]
},
{
$: {
FriendlyName: "displayName",
Name: "urn:oid:2.16.840.1.113730.3.1.241",
NameFormat: "urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
},
AttributeValue: [
{
_: "Smith John",
$: {
"xmlns:xsd": "http://www.w3.org/2001/XMLSchema",
"xmlns:xsi": "http://www.w3.org/2001/XMLSchema-instance",
"xsi:type": "xsd:string"
}
}
]
},
{
$: {
FriendlyName: "givenName",
Name: "urn:oid:2.5.4.42",
NameFormat: "urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
},
AttributeValue: [
{
_: "John",
$: {
"xmlns:xsd": "http://www.w3.org/2001/XMLSchema",
"xmlns:xsi": "http://www.w3.org/2001/XMLSchema-instance",
"xsi:type": "xsd:string"
}
}
]
},
{
$: {
FriendlyName: "surname",
Name: "urn:oid:2.5.4.4",
NameFormat: "urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
},
AttributeValue: [
{
_: "Smith",
$: {
"xmlns:xsd": "http://www.w3.org/2001/XMLSchema",
"xmlns:xsi": "http://www.w3.org/2001/XMLSchema-instance",
"xsi:type": "xsd:string"
}
}
]
}
];
41 changes: 41 additions & 0 deletions test/tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ var parseString = require( 'xml2js' ).parseString;
var SAML = require( '../lib/passport-saml/index.js' ).SAML;
var fs = require( 'fs' );
var sinon = require('sinon');
var attributes = require( './static/attributes-values-sample.js' );

// a certificate which is re-used by several tests
var TEST_CERT = 'MIIEFzCCAv+gAwIBAgIUFJsUjPM7AmWvNtEvULSHlTTMiLQwDQYJKoZIhvcNAQEFBQAwWDELMAkGA1UEBhMCVVMxETAPBgNVBAoMCFN1YnNwYWNlMRUwEwYDVQQLDAxPbmVMb2dpbiBJZFAxHzAdBgNVBAMMFk9uZUxvZ2luIEFjY291bnQgNDIzNDkwHhcNMTQwNTEzMTgwNjEyWhcNMTkwNTE0MTgwNjEyWjBYMQswCQYDVQQGEwJVUzERMA8GA1UECgwIU3Vic3BhY2UxFTATBgNVBAsMDE9uZUxvZ2luIElkUDEfMB0GA1UEAwwWT25lTG9naW4gQWNjb3VudCA0MjM0OTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKrAzJdY9FzFLt5blArJfPzgi87EnFGlTfcV5T1TUDwLBlDkY/0ZGKnMOpf3D7ie2C4pPFOImOogcM5kpDDL7qxTXZ1ewXVyjBdMu29NG2C6NzWeQTUMUji01EcHkC8o+Pts8ANiNOYcjxEeyhEyzJKgEizblYzMMKzdrOET6QuqWo3C83K+5+5dsjDn1ooKGRwj3HvgsYcFrQl9NojgQFjoobwsiE/7A+OJhLpBcy/nSVgnoJaMfrO+JsnukZPztbntLvOl56+Vra0N8n5NAYhaSayPiv/ayhjVgjfXd1tjMVTOiDknUOwizZuJ1Y3QH94vUtBgp0WBpBSs/xMyTs8CAwEAAaOB2DCB1TAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBRQO4WpM5fWwxib49WTuJkfYDbxODCBlQYDVR0jBIGNMIGKgBRQO4WpM5fWwxib49WTuJkfYDbxOKFcpFowWDELMAkGA1UEBhMCVVMxETAPBgNVBAoMCFN1YnNwYWNlMRUwEwYDVQQLDAxPbmVMb2dpbiBJZFAxHzAdBgNVBAMMFk9uZUxvZ2luIEFjY291bnQgNDIzNDmCFBSbFIzzOwJlrzbRL1C0h5U0zIi0MA4GA1UdDwEB/wQEAwIHgDANBgkqhkiG9w0BAQUFAAOCAQEACdDAAoaZFCEY5pmfwbKuKrXtO5iE8lWtiCPjCZEUuT6bXRNcqrdnuV/EAfX9WQoXjalPi0eM78zKmbvRGSTUHwWw49RHjFfeJUKvHNeNnFgTXDjEPNhMvh69kHm453lFRmB+kk6yjtXRZaQEwS8Uuo2Ot+krgNbl6oTBZJ0AHH1MtZECDloms1Km7zsK8wAi5i8TVIKkVr5b2VlhrLgFMvzZ5ViAxIMGB6w47yY4QGQB/5Q8ya9hBs9vkn+wubA+yr4j14JXZ7blVKDSTYva65Ea+PqHyrp+Wnmnbw2ObS7iWexiTy1jD3G0R2avDBFjM8Fj5DbfufsE1b0U10RTtg==';
Expand Down Expand Up @@ -2497,5 +2498,45 @@ describe( 'passport-saml /', function() {
});
});
});

describe('attributeValueMapper', function(done) {
var samlObj;
beforeEach(function() {
samlObj = new SAML();
});

it('correctly maps the attribute values', function(done) {
var profile = {};

attributes.forEach(attribute => {
if(!Object.prototype.hasOwnProperty.call(attribute, 'AttributeValue')) {
// if attributes has no AttributeValue child, continue
return;
}
var value = attribute.AttributeValue;
if (value.length === 1) {
profile[attribute.$.Name] = samlObj.attributeValueMapper(value[0]);
} else {
profile[attribute.$.Name] = value.map(samlObj.attributeValueMapper);
}
});

profile.should.eql({
'urn:oid:0.9.2342.19200300.100.1.3': 'example-user@example-university.edu',
'urn:oid:1.3.6.1.4.1.5923.1.1.1.10': {
Format: 'urn:oasis:names:tc:SAML:2.0:nameid-format:persistent',
NameQualifier: 'https://idp.example-university.edu/idp/shibboleth',
SPNameQualifier: 'https://www.example-service-provider.com/entity',
Value: 'SBJMMcDv00BWSefyNqumyK0A+Jb='
},
'urn:oid:1.3.6.1.4.1.5923.1.1.1.5': 'staff',
'urn:oid:2.16.840.1.113730.3.1.241': 'Smith John',
'urn:oid:2.5.4.4': 'Smith',
'urn:oid:2.5.4.42': 'John'
});

done();
});
})
});
});