Fixed an issue w #list decorator of xmlbuilder (deprecated since ages).

This commit is contained in:
Steffo Weber 2017-05-17 21:55:10 +02:00
parent 369c5290f7
commit 939671c3f7
3 changed files with 21 additions and 60 deletions

View file

@ -227,49 +227,15 @@
}
}
},
"xml-encryption": {
"version": "0.10.0",
"resolved": "https://registry.npmjs.org/xml-encryption/-/xml-encryption-0.10.0.tgz",
"from": "xml-encryption@0.10.0",
"dependencies": {
"async": {
"version": "0.2.10",
"resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz",
"from": "async@>=0.2.7 <0.3.0"
},
"ejs": {
"version": "0.8.8",
"resolved": "https://registry.npmjs.org/ejs/-/ejs-0.8.8.tgz",
"from": "ejs@>=0.8.3 <0.9.0"
},
"node-forge": {
"version": "0.6.38",
"resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.6.38.tgz",
"from": "node-forge@0.6.38"
},
"xpath": {
"version": "0.0.5",
"resolved": "https://registry.npmjs.org/xpath/-/xpath-0.0.5.tgz",
"from": "xpath@0.0.5"
}
}
},
"xml2js": {
"version": "0.4.17",
"resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.17.tgz",
"from": "xml2js@0.4.17",
"dependencies": {
"xmlbuilder": {
"version": "4.2.1",
"resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-4.2.1.tgz",
"from": "xmlbuilder@>=4.1.0 <5.0.0"
}
}
"from": "xml2js@0.4.17"
},
"xmlbuilder": {
"version": "8.2.2",
"resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-8.2.2.tgz",
"from": "xmlbuilder@8.2.2"
"version": "4.2.1",
"resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-4.2.1.tgz",
"from": "xmlbuilder@>=4.1.0 <5.0.0"
},
"xmldom": {
"version": "0.1.27",

View file

@ -23,6 +23,7 @@ Package.onTest((api) => {
Npm.depends({
"depd": "1.1.0",
"xml-crypto": "0.9.0",
"bytes": "2.5.0",
"content-type": "1.0.2",
"debug": "2.6.3",
@ -43,7 +44,7 @@ Npm.depends({
"xml2js": "0.4.17",
"body-parser": "1.17.1",
"sax": "1.2.2",
"xmlbuilder": "8.2.2",
"xmlbuilder": "9.0.0",
"ejs": "2.5.6",
"async": "2.3.0",
"lodash":"4.17.4",
@ -52,7 +53,13 @@ Npm.depends({
"xpath.js": "1.0.7",
"xmldom": "0.1.27",
"connect": "3.6.0",
"querystring": "0.2.0",
"xml-encryption": "0.10.0",
"xml-crypto": "0.9.0"
"querystring": "0.2.0"
// "xml-encryption": "0.10.0"
});
// Npm.depends({
// "depd": "1.1.0",
// "xml-crypto": "0.9.0",
// "xmlbuilder": "9.0.0",
// "xml2js": "0.4.17"
// });

View file

@ -485,24 +485,12 @@ SAML.prototype.generateServiceProviderMetadata = function(callbackUrl) {
}
}
},
'#list': [
// this should be the set that the xmlenc library supports
{
'EncryptionMethod': {
'@Algorithm': 'http://www.w3.org/2001/04/xmlenc#aes256-cbc'
}
},
{
'EncryptionMethod': {
'@Algorithm': 'http://www.w3.org/2001/04/xmlenc#aes128-cbc'
}
},
{
'EncryptionMethod': {
'@Algorithm': 'http://www.w3.org/2001/04/xmlenc#tripledes-cbc'
}
}
]
'EncryptionMethod': [
// this should be the set that the xmlenc library supports
{'@Algorithm': 'http://www.w3.org/2001/04/xmlenc#aes256-cbc'},
{'@Algorithm': 'http://www.w3.org/2001/04/xmlenc#aes128-cbc'},
{'@Algorithm': 'http://www.w3.org/2001/04/xmlenc#tripledes-cbc'}
]
};
}