Merge pull request #103 from gnawhleinad/remove_callback_url

generateServiceProviderMetadata: remove callbackUrl dependency

README.md

@@ -45,6 +45,7 @@ Config parameter details:
  * `callbackUrl`: full callbackUrl (overrides path/protocol if supplied)
  * `path`: path to callback; will be combined with protocol and server host information to construct callback url if `callbackUrl` is not specified (default: `/saml/consume`)
  * `protocol`: protocol for callback; will be combined with path and server host information to construct callback url if `callbackUrl` is not specified (default: `http://`)
+ * `host`: host for callback; will be combined with path and protocol to construct callback url if `callbackUrl` is not specified (default: `localhost`)
  * `entryPoint`: identity provider entrypoint
  * `issuer`: issuer string to supply to identity provider
  * `cert`: see 'security and signatures'

lib/passport-saml/saml.js

@@ -27,6 +27,10 @@ SAML.prototype.initialize = function (options) {
     options.path = '/saml/consume';
   }
 
+  if (!options.host) {
+    options.host = 'localhost';
+  }
+
   if (!options.issuer) {
     options.issuer = 'onelogin_saml';
   }
@@ -65,6 +69,25 @@ SAML.prototype.initialize = function (options) {
   return options;
 };
 
+SAML.prototype.getProtocol = function (req) {
+  return this.options.protocol || (req.protocol || 'http').concat('://');
+};
+
+SAML.prototype.getCallbackUrl = function (req) {
+    // Post-auth destination
+  if (this.options.callbackUrl) {
+    return this.options.callbackUrl;
+  } else {
+    var host;
+    if (req.headers) {
+      host = req.headers.host;
+    } else {
+      host = this.options.host;
+    }
+    return this.getProtocol(req) + host + this.options.path;
+  }
+};
+
 SAML.prototype.generateUniqueID = function () {
   var chars = "abcdef0123456789";
   var uniqueID = "";
@@ -88,8 +111,6 @@ SAML.prototype.generateAuthorizeRequest = function (req, isPassive, callback) {
   var self = this;
   var id = "_" + self.generateUniqueID();
   var instant = self.generateInstant();
-  var protocol = self.options.protocol || (req.protocol || 'http').concat('://');
-  var callbackUrl;
   var forceAuthn = self.options.forceAuthn || false;
 
   Q.fcall(function() {
@@ -100,21 +121,14 @@ SAML.prototype.generateAuthorizeRequest = function (req, isPassive, callback) {
     }
   })
   .then(function(){
-    // Post-auth destination
-    if (self.options.callbackUrl) {
-      callbackUrl = self.options.callbackUrl;
-    } else {
-      callbackUrl = protocol + req.headers.host + self.options.path;
-    }
-
     var request = {
       'samlp:AuthnRequest': {
         '@xmlns:samlp': 'urn:oasis:names:tc:SAML:2.0:protocol',
         '@ID': id,
         '@Version': '2.0',
         '@IssueInstant': instant,
         '@ProtocolBinding': 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST',
-        '@AssertionConsumerServiceURL': callbackUrl,
+        '@AssertionConsumerServiceURL': self.getCallbackUrl(req),
         '@Destination': self.options.entryPoint,        
         'saml:Issuer' : {
           '@xmlns:saml' : 'urn:oasis:names:tc:SAML:2.0:assertion',
@@ -746,11 +760,6 @@ function processValidlySignedPostRequest(self, doc, callback) {
 }
 
 SAML.prototype.generateServiceProviderMetadata = function( decryptionCert ) {
-  if (!this.options.callbackUrl) {
-    throw new Error(
-      "Unable to generate service provider metadata when callbackUrl option is not set");
-  }
-
   var metadata = {
     'EntityDescriptor' : {
       '@xmlns': 'urn:oasis:names:tc:SAML:2.0:metadata',
@@ -763,7 +772,7 @@ SAML.prototype.generateServiceProviderMetadata = function( decryptionCert ) {
           '@index': '1',
           '@isDefault': 'true',
           '@Binding': 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST',
-          '@Location': this.options.callbackUrl
+          '@Location': this.getCallbackUrl({})
         }
       },
     }