Merge branch 'master' of github.com:ajaxorg/cloud9

Author: gjtorikian

plugins-server/cloud9.core/workspace.js

@@ -22,13 +22,20 @@ var Workspace = module.exports = function(ide) {
     };
 
     this.getServerExclude = function(user) {
-        return util.arrayToMap(user.getPermissions().server_exclude.split("|"));
+        // We assume `user` has been passed. Otherwise it is fine to throw.
+        if (!user.permissions) {
+            console.error("Error: Couldn't retrieve permissions for user ", user);
+            console.trace();
+        }
+        
+        var serverExclude = (user.permissions && user.permissions.server_exclude) || "";
+        return util.arrayToMap(serverExclude.split("|"));
     };
 
     this.execHook = function(hook, user /* varargs */) {
         var self = this;
         var args = Array.prototype.slice.call(arguments, 1);
-        var hook = hook.toLowerCase().trim();
+        hook = hook.toLowerCase().trim();
 
         var server_exclude = this.getServerExclude(user);
 

plugins-server/cloud9.ide.run-npm-module/run-npm-module.js

@@ -100,12 +100,19 @@ util.inherits(NpmRuntimePlugin, Plugin);
     this.searchAndRunModuleHook = function(message, user, cb) {
         if (!message.command || !message.argv)
             return cb(null, false);
+            
+        if (!user || !user.permissions) {
+            console.error("Error: Couldn't retrieve permissions for user ", user);
+            console.trace();
+        }
 
-        if (user.permissions.fs != "rw")
+        if (user.permissions && user.permissions.fs != "rw") {
             return cb("Permission denied", false);
+        }
 
         // server_exclude is usually empty, resulting in an array with one element: an empty one, let's filter those:
-        var server_exclude = (user.permissions.server_exclude || "").split("|").filter(function(cmd) { return !!cmd });
+        var server_excludeString = (user.permissions && user.permissions.server_exclude) || "";
+        var server_exclude = server_excludeString.split("|").filter(function(cmd) { return !!cmd; });
         server_exclude.forEach(function(command) {
             if (message.command == command || message.argv.join(" ").indexOf(command) > -1) {
                 return cb("Permission denied", false);