Merge pull request #197 from buddycloud/develop

merging develop into master

Author: abmargb

src/account.js

@@ -53,7 +53,7 @@ function registerAccount(req, res) {
   }
 
   if (username.indexOf("@") == -1) {
-    domain = config.xmppDomain || req.headers['x-forwarded-host'];
+    domain = config.xmppDomain || api.normalizeForwardedHost(req);
     username = [username, '@', domain].join('');
   }
 

src/util/api.js

@@ -277,4 +277,8 @@ exports.generateNodeFeedFromEntries = function(channel, node, from, entries) {
     feed.cnode(entry.clone());
   });
   return feed;
+};
+
+exports.normalizeForwardedHost = function(req) {
+  return req.headers['x-forwarded-host'];
 }

src/util/dns.js

@@ -17,6 +17,7 @@
 var dns = require('dns');
 var net = require('net');
 var config = require('./config');
+var api = require('./api');
 
 var API_SRV_PREFIX = '_buddycloud-api._tcp.';
 var MEDIA_PROXY_ENDPOINT = '/' + config.mediaProxyPrefix;
@@ -119,7 +120,7 @@ exports.discoverAPI = function(req, callback) {
   var remoteDomain = channel.split('@')[1];
 
   if (remoteDomain == config.xmppDomain 
-        || remoteDomain == req.headers['x-forwarded-host']) {
+        || remoteDomain == api.normalizeForwardedHost(req)) {
 
     if (!config.homeMediaRoot) {
       return callback();

src/util/session.js

@@ -156,6 +156,15 @@ function createSession(req, res, next) {
       }
     }
   });
+
+  client.on('offline', function(error) {
+    logger.error('Session went offline.');
+    sessionCache.remove(req.credentials);
+    for (var i = 0; i < session._waitingReqs.length; i++) {
+      var wr = session._waitingReqs[i];
+      wr['res'].send(503);
+    }
+  });
 }
 
 function xmppConnectionOptions(req) {
@@ -168,13 +177,13 @@ function xmppConnectionOptions(req) {
     };
   } else {
     var domain = config.xmppAnonymousDomain || config.xmppDomain
-      || 'anon.' + req.headers['x-forwarded-host'];
+      || 'anon.' + api.normalizeForwardedHost(req);
     var host = config.xmppAnonymousHost || config.xmppHost;
     var port = config.xmppAnonymousPort ||config.xmppPort;
     return {
       jid: '@' + domain,
       host: host,
-      port: port,
+      port: port
       //preferredSaslMechanism: 'ANONYMOUS'
     };
   }