cloudcms-server 0.9.301 → 3.2.280

package/middleware/authentication/adapters/session.js

@@ -9,15 +9,18 @@ class SessionAdapter extends AbstractAdapter
 
     identify(req, callback)
     {
-        if (req.session && req.session._auth_profile) 
+        if (req.session)
         {
-            var properties = {
-                "token": req.session._auth_profile.unique_name,
-                "trusted": true,
-                "profile": req.session._auth_profile
-            };
-
-            return callback(null, properties);
+            if (req.session._auth_profile)
+            {
+                var properties = {
+                    "token": req.session._auth_profile.unique_name,
+                    "trusted": true,
+                    "profile": req.session._auth_profile
+                };
+    
+                return callback(null, properties);
+            }
         }
         
         return super.identify(req, callback);

package/middleware/authentication/authentication.js

@@ -436,15 +436,21 @@ exports = module.exports = function()
                                         }
                                         else
                                         {
-                                            req.session.registration_strategy_id = strategyId;
-                                            req.session.registration_user_object = userObject;
-                                            req.session.registration_user_identifier = userIdentifier;
-                                            req.session.registration_groups_array = groupsArray;
-                                            req.session.registration_mandatory_groups_array = mandatoryGroupsArray;
-                                            req.session.registration_token = info.token;
-                                            req.session.registration_refresh_token = info.refresh_token;
-
-                                            return res.redirect(registrationRedirectUrl);
+                                            return req.session.reload(function() {
+    
+                                                req.session.registration_strategy_id = strategyId;
+                                                req.session.registration_user_object = userObject;
+                                                req.session.registration_user_identifier = userIdentifier;
+                                                req.session.registration_groups_array = groupsArray;
+                                                req.session.registration_mandatory_groups_array = mandatoryGroupsArray;
+                                                req.session.registration_token = info.token;
+                                                req.session.registration_refresh_token = info.refresh_token;
+                                                
+                                                req.session.save(function() {
+                                                    res.redirect(registrationRedirectUrl);
+                                                });
+                                                
+                                            });
                                         }
                                     });
                                 }
@@ -765,13 +771,19 @@ exports = module.exports = function()
                         }
                         else
                         {
-                            req.session.registration_strategy_id = strategyId;
-                            req.session.registration_user_object = properties.user_object;
-                            req.session.registration_user_identifier = properties.user_identifier;
-                            req.session.registration_token = properties.token;
-                            req.session.registration_refresh_token = properties.refresh_token;
-
-                            return res.redirect(registrationRedirect);
+                            return req.session.reload(function() {
+    
+                                req.session.registration_strategy_id = strategyId;
+                                req.session.registration_user_object = properties.user_object;
+                                req.session.registration_user_identifier = properties.user_identifier;
+                                req.session.registration_token = properties.token;
+                                req.session.registration_refresh_token = properties.refresh_token;
+    
+                                req.session.save(function() {
+                                    res.redirect(registrationRedirect);
+                                });
+                                
+                            });
                         }
                     }
 

package/middleware/authentication/authenticators/default.js

@@ -15,8 +15,11 @@ class DefaultAuthenticator extends AbstractAuthenticator
         {
             return req.logIn(gitanaUser, function() {
 
-                if (req.session && req.session.save) {
-                    req.session.save();
+                if (req.session)
+                {
+                    return req.session.save(function() {
+                        callback();
+                    });
                 }
 
                 callback();

package/middleware/authentication/authenticators/session.js

@@ -25,8 +25,11 @@ class SessionAuthenticator extends DefaultAuthenticator
 
             req.user = gitanaUser;
 
-            if (req.session && req.session.save) {
-                req.session.save();
+            if (req.session)
+            {
+                return req.session.save(function() {
+                    callback();
+                });
             }
 
             callback();

package/middleware/authentication/providers/saml.js

@@ -1,4 +1,4 @@
-var auth = require("../../../util/auth");
+//var auth = require("../../../util/auth");
 
 var SamlStrategy = require('passport-saml').Strategy;
 var AbstractProvider = require("./abstract");

package/middleware/authorization/authorization.js

@@ -41,17 +41,20 @@ exports = module.exports = function()
              }
              */
 
-            if (pathRequiresAuthorization) {
-                if (req.session && req.session.requestContext) {
-                    next();
-                }
-                else {
-                    res.redirect("/login");
-                }
+            if (!pathRequiresAuthorization)
+            {
+                return next();
             }
-            else {
+            
+            if (req.session && req.session.requestContext)
+            {
                 next();
             }
+            else
+            {
+                res.redirect("/login");
+            }
+            
         });
     };
 

package/middleware/awareness/awareness.js

@@ -60,10 +60,15 @@ exports = module.exports = function()
         if (!process.configuration.awareness.config) {
             process.configuration.awareness.config = {};
         }
-
+    
+        // init any plugins?
+        if (!process.configuration.awareness.plugins) {
+            process.configuration.awareness.plugins = [];
+        }
+    
         var type = process.configuration.awareness.type;
         var config = process.configuration.awareness.config;
-
+        
         var providerFactory = require("./providers/" + type);
         provider = new providerFactory(config);
 
@@ -74,12 +79,6 @@ exports = module.exports = function()
                 return callback(err);
             }
 
-            // init any plugins?
-            if (!process.configuration.awareness.plugins) {
-                process.configuration.awareness.plugins = [];
-            }
-
-
             var fns = [];
             for (var i = 0; i < pluginPaths.length; i++)
             {
@@ -115,15 +114,18 @@ exports = module.exports = function()
     /**
      * This gets called whenever a new socket is connected to the Cloud CMS server.
      *
+     * @param io
+     * @param callback
+     *
      * @type {Function}
      */
-    var initSocketIO = r.initSocketIO = function(callback) {
-
+    var initSocketIO = r.initSocketIO = function(io, callback) {
+    
         // initialize socket IO event handlers so that awareness binds to any new, incoming sockets
-        socketInit(process.IO);
+        socketInit(io);
 
         // ensure the reaper is initialized
-        reaperInit(process.IO, REAP_FREQUENCY_MS, REAP_MAX_AGE_MS, function(err) {
+        reaperInit(io, REAP_FREQUENCY_MS, REAP_MAX_AGE_MS, function(err) {
             callback(err);
         });
     };
@@ -172,7 +174,7 @@ exports = module.exports = function()
         // when a socket.io connection is established, we set up some default listeners for events that the client
         // may emit to us
         io.on("connection", function(socket) {
-
+            
             // "register" -> indicates that a user is in a channel
             socket.on("register", function(channelId, user, dirty, callback) {
 
@@ -193,24 +195,32 @@ exports = module.exports = function()
                             return callback(err);
                         }
 
-                        // if we were already registered, just callback
-                        // however, if "dirty" is set, then we always hand back membership
-                        if (!dirty && alreadyRegistered)
-                        {
-                            return callback();
-                        }
-
-                        if (!alreadyRegistered)
-                        {
-                            // logger.info("New registration - channelId: " + channelId + ",userId=" + user.id + " (" + user.name + ")");
-
+                        // // if we were already registered, just callback
+                        // // however, if "dirty" is set, then we always hand back membership
+                        // if (!dirty && alreadyRegistered)
+                        // {
+                        //     logger.info("Already registered, not dirty - channelId: " + channelId + ",userId=" + user.id + " (" + user.name + ")");
+                        //
+                        //     return callback();
+                        // }
+                        //
+                        // if (!alreadyRegistered)
+                        // {
+                        //     logger.info("New registration - channelId: " + channelId + ",userId=" + user.id + " (" + user.name + ")");
+    
+                            //logger.info("Register - channelId: " + channelId + ", userId=" + user.id + " (" + user.name + ")");
                             socket.join(channelId);
-                        }
+                        //}
 
                         discover(channelId, function(err, userArray) {
 
-                            if (!err) {
-                                logger.info("Discover - channelId: " + channelId + ", userId=" + user.id + " (" + user.name + ") handing back: " + userArray.length);
+                            if (err)
+                            {
+                                logger.info("Discover - channelId: " + channelId + ", err: " + JSON.stringify(err));
+                            }
+                            else
+                            {
+                                //logger.info("Discover - channelId: " + channelId + ", userId=" + user.id + " (" + user.name + ") handing back: " + userArray.length);
                                 io.sockets.in(channelId).emit("membershipChanged", channelId, userArray);
                             }
 
@@ -412,6 +422,8 @@ exports = module.exports = function()
      */
     var register = r.register = function(channelId, user, callback)
     {
+        //console.log("Awareness - heard register, channel: " + channelId + ", user: " + user.id);
+        
         provider.register(channelId, user, callback);
     };
 
@@ -458,7 +470,12 @@ exports = module.exports = function()
     {
         // take out a cluster-wide lock on the "channelId"
         // so that two "threads" can't acquire/release at the same time for a given channel
-        _LOCK(channelId, function (releaseLockFn) {
+        _LOCK(channelId, function (err, releaseLockFn) {
+            
+            if (err) {
+                return callback(err);
+            }
+            
             provider.acquireLock(channelId, user, function(err, success) {
                 releaseLockFn();
                 callback(err, success);
@@ -477,7 +494,12 @@ exports = module.exports = function()
     {
         // take out a cluster-wide lock on the "channelId"
         // so that two "threads" can't acquire/release at the same time for a given channel
-        _LOCK(channelId, function (releaseLockFn) {
+        _LOCK(channelId, function (err, releaseLockFn) {
+            
+            if (err) {
+                return callback(err);
+            }
+            
             provider.releaseLock(channelId, userId, function(err, success) {
                 releaseLockFn();
                 callback(err, success);

package/middleware/awareness/plugins/editorial.js

@@ -43,7 +43,7 @@ exports.bindSocket = function(socket, provider)
         var acquireEditorialSession = function(socket, provider, sessionKey, repositoryId, branchId, force, callback)
         {
             // send an HTTP command to acquire an editorial session for this repository and branch
-            var URL = util.asURL(process.env.GITANA_PROXY_SCHEME, process.env.GITANA_PROXY_HOST, process.env.GITANA_PROXY_PORT) + "/oneteam/editorial/session/acquire";
+            var URL = util.asURL(process.env.GITANA_PROXY_SCHEME, process.env.GITANA_PROXY_HOST, process.env.GITANA_PROXY_PORT, process.env.GITANA_PROXY_PATH) + "/oneteam/editorial/session/acquire";
 
             var headers = {};
             //headers["Authorization"] = socket.gitana.platform().getDriver().getHttpHeaders()["Authorization"];
@@ -101,7 +101,7 @@ exports.bindSocket = function(socket, provider)
     var releaseEditorialSession = function(socket, provider, sessionKey, repositoryId, branchId, callback)
     {
         // send an HTTP command to release the session
-        var URL = util.asURL(process.env.GITANA_PROXY_SCHEME, process.env.GITANA_PROXY_HOST, process.env.GITANA_PROXY_PORT) + "/oneteam/editorial/session/release";
+        var URL = util.asURL(process.env.GITANA_PROXY_SCHEME, process.env.GITANA_PROXY_HOST, process.env.GITANA_PROXY_PORT, process.env.GITANA_PROXY_PATH) + "/oneteam/editorial/session/release";
 
         var json = {};
         json.repositoryId = repositoryId;
@@ -152,7 +152,7 @@ exports.bindSocket = function(socket, provider)
      */
     var commitEditorialSession = function(socket, provider, sessionKey, repositoryId, branchId, callback)
     {
-        var URL = util.asURL(process.env.GITANA_PROXY_SCHEME, process.env.GITANA_PROXY_HOST, process.env.GITANA_PROXY_PORT) + "/oneteam/editorial/session/commit";
+        var URL = util.asURL(process.env.GITANA_PROXY_SCHEME, process.env.GITANA_PROXY_HOST, process.env.GITANA_PROXY_PORT, process.env.GITANA_PROXY_PATH) + "/oneteam/editorial/session/commit";
 
         var json = {};
         json.repositoryId = repositoryId;
@@ -202,7 +202,7 @@ exports.bindSocket = function(socket, provider)
      */
     var editorialSessionInfo = function(socket, provider, sessionKey, repositoryId, branchId, callback)
     {
-        var URL = util.asURL(process.env.GITANA_PROXY_SCHEME, process.env.GITANA_PROXY_HOST, process.env.GITANA_PROXY_PORT) + "/oneteam/editorial/session/info";
+        var URL = util.asURL(process.env.GITANA_PROXY_SCHEME, process.env.GITANA_PROXY_HOST, process.env.GITANA_PROXY_PORT, process.env.GITANA_PROXY_PATH) + "/oneteam/editorial/session/info";
 
         var json = {};
         json.repositoryId = repositoryId;

package/middleware/awareness/providers/abstract-async.js

@@ -14,28 +14,33 @@ class AbstractAsyncProvider extends AbstractProvider
     {
         super(config);
     }
-
+    
+    _lock(lockKey, workFunction)
+    {
+        process.locks.lock(lockKey, workFunction);
+    }
+    
     readOrCreateChannel(channelId, callback) {
 
         var self = this;
 
         self.readChannel(channelId, function(err, channel) {
-
+    
             if (err) {
                 return callback(err);
             }
-
+    
             if (channel) {
                 return callback(null, channel);
             }
 
             var channel = {};
             self.writeChannel(channelId, channel, function(err) {
-
+    
                 if (err) {
                     return callback(err);
                 }
-
+    
                 callback(null, channel);
             });
         });
@@ -46,26 +51,44 @@ class AbstractAsyncProvider extends AbstractProvider
     register(channelId, user, callback)
     {
         var self = this;
-
+        
+        self.doRegister(channelId, user, function(err) {
+            callback(err);
+        });
+    }
+    
+    /**
+     * Workhorse method.
+     *
+     * @param channelId
+     * @param user
+     * @param callback
+     * @private
+     */
+    doRegister(channelId, user, callback)
+    {
+        var self = this;
+        
         self.readOrCreateChannel(channelId, function (err, channel) {
-
+    
             if (err) {
                 return callback(err);
             }
-
+        
             if (!channel.users) {
                 channel.users = {};
             }
-
+        
             channel.users[user.id] = {
                 "user": user,
                 "time": new Date().getTime()
             };
-
+            
             self.writeChannel(channelId, channel, function (err) {
                 callback(err);
             });
         });
+        
     }
 
     discover(channelId, callback)
@@ -101,123 +124,121 @@ class AbstractAsyncProvider extends AbstractProvider
         });
     }
 
-    expire(beforeMs, callback)
+    checkRegistered(channelId, userId, callback)
     {
         var self = this;
 
-        self.listChannelIds(function(err, channelIds) {
+        self.readChannel(channelId, function(err, channel) {
 
             if (err) {
                 return callback(err);
             }
 
+            if (!channel) {
+                return callback(null, false);
+            }
+
+            if (!channel.users) {
+                return callback(null, false);
+            }
+
+            if (channel.users[userId]) {
+                return callback(null, true);
+            }
+
+            callback(null, false);
+
+        });
+    }
+    
+    expire(beforeMs, callback)
+    {
+        var self = this;
+        
+        self.listChannelIds(function(err, channelIds) {
+            
+            if (err) {
+                return callback(err);
+            }
+            
             if (!channelIds || channelIds.length === 0) {
                 return callback(null, [], {});
             }
-
+            
             // a list of channel IDs whose memberships were updated
             var updatedMembershipChannelIds = [];
             var expiredUserIdsByChannelId = {};
-
+            
             var fns = [];
-
+            
             for (var i = 0; i < channelIds.length; i++)
             {
                 var channelId = channelIds[i];
-
+                
                 var fn = function (channelId, updatedMembershipChannelIds, expiredUserIdsByChannelId, beforeMs) {
                     return function (done) {
-
+                        
                         self.readChannel(channelId, function(err, channel) {
-
+                            
                             if (err) {
                                 return done(err);
                             }
-
+                            
                             if (!channel) {
                                 return done();
                             }
+                            
+                            if (!channel.users || Object.keys(channel.users).length === 0)
+                            {
+                                return done();
+                            }
 
-                            var updatedMembership = false;
-
-                            if (channel.users)
+                            // populate all of the user IDs that need to be removed
+                            var userIdsToRemove = [];
+                            for (var userId in channel.users)
                             {
-                                // populate all of the user IDs that need to be removed
-                                var userIdsToRemove = [];
-                                for (var userId in channel.users)
+                                var entry = channel.users[userId];
+                                if (entry.time < beforeMs)
                                 {
-                                    var entry = channel.users[userId];
-                                    if (entry.time < beforeMs)
-                                    {
-                                        updatedMembership = true;
-                                        userIdsToRemove.push(userId);
-
-                                        var expiredUserIds = expiredUserIdsByChannelId[channelId]
-                                        if (!expiredUserIds) {
-                                            expiredUserIds = expiredUserIdsByChannelId[channelId] = [];
-                                        }
-
-                                        expiredUserIds.push(userId);
+                                    updatedMembershipChannelIds.push(channelId);
+                                    userIdsToRemove.push(userId);
+                                    
+                                    var expiredUserIds = expiredUserIdsByChannelId[channelId]
+                                    if (!expiredUserIds) {
+                                        expiredUserIds = expiredUserIdsByChannelId[channelId] = [];
                                     }
-                                }
-
-                                // remove the user IDs
-                                for (var i = 0; i < userIdsToRemove.length; i++)
-                                {
-                                    delete channel.users[userIdsToRemove[i]];
+                                    
+                                    expiredUserIds.push(userId);
                                 }
                             }
-
-                            if (updatedMembership)
+                            
+                            // remove the user IDs
+                            for (var i = 0; i < userIdsToRemove.length; i++)
                             {
-                                updatedMembershipChannelIds.push(channelId);
+                                delete channel.users[userIdsToRemove[i]];
                             }
-
-                            done();
+                            
+                            self.writeChannel(channelId, channel, function() {
+                                done();
+                            });
+                            
                         });
                     };
                 }(channelId, updatedMembershipChannelIds, expiredUserIdsByChannelId, beforeMs);
                 fns.push(fn);
             }
-
+            
             async.parallel(fns, function(err) {
-
+                
                 if (err) {
                     return callback(err);
                 }
-
+                
                 callback(null, updatedMembershipChannelIds, expiredUserIdsByChannelId);
             });
         });
-    }
-
-    checkRegistered(channelId, userId, callback)
-    {
-        var self = this;
-
-        self.readChannel(channelId, function(err, channel) {
-
-            if (err) {
-                return callback(err);
-            }
-
-            if (!channel) {
-                return callback(null, false);
-            }
-
-            if (!channel.users) {
-                return callback(null, false);
-            }
-
-            if (channel.users[userId]) {
-                return callback(null, true);
-            }
-
-            callback(null, false);
-
-        });
-    }
-
+    };
+    
     acquireLock(channelId, user, callback)
     {
         var self = this;
@@ -303,14 +324,16 @@ class AbstractAsyncProvider extends AbstractProvider
             callback(null, lock);
         });
     }
-
-
+    
+    
+    
+    
     //////////////////////////////////////////////////////////////////////////////////////////////////////////
     //
     // ABSTRACT METHODS
     //
     //////////////////////////////////////////////////////////////////////////////////////////////////////////
-
+    
     // ABSTRACT
     readChannel(channelId, callback)
     {
@@ -328,7 +351,7 @@ class AbstractAsyncProvider extends AbstractProvider
     {
         throw new Error("listChannelIds() method is not implemented");
     }
-
+    
     // ABSTRACT
     readLock(lockId, callback)
     {

package/middleware/awareness/providers/abstract.js

@@ -2,7 +2,7 @@
  * Abstract class for an Awareness Provider.
  *
  * This class provides an interface or base functions that any implementation class must implement in order to
- * work with the Awareness Service.  Any methods that
+ * work with the Awareness Service.
  *
  */
 class AbstractProvider