samlesa 4.7.4 → 4.7.5

package/build/src/libsamlSoap.js

@@ -15,6 +15,64 @@ function toNodeArray(result) {
     }
     return [];
 }
+function isElementNode(node) {
+    return !!node && node.nodeType === 1;
+}
+function isNamespaceDeclaration(attributeName) {
+    return attributeName === 'xmlns' || attributeName.startsWith('xmlns:');
+}
+function getNamespaceDeclarationMap(node) {
+    const declarations = new Map();
+    const attributes = node.attributes;
+    for (let index = 0; index < attributes.length; index += 1) {
+        const attribute = attributes.item(index);
+        if (attribute && isNamespaceDeclaration(attribute.name)) {
+            declarations.set(attribute.name, attribute.value);
+        }
+    }
+    return declarations;
+}
+function collectInheritedNamespaceDeclarations(node) {
+    const inheritedDeclarations = new Map();
+    let current = node.parentNode;
+    while (isElementNode(current)) {
+        for (const [name, value] of getNamespaceDeclarationMap(current)) {
+            if (!inheritedDeclarations.has(name)) {
+                inheritedDeclarations.set(name, value);
+            }
+        }
+        current = current.parentNode;
+    }
+    return inheritedDeclarations;
+}
+function escapeAttributeValue(value) {
+    return value
+        .replace(/&/g, '&amp;')
+        .replace(/"/g, '&quot;')
+        .replace(/</g, '&lt;')
+        .replace(/>/g, '&gt;');
+}
+function rootHasNamespaceDeclaration(serializedXml, name) {
+    const rootStartTag = serializedXml.match(/^<[^>]+>/)?.[0] || '';
+    return new RegExp(`(?:^|\\s)${name.replace(':', '\\:')}\\s*=`).test(rootStartTag);
+}
+function serializeWithInheritedNamespaces(node) {
+    if (!isElementNode(node)) {
+        return node.toString();
+    }
+    let serializedXml = node.toString();
+    const declarationsToAdd = [];
+    for (const [name, value] of collectInheritedNamespaceDeclarations(node)) {
+        if (!rootHasNamespaceDeclaration(serializedXml, name)) {
+            declarationsToAdd.push(`${name}="${escapeAttributeValue(value)}"`);
+        }
+    }
+    if (declarationsToAdd.length === 0) {
+        return serializedXml;
+    }
+    serializedXml = serializedXml.replace(/^<([^\s/>]+)([^>]*)>/, (_match, tagName, attributes) => `<${tagName} ${declarationsToAdd.join(' ')}${attributes}>`);
+    return serializedXml;
+}
 const certUse = wording.certUse;
 const docParser = new DOMParser();
 function resolvePublicCertificates(signatureNode, opts) {
@@ -44,7 +102,7 @@ function extractResolvedMessage(rootNode) {
     if (resolvedNodes.length === 0) {
         return null;
     }
-    return resolvedNodes[0].toString();
+    return serializeWithInheritedNamespaces(resolvedNodes[0]);
 }
 function verifySignature(xml, signatureNodes, opts) {
     for (const signatureNode of signatureNodes) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "samlesa",
-  "version": "4.7.4",
+  "version": "4.7.5",
   "description": "High-level API for Single Sign On (SAML 2.0) baseed on samlify ",
   "main": "build/index.js",
   "keywords": [

package/types/src/libsamlSoap.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"libsamlSoap.d.ts","sourceRoot":"","sources":["../../src/libsamlSoap.ts"],"names":[],"mappings":"AAKA,OAAgB,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAC;AAiBjE,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,OAAO,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,iBAAiB,GAAG,kBAAkB,CAAC;IAC7C,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC/B;AA4HD,iBAAe,2BAA2B,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,wBAAwB,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAoCpH;;;;AAED,wBAEE"}
+{"version":3,"file":"libsamlSoap.d.ts","sourceRoot":"","sources":["../../src/libsamlSoap.ts"],"names":[],"mappings":"AAKA,OAAgB,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAC;AA2FjE,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,OAAO,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,iBAAiB,GAAG,kBAAkB,CAAC;IAC7C,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC/B;AA4HD,iBAAe,2BAA2B,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,wBAAwB,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAoCpH;;;;AAED,wBAEE"}