Refactor inclusive namespaces to happen in canonicalization code

Author: bazzadp

lib/exclusive-canonicalization.js

@@ -199,6 +199,36 @@ ExclusiveCanonicalization.prototype.process = function(node, options) {
   var defaultNsForPrefix = options.defaultNsForPrefix || {};
   if (!(inclusiveNamespacesPrefixList instanceof Array)) { inclusiveNamespacesPrefixList = inclusiveNamespacesPrefixList.split(' '); }
 
+  var ancestorNamespaces = options.ancestorNamespaces || [];
+  
+  /**
+   * Get the InclusiveNamespaces PrefixList
+   */
+  var inclusiveNamespacesPrefixList  = options.inclusiveNamespacesPrefixList || [];
+  var CanonicalizationMethod = utils.findChilds(node, "CanonicalizationMethod")
+  if (CanonicalizationMethod.length!=0) {
+    var inclusiveNamespaces = utils.findChilds(CanonicalizationMethod[0], "InclusiveNamespaces")
+    if (inclusiveNamespaces.length!=0) {
+      inclusiveNamespacesPrefixList = inclusiveNamespaces[0].getAttribute('PrefixList').split(" ");
+	}
+  }
+  
+  /**
+   * If you have a PrefixList then use it and the ancestors to add the necessary namespaces
+   */
+    if (inclusiveNamespacesPrefixList) {
+      var prefixList = inclusiveNamespacesPrefixList instanceof Array ? inclusiveNamespacesPrefixList : inclusiveNamespacesPrefixList.split(' ');
+      prefixList.forEach(function (prefix) {
+        if (ancestorNamespaces)  {
+          ancestorNamespaces.forEach(function (ancestorNamespace) {
+            if (prefix == ancestorNamespace.prefix) {
+              node.setAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns:' + prefix, ancestorNamespace.namespaceURI);
+            }
+          })
+        }
+      })
+    }
+
   var res = this.processInner(node, [], defaultNs, defaultNsForPrefix, inclusiveNamespacesPrefixList);
   return res;
 };

lib/signed-xml.js

@@ -368,45 +368,18 @@ SignedXml.prototype.validateSignatureValue = function(doc) {
       throw new Error("When canonicalization method is non-exclusive, whole xml dom must be provided as an argument");
     }
   }
-	
-  /**
-   * Get the InclusiveNamespaces PrefixList
-   */
-  var inclusiveNamespacesPrefixList
-  var CanonicalizationMethod = utils.findChilds(signedInfo[0], "CanonicalizationMethod")
-  if (CanonicalizationMethod.length!=0) {
-    var inclusiveNamespaces = utils.findChilds(CanonicalizationMethod[0], "InclusiveNamespaces")
-    if (inclusiveNamespaces.length!=0) {
-      inclusiveNamespacesPrefixList = inclusiveNamespaces[0].getAttribute('PrefixList').split(" ");
-	}
-  }
 
   /**
    * Search for ancestor namespaces before validating signature.
    */
   var ancestorNamespaces = [];
   ancestorNamespaces = findAncestorNs(doc, "//*[local-name()='SignedInfo']");
 
-  /**
-   * If you have a PrefixList then use it and the ancestors to add the necessary namespaces
-   */
-  if (inclusiveNamespacesPrefixList) {
-    inclusiveNamespacesPrefixList.forEach(function(inclusiveNamespacesPrefix) {
-      ancestorNamespaces.forEach(function (ancestorNamespace) {
-        if (inclusiveNamespacesPrefix == ancestorNamespace.prefix) {
-          signedInfo[0].setAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns:' + ancestorNamespace.prefix, ancestorNamespace.namespaceURI);
-        }
-      })
-    })
-  }
-  
   var c14nOptions = {
-    ancestorNamespaces: ancestorNamespaces,
-    inclusiveNamespacesPrefixList: inclusiveNamespacesPrefixList
+    ancestorNamespaces: ancestorNamespaces
   };
   var signedInfoCanon = this.getCanonXml([this.canonicalizationAlgorithm], signedInfo[0], c14nOptions)
   var signer = this.findSignatureAlgorithm(this.signatureAlgorithm)
-  
   var res = signer.verifySignature(signedInfoCanon, this.signingKey, this.signatureValue)
   if (!res) this.validationErrors.push("invalid signature: the signature value " +
                                         this.signatureValue + " is incorrect")
@@ -486,19 +459,6 @@ SignedXml.prototype.validateReferences = function(doc) {
       inclusiveNamespacesPrefixList: ref.inclusiveNamespacesPrefixList,
       ancestorNamespaces: ref.ancestorNamespaces
     };
-
-    if (ref.inclusiveNamespacesPrefixList) {
-      var prefixList = ref.inclusiveNamespacesPrefixList instanceof Array ? ref.inclusiveNamespacesPrefixList : ref.inclusiveNamespacesPrefixList.split(' ');
-      prefixList.forEach(function (prefix) {
-        if (ref.ancestorNamespaces)  {
-          ref.ancestorNamespaces.forEach(function (ancestorNamespace) {
-            if (prefix == ancestorNamespace.prefix) {
-              elem[0].setAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns:' + prefix, ancestorNamespace.namespaceURI);
-            }
-          })
-        }
-      })
-    }
 
     var canonXml = this.getCanonXml(ref.transforms, elem[0], c14nOptions);