cloudcms-server 3.3.1-beta.9 → 4.0.0-beta.10

package/middleware/admin/admin.js

@@ -17,8 +17,8 @@ exports = module.exports = function()
         if (ref)
         {
             var z = ref.indexOf("://");
-
-            var type = ref.substring(0, z + 3);
+    
+            var type = ref.substring(0, z);
             var identifier = ref.substring(z + 3);
 
             var parts = identifier.split("/").reverse();
@@ -132,7 +132,7 @@ exports = module.exports = function()
                 {
                     assertAuthenticated(req, res, function() {
 
-                        doResetCache(req.virtualHost, req.ref, function(err) {
+                        doResetCache(req.virtualHost, req.query.ref, function(err) {
                             completionFn(req.virtualHost, res, err);
                         });
 

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,6 +1,6 @@
-var auth = require("../../../util/auth");
+//var auth = require("../../../util/auth");
 
-var SamlStrategy = require('passport-saml').Strategy;
+var SamlStrategy = require('@node-saml/passport-saml').Strategy;
 var AbstractProvider = require("./abstract");
 
 if (!process.configuration) {

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

@@ -16,7 +16,8 @@ exports = module.exports = function()
 
     var pluginPaths = [
         "./plugins/editorial",
-        "./plugins/resources"
+        "./plugins/resources",
+        "./plugins/api_event"
     ];
     var plugins = {};
 
@@ -46,8 +47,10 @@ exports = module.exports = function()
         if (!process.env.CLOUDCMS_AWARENESS_TYPE)
         {
             process.env.CLOUDCMS_AWARENESS_TYPE = "memory";
-
-            if (process.configuration.setup !== "single") {
+    
+            // auto-configure
+            if (process.env.CLOUDCMS_LAUNCHPAD_SETUP === "redis")
+            {
                 process.env.CLOUDCMS_AWARENESS_TYPE = "redis";
             }
         }
@@ -63,10 +66,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);
 
@@ -77,12 +85,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++)
             {
@@ -118,15 +120,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);
         });
     };
@@ -145,21 +150,21 @@ exports = module.exports = function()
             var r = {};
 
             // allow plugins to bind on("connection") handlers
-            r.bindOnSocketConnection = function(socket, provider, callback)
+            r.bindOnSocketConnection = function(socket, provider, io, callback)
             {
                 var fns = [];
                 for (var pluginPath in plugins)
                 {
                     var plugin = plugins[pluginPath];
 
-                    var fn = function(pluginPath, plugin, socket) {
+                    var fn = function(pluginPath, plugin, socket, io) {
                         return function(done) {
-
-                            plugin.bindSocket(socket, provider);
+    
+                            plugin.bindSocket(socket, provider, io);
 
                             done();
                         }
-                    }(pluginPath, plugin, socket);
+                    }(pluginPath, plugin, socket, io);
                     fns.push(fn);
                 }
 
@@ -175,7 +180,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) {
 
@@ -196,24 +201,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);
                             }
 
@@ -297,7 +310,7 @@ exports = module.exports = function()
             });
 
             // allow plugins to register more on() handlers if they wish
-            pluginProxy.bindOnSocketConnection(socket, provider, function() {
+            pluginProxy.bindOnSocketConnection(socket, provider, io, function() {
                 // done
             });
 
@@ -415,6 +428,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);
     };
 
@@ -461,7 +476,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);
@@ -480,7 +500,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/api_event.js

@@ -0,0 +1,105 @@
+/*
+
+this awareness plugin adds support for general purpose API events
+the API in 4.0 supports passing API events forward via the message queue to the app server
+the app server then converts these into notifications
+
+the UI can register and event listener via socket.io ("onApiEvent").
+a listener binds to an event type + an optional reference
+
+when an event is received by the API, it triggers to socket.io emits (one for the general event and the other for the
+event + the reference being acted upon)
+ */
+exports = module.exports = {};
+
+var util = require("../../../util/util");
+var socketUtil = require("../../../util/socket");
+
+var subscriptionsBound = false;
+
+var bindSubscriptions = function(io)
+{
+    if (subscriptionsBound) {
+        return;
+    }
+
+    subscriptionsBound = true;
+    
+    // LISTEN: "api_event"
+    process.broadcast.subscribe("api_event", function (message, channel, done) {
+        
+        if (!done) {
+            done = function () {};
+        }
+    
+        // the message
+        // {
+        //     "applicationId": applicationId,
+        //     "deploymentKey": deploymentKey,
+        //     "host": host,
+        //     "eventType": eventType,
+        //     "eventId": eventId,
+        //     "objectType": objectType,
+        //     "objectId": objectId,
+        //     "objectRef": objectRef,
+        //     "object": object.object
+        // };
+    
+        var apiEvent = {};
+        apiEvent.type = message.eventType;
+        apiEvent.id = message.eventId;
+        apiEvent.objectType = message.objectType;
+        apiEvent.objectId = message.objectId;
+        apiEvent.objectRef = message.objectRef;
+        apiEvent.object = message.object;
+        
+        // dispatch for event + reference
+        if (apiEvent.objectRef)
+        {
+            try {
+                apiEvent.channelId = "apiEvent-" + apiEvent.type + "_" + apiEvent.objectRef;
+                //console.log("api_event -> " + apiEvent.channelId);
+                io.to(apiEvent.channelId).emit("apiEvent", apiEvent);
+            } catch (e) {
+                console.log(e);
+            }
+        }
+    
+        // dispatch for event
+        try {
+            apiEvent.channelId = "apiEvent-" + apiEvent.type;
+            //console.log("apiEvent -> " + apiEvent.channelId);
+            io.to(apiEvent.channelId).emit("apiEvent", apiEvent);
+        } catch (e) {
+            console.log(e);
+        }
+        
+        done();
+    });
+};
+
+exports.bindSocket = function(socket, provider, io)
+{
+    bindSubscriptions(io);
+
+    socketUtil.bindGitana(socket, function() {
+
+        socket.on("onApiEvent", function(eventName, reference, callback) {
+
+            if (eventName)
+            {
+                var channelId = "apiEvent-" + eventName;
+                
+                if (reference)
+                {
+                    channelId = eventName + "-" + reference;
+                }
+                
+                // join room for this event
+                socket.join(channelId);
+            }
+
+            callback();
+        });
+    });
+};

package/middleware/awareness/plugins/editorial.js

@@ -5,7 +5,7 @@ var socketUtil = require("../../../util/socket");
 
 var request = require("../../../util/request");
 
-exports.bindSocket = function(socket, provider)
+exports.bindSocket = function(socket, provider, io)
 {
     socketUtil.bindGitana(socket, function() {
 
@@ -41,7 +41,7 @@ exports.bindSocket = function(socket, provider)
         var acquireEditorialWorkspace = function(socket, provider, sessionKey, repositoryId, branchId, type, force, callback)
         {
             // send an HTTP command to acquire an editorial workspace 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/workspace/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/workspace/acquire";
 
             var headers = {};
             //headers["Authorization"] = socket.gitana.platform().getDriver().getHttpHeaders()["Authorization"];
@@ -97,7 +97,7 @@ exports.bindSocket = function(socket, provider)
     var releaseEditorialWorkspace = 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/workspace/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/workspace/release";
 
         var json = {};
         json.repositoryId = repositoryId;
@@ -141,7 +141,7 @@ exports.bindSocket = function(socket, provider)
      */
     var commitEditorialWorkspace = 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/workspace/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/workspace/commit";
 
         var json = {};
         json.repositoryId = repositoryId;
@@ -184,7 +184,7 @@ exports.bindSocket = function(socket, provider)
      */
     var editorialWorkspaceInfo = 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/workspace/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/workspace/info";
 
         var json = {};
         json.repositoryId = repositoryId;
@@ -231,10 +231,11 @@ exports.bindSocket = function(socket, provider)
                 var x1 = cookieValue.indexOf("GITANA_TICKET=");
                 if (x1 > -1)
                 {
-                    var x2 = cookieValue.indexOf(";", x1 + 14);
+                    ticket = cookieValue.substring(x1 + 14);
+                    var x2 = ticket.indexOf(";");
                     if (x2 > -1)
                     {
-                        ticket = cookieValue.substring(x1 + 14, x2);
+                        ticket = ticket.substring(0, x2);
                     }
                 }
             }

package/middleware/awareness/plugins/resources.js

@@ -5,7 +5,7 @@ var socketUtil = require("../../../util/socket");
 
 var subscriptionsBound = false;
 
-var bindSubscriptions = function()
+var bindSubscriptions = function(io)
 {
     if (subscriptionsBound) {
         return;
@@ -43,19 +43,27 @@ var bindSubscriptions = function()
             };
 
             // fire to reference
-            process.IO.to(reference).emit("watchResource", reference, watchObject);
+            try {
+                if (reference) {
+                    io.to(reference).emit("watchResource", reference, watchObject);
+                }
+            } catch (e) { }
 
             // fire to head reference
-            process.IO.to(headReference).emit("watchResource", headReference, watchObject);
+            try {
+                if (headReference) {
+                    io.to(headReference).emit("watchResource", headReference, watchObject);
+                }
+            } catch (e) { }
         }
 
         done();
     });
 };
 
-exports.bindSocket = function(socket, provider)
+exports.bindSocket = function(socket, provider, io)
 {
-    bindSubscriptions();
+    bindSubscriptions(io);
 
     socketUtil.bindGitana(socket, function() {