refactor(saml20): generalised and pulled EncryptXml out into ./xml/encrypt

Author: luuuis

lib/saml20.js

@@ -1,11 +1,12 @@
 var fs = require('fs');
 var path = require('path');
+var async = require('async');
 var Parser = require('xmldom').DOMParser;
-var xmlenc = require('xml-encryption');
 var moment = require('moment');
 var xmlNameValidator = require('xml-name-validator');
 var is_uri = require('valid-url').is_uri;
 
+var EncryptXml = require('./xml/encrypt');
 var SignXml = require('./xml/sign');
 var utils = require('./utils');
 
@@ -69,37 +70,6 @@ function extractSaml20Options(opts) {
   };
 }
 
-var EncryptXml = Object.freeze({
-  fromEncryptXmlOptions: function (options) {
-    if (!options.encryptionCert) {
-      return this.unencrypted;
-    } else {
-      return this.encrypted({
-        rsa_pub: options.encryptionPublicKey,
-        pem: options.encryptionCert,
-        encryptionAlgorithm: options.encryptionAlgorithm || 'http://www.w3.org/2001/04/xmlenc#aes256-cbc',
-        keyEncryptionAlgorighm: options.keyEncryptionAlgorighm || 'http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p'
-      })
-    }
-  },
-  unencrypted: function(xml, callback) {
-    if (callback) {
-      return setImmediate(callback, null, xml);
-    } else {
-      return xml;
-    }
-  },
-  encrypted: function (encryptOptions) {
-    return function encrypt(xml, callback) {
-      xmlenc.encrypt(xml, encryptOptions, function(err, encrypted) {
-        if (err) return callback(err);
-        encrypted = '<saml:EncryptedAssertion xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">' + encrypted + '</saml:EncryptedAssertion>';
-        callback(null, utils.removeWhitespace(encrypted));
-      });
-    };
-  }
-});
-
 /**
  * Creates a signed SAML 2.0 assertion from the given options.
  *
@@ -297,5 +267,17 @@ function createAssertion(options, strategies, callback) {
     return utils.reportError(err, callback);
   }
 
-  return strategies.encryptXml(signed, callback);
+  if (strategies.encryptXml === EncryptXml.unencrypted) {
+    return strategies.encryptXml(signed, callback);
+  }
+
+  async.waterfall([
+    function (cb) {
+      strategies.encryptXml(signed, cb)
+    },
+    function (encrypted, cb) {
+      var assertion = '<saml:EncryptedAssertion xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">' + encrypted + '</saml:EncryptedAssertion>';
+      cb(null, utils.removeWhitespace(assertion));
+    },
+  ], callback);
 }

lib/xml/encrypt.js

@@ -0,0 +1,33 @@
+var xmlenc = require('xml-encryption');
+
+var utils = require('../utils');
+
+exports.fromEncryptXmlOptions = function (options) {
+  if (!options.encryptionCert) {
+    return this.unencrypted;
+  } else {
+    return this.encrypted({
+      rsa_pub: options.encryptionPublicKey,
+      pem: options.encryptionCert,
+      encryptionAlgorithm: options.encryptionAlgorithm || 'http://www.w3.org/2001/04/xmlenc#aes256-cbc',
+      keyEncryptionAlgorighm: options.keyEncryptionAlgorighm || 'http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p'
+    });
+  }
+};
+
+exports.unencrypted = function (xml, callback) {
+  if (callback) {
+    return setImmediate(callback, null, xml);
+  } else {
+    return xml;
+  }
+};
+
+exports.encrypted = function (encryptOptions) {
+  return function encrypt(xml, callback) {
+    xmlenc.encrypt(xml, encryptOptions, function (err, encrypted) {
+      if (err) return callback(err);
+      callback(null, utils.removeWhitespace(encrypted));
+    });
+  };
+};