scimgateway 6.2.6 → 6.2.7

package/lib/saml/xml/sign.js

@@ -0,0 +1,104 @@
+const utils = require('../utils');
+const SignedXml = require('xml-crypto').SignedXml;
+
+const algorithms = {
+  signature: {
+    'rsa-sha256': 'http://www.w3.org/2001/04/xmldsig-more#rsa-sha256',
+    'rsa-sha1': 'http://www.w3.org/2000/09/xmldsig#rsa-sha1'
+  },
+  digest: {
+    'sha256': 'http://www.w3.org/2001/04/xmlenc#sha256',
+    'sha1': 'http://www.w3.org/2000/09/xmldsig#sha1'
+  }
+};
+
+exports.fromSignXmlOptions = function (options) {
+  if (!options.key)
+    throw new Error('Expect a private key in pem format');
+
+  if (!options.cert)
+    throw new Error('Expect a public key cert in pem format');
+
+  if (!options.xpathToNodeBeforeSignature)
+    throw new Error('xpathToNodeBeforeSignature is required')
+
+  const key = options.key;
+  const pem = options.cert;
+  const signatureAlgorithm = options.signatureAlgorithm || 'rsa-sha256';
+  const digestAlgorithm = options.digestAlgorithm || 'sha256';
+  const signatureNamespacePrefix = (function (prefix) {
+    // 0.10.1 added prefix, but we want to name it signatureNamespacePrefix - This is just to keep supporting prefix
+    return typeof prefix === 'string' ? prefix : '';
+  })(options.signatureNamespacePrefix || options.prefix);
+  const xpathToNodeBeforeSignature = options.xpathToNodeBeforeSignature;
+  const idAttribute = options.signatureIdAttribute;
+
+  /**
+   * @param {Document} doc
+   * @param {Function} [callback]
+   * @return {string}
+   */
+  return function signXmlDocument(doc, callback) {
+    function sign(key) {
+      const unsigned = exports.unsigned(doc);
+      const cert = utils.pemToCert(pem);
+
+      const sig = new SignedXml(null, {
+        signatureAlgorithm: algorithms.signature[signatureAlgorithm],
+        idAttribute: idAttribute
+      });
+      sig.addReference("//*[local-name(.)='Assertion']",
+          ["http://www.w3.org/2000/09/xmldsig#enveloped-signature", "http://www.w3.org/2001/10/xml-exc-c14n#"],
+          algorithms.digest[digestAlgorithm]);
+
+      sig.signingKey = key;
+
+      sig.keyInfoProvider = {
+        getKeyInfo: function (key, prefix) {
+          prefix = prefix ? prefix + ':' : prefix;
+          return "<" + prefix + "X509Data><" + prefix + "X509Certificate>" + cert + "</" + prefix + "X509Certificate></" + prefix + "X509Data>";
+        }
+      };
+
+      sig.computeSignature(unsigned, {
+        location: {reference: xpathToNodeBeforeSignature, action: 'after'},
+        prefix: signatureNamespacePrefix
+      });
+
+      return sig.getSignedXml();
+    }
+
+    let signed
+    try {
+      try {
+        signed = sign(key)
+      } catch (err) {
+        signed = sign(utils.fixPemFormatting(key))
+      }
+
+      if (callback) {
+        setImmediate(callback, null, signed);
+      } else {
+        return signed;
+      }
+    } catch (e) {
+      if (callback) {
+        setImmediate(callback, e)
+      }
+      throw e
+    }
+  };
+};
+/**
+ * @param {Document} doc
+ * @param {Function} [callback]
+ * @return {string}
+ */
+exports.unsigned = function (doc, callback) {
+  const xml = utils.removeWhitespace(doc.toString());
+  if (callback) {
+    setImmediate(callback, null, xml)
+  } else {
+    return xml;
+  }
+}

package/lib/samlAssertion.ts

@@ -26,8 +26,7 @@
 // SOFTWARE.
 //
 
-// @ts-expect-error type declaration file not found
-import { Saml20 as saml } from 'saml'
+import { Saml20 as saml } from './saml/index.js' // The `saml` entry in `package.json` must be kept — it provides the sub-dependencies (@xmldom/xmldom, moment, xml-crypto, etc.) that this local copy requires.
 import crypto from 'node:crypto'
 
 export const samlAssertionUtils = {

package/lib/scimgateway.ts

@@ -25,6 +25,8 @@ import * as utils from './utils.ts'
 import * as utilsScim from './utils-scim.ts'
 import * as stream from './scim-stream.js'
 export * from './helper-rest.ts'
+import LicenseData from './azure-license-mapping.json'
+export { LicenseData }
 // @ts-expect-error: cannot find declaration
 import hycoPkg from 'hyco-https'
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "scimgateway",
-  "version": "6.2.6",
+  "version": "6.2.7",
   "type": "module",
   "description": "Using SCIM protocol as a gateway for user provisioning to other endpoints",
   "author": "Jarle Elshaug <jarle.elshaug@gmail.com> (https://elshaug.xyz)",