Merge commit 'a94fbfa730dd0aca0e0fa2cedcbabbea1765aee6' into session-…

…url-params

* commit 'a94fbfa730dd0aca0e0fa2cedcbabbea1765aee6':
  Upd: Mention ADFS 2016 with NameIDFormatError. (node-saml#242)
  Support multiple and dynamic signing certificates (node-saml#218)

README.md

@@ -139,6 +139,18 @@ If you have a certificate in the binary DER encoding, you can convert it to the
      openssl x509 -inform der -in my_certificate.cer -out my_certificate.pem
 ````
 
+If the Identity Provider has multiple signing certificates that are valid (such as during the rolling from an old key to a new key and responses signed with either key are valid) then the `cert` configuration key can be an array:
+
+```javascript
+    cert: [ 'MIICizCCAfQCCQCY8tKaMc0BMjANBgkqh ... W==', 'MIIEOTCCAyGgAwIBAgIJAKZgJdKdCdL6M ... g=' ]
+```
+
+The `cert` configuration key can also be a function that receives a callback as argument calls back a possible error and a  certificate or array of certificates.  This allows the Identity Provider to be polled for valid certificates and the new certificate can be used if it is changed:
+
+```javascript
+    cert: function(callback) { callback(null,polledCertificates); }
+```
+
 ## Usage with Active Directory Federation Services
 
 Here is a configuration that has been proven to work with ADFS:

docs/adfs/README.md

@@ -109,3 +109,19 @@ module.exports = passport;
 
   var server = http.createServer(app);
 ```
+# Troubleshooting
+
+## ADFS 2016
+
+If you are setting up an ADFS 2016 server, you might run into the following issue with the previous settings:
+
+```
+An error occurred during an attempt to read the federation metadata. Verify that the specified URL or host name is a valid federation metadata endpoint.
+
+Verify your proxy server setting. For more information about how to verify you proxy sever setting, see the AD FS Troubleshooting Guide http://go.microsoft.com/fwlink/?LinkId=182180).
+Error message: EntityDescriptor 'acme_tools_com'. ID0014: The value 'NamelDFormat' must be an absolute URI.
+```
+
+![NamelDFormat Error Popup](./NameIDFormatError.jpg)
+
+If you remove the `identifierFormat`, it works as expected.

lib/passport-saml/saml.js

@@ -469,12 +469,33 @@ SAML.prototype.certToPEM = function (cert) {
   return cert;
 };
 
+SAML.prototype.certsToCheck = function () {
+  var self = this;
+  if (!self.options.cert) {
+    return Q();
+  }
+  if (typeof(self.options.cert) === 'function') {
+    return Q.nfcall(self.options.cert)
+    .then(function(certs) {
+      if (!Array.isArray(certs)) {
+        certs = [certs];
+      }
+      return Q(certs);
+    });
+  }
+  var certs = self.options.cert;
+  if (!Array.isArray(certs)) {
+    certs = [certs];
+  }
+  return Q(certs);
+};
+
 // This function checks that the |currentNode| in the |fullXml| document contains exactly 1 valid
 //   signature of the |currentNode|.
 //
 // See https://github.com/bergie/passport-saml/issues/19 for references to some of the attack
 //   vectors against SAML signature verification.
-SAML.prototype.validateSignature = function (fullXml, currentNode, cert) {
+SAML.prototype.validateSignature = function (fullXml, currentNode, certs) {
   var self = this;
   var xpathSigQuery = ".//*[local-name(.)='Signature' and " +
                       "namespace-uri(.)='http://www.w3.org/2000/09/xmldsig#']";
@@ -484,6 +505,14 @@ SAML.prototype.validateSignature = function (fullXml, currentNode, cert) {
   if (signatures.length != 1)
     return false;
   var signature = signatures[0];
+  return certs.some(function (certToCheck) {
+    return self.validateSignatureForCert(signature, certToCheck, fullXml, currentNode);
+  });
+};
+
+// This function checks that the |signature| is signed with a given |cert|.
+SAML.prototype.validateSignatureForCert = function (signature, cert, fullXml, currentNode) {
+  var self = this;
   var sig = new xmlCrypto.SignedXml();
   sig.keyInfoProvider = {
     getKeyInfo: function (key) {
@@ -546,9 +575,12 @@ SAML.prototype.validatePostResponse = function (container, callback) {
     }
   })
   .then(function() {
+    return self.certsToCheck();
+  })
+  .then(function(certs) {
     // Check if this document has a valid top-level signature
     var validSignature = false;
-    if (self.options.cert && self.validateSignature(xml, doc.documentElement, self.options.cert)) {
+    if (self.options.cert && self.validateSignature(xml, doc.documentElement, certs)) {
       validSignature = true;
     }
 
@@ -565,7 +597,7 @@ SAML.prototype.validatePostResponse = function (container, callback) {
     if (assertions.length == 1) {
       if (self.options.cert &&
           !validSignature &&
-          !self.validateSignature(xml, assertions[0], self.options.cert)) {
+          !self.validateSignature(xml, assertions[0], certs)) {
         throw new Error('Invalid signature');
       }
       return self.processValidlySignedAssertion(assertions[0].toString(), inResponseTo, callback);
@@ -587,7 +619,7 @@ SAML.prototype.validatePostResponse = function (container, callback) {
 
           if (self.options.cert &&
               !validSignature &&
-              !self.validateSignature(decryptedXml, decryptedAssertions[0], self.options.cert))
+              !self.validateSignature(decryptedXml, decryptedAssertions[0], certs))
             throw new Error('Invalid signature');
 
           self.processValidlySignedAssertion(decryptedAssertions[0].toString(), inResponseTo, callback);
@@ -859,12 +891,18 @@ SAML.prototype.validatePostRequest = function (container, callback) {
       return callback(err);
     }
 
-    // Check if this document has a valid top-level signature
-    if (self.options.cert && !self.validateSignature(xml, dom.documentElement, self.options.cert)) {
-      return callback(new Error('Invalid signature'));
-    }
+    self.certsToCheck()
+    .then(function(certs) {
+      // Check if this document has a valid top-level signature
+      if (self.options.cert && !self.validateSignature(xml, dom.documentElement, certs)) {
+        return callback(new Error('Invalid signature'));
+      }
 
-    processValidlySignedPostRequest(self, doc, callback);
+      processValidlySignedPostRequest(self, doc, callback);
+    })
+    .fail(function(err) {
+      callback(err);
+    })
   });
 };