Merge branch 'develop' of github.com:sciunto/etherpad-lite

Conflicts:
	src/package.json
	src/templates/timeslider.html

src/node/db/AuthorManager.js

@@ -141,22 +141,6 @@ exports.getAuthor = function (author, callback)
   db.get("globalAuthor:" + author, callback);
 }
 
-/**
- * Returns the Author Name of the author
-  * @param {String} author The id of the author
-  * @param {Function} callback callback(err, name)
-  */
-
-exports.getAuthorName = function (authorID, callback)
-{
-  db.getSub("globalAuthor:" + author, ["name"], callback);
-  console.log(authorID);
-  db.getSub("globalAuthor:" + authorID, ["name"], function(err, authorName){
-    if(ERR(err, callback)) return;
-    callback(null, {authorName: authorName});
-  });
-}
-
 
 
 /**

src/node/db/Pad.js

@@ -16,6 +16,7 @@ var padMessageHandler = require("../handler/PadMessageHandler");
 var readOnlyManager = require("./ReadOnlyManager");
 var crypto = require("crypto");
 var randomString = require("../utils/randomstring");
+var hooks = require('ep_etherpad-lite/static/js/pluginfw/hooks');
 
 //serialization/deserialization attributes
 var attributeBlackList = ["id"];
@@ -86,6 +87,12 @@ Pad.prototype.appendRevision = function appendRevision(aChangeset, author) {
   // set the author to pad
   if(author)
     authorManager.addPad(author, this.id);
+    
+  if (this.head == 0) {
+    hooks.callAll("padCreate", {'pad':this});
+  } else {
+    hooks.callAll("padUpdate", {'pad':this});
+  }    
 };
 
 //save all attributes to the database
@@ -368,6 +375,7 @@ Pad.prototype.init = function init(text, callback) {
       _this.appendRevision(firstChangeset, '');
     }
 
+    hooks.callAll("padLoad", {'pad':_this});
     callback(null);
   });
 };
@@ -467,6 +475,7 @@ Pad.prototype.remove = function remove(callback) {
     {
       db.remove("pad:"+padID);
       padManager.unloadPad(padID);
+      hooks.callAll("padRemove", {'padID':padID});
       callback();
     }
   ], function(err)

src/node/hooks/express.js

@@ -1,4 +1,5 @@
 var hooks = require("ep_etherpad-lite/static/js/pluginfw/hooks");
+var http = require('http');
 var express = require('express');
 var settings = require('../utils/Settings');
 var fs = require('fs');
@@ -42,22 +43,24 @@ exports.createServer = function () {
 }
 
 exports.restartServer = function () {
+
   if (server) {
     console.log("Restarting express server");
     server.close();
   }
 
-  server = express.createServer();
+  var app = express(); // New syntax for express v3
+  server = http.createServer(app);
 
-  server.use(function (req, res, next) {
+  app.use(function (req, res, next) {
     res.header("Server", serverName);
     next();
   });
 
-  server.configure(function() {
-    hooks.callAll("expressConfigure", {"app": server});
+  app.configure(function() {
+    hooks.callAll("expressConfigure", {"app": app});
   });
-  hooks.callAll("expressCreateServer", {"app": server});
+  hooks.callAll("expressCreateServer", {"app": app, "server": server});
 
   server.listen(settings.port, settings.ip);
-}
+}

src/node/hooks/express/adminplugins.js

@@ -12,14 +12,10 @@ exports.expressCreateServer = function (hook_name, args, cb) {
       errors: [],
     };
 
-    res.send(eejs.require(
-      "ep_etherpad-lite/templates/admin/plugins.html",
-      render_args), {});
+    res.send( eejs.require("ep_etherpad-lite/templates/admin/plugins.html", render_args) );
   });
   args.app.get('/admin/plugins/info', function(req, res) {
-    res.send(eejs.require(
-      "ep_etherpad-lite/templates/admin/plugins-info.html",
-        {}), {});
+    res.send( eejs.require("ep_etherpad-lite/templates/admin/plugins-info.html", {}) );
   });
 }
 

src/node/hooks/express/errorhandling.js

@@ -16,9 +16,6 @@ exports.gracefulShutdown = function(err) {
 
   console.log("graceful shutdown...");
 
-  //stop the http server
-  exports.app.close();
-
   //do the db shutdown
   db.db.doShutdown(function() {
     console.log("db sucessfully closed.");
@@ -35,10 +32,14 @@ exports.gracefulShutdown = function(err) {
 exports.expressCreateServer = function (hook_name, args, cb) {
   exports.app = args.app;
 
-  args.app.error(function(err, req, res, next){
-    res.send(500);
-    console.error(err.stack ? err.stack : err.toString());
-  });
+  // Handle errors
+  args.app.use(function(err, req, res, next){
+    // if an error occurs Connect will pass it down
+    // through these "error-handling" middleware
+    // allowing you to respond however you like
+    res.send(500, { error: 'Sorry, something bad happened!' });
+    console.error(err.stack? err.stack : err.toString());
+  })
 
   //connect graceful shutdown with sigint and uncaughtexception
   if(os.type().indexOf("Windows") == -1) {

src/node/hooks/express/padreadonly.js

@@ -56,7 +56,7 @@ exports.expressCreateServer = function (hook_name, args, cb) {
 	ERR(err);
 
       if(err == "notfound")
-	res.send('404 - Not Found', 404);
+	res.send(404, '404 - Not Found');
       else
 	res.send(html);
     });

src/node/hooks/express/padurlsanitize.js

@@ -7,7 +7,7 @@ exports.expressCreateServer = function (hook_name, args, cb) {
     //ensure the padname is valid and the url doesn't end with a /
     if(!padManager.isValidPadId(padId) || /\/$/.test(req.url))
     {
-      res.send('Such a padname is forbidden', 404);
+      res.send(404, 'Such a padname is forbidden');
     }
     else
     {
@@ -19,7 +19,7 @@ exports.expressCreateServer = function (hook_name, args, cb) {
           var query = url.parse(req.url).query;
           if ( query ) real_url += '?' + query;
 	  res.header('Location', real_url);
-	  res.send('You should be redirected to <a href="' + real_url + '">' + real_url + '</a>', 302);
+	  res.send(302, 'You should be redirected to <a href="' + real_url + '">' + real_url + '</a>');
 	}
 	//the pad id was fine, so just render it
 	else

src/node/hooks/express/socketio.js

@@ -3,6 +3,7 @@ var socketio = require('socket.io');
 var settings = require('../../utils/Settings');
 var socketIORouter = require("../../handler/SocketIORouter");
 var hooks = require("ep_etherpad-lite/static/js/pluginfw/hooks");
+var webaccess = require("ep_etherpad-lite/node/hooks/express/webaccess");
 
 var padMessageHandler = require("../../handler/PadMessageHandler");
 
@@ -10,19 +11,28 @@ var connect = require('connect');
  
 exports.expressCreateServer = function (hook_name, args, cb) {
   //init socket.io and redirect all requests to the MessageHandler
-  var io = socketio.listen(args.app);
+  var io = socketio.listen(args.server);
 
   /* Require an express session cookie to be present, and load the
    * session. See http://www.danielbaulig.de/socket-ioexpress for more
    * info */
   io.set('authorization', function (data, accept) {
     if (!data.headers.cookie) return accept('No session cookie transmitted.', false);
-    data.cookie = connect.utils.parseCookie(data.headers.cookie);
-    data.sessionID = data.cookie.express_sid;
-    args.app.sessionStore.get(data.sessionID, function (err, session) {
-      if (err || !session) return accept('Bad session / session has expired', false);
-      data.session = new connect.middleware.session.Session(data, session);
-      accept(null, true);
+
+    // Use connect's cookie parser, because it knows how to parse signed cookies
+    connect.cookieParser(webaccess.secret)(data, {}, function(err){
+      if(err) {
+        console.error(err);
+        accept("Couldn't parse request cookies. ", false);
+        return;
+      }
+
+      data.sessionID = data.signedCookies.express_sid;
+      args.app.sessionStore.get(data.sessionID, function (err, session) {
+        if (err || !session) return accept('Bad session / session has expired', false);
+        data.session = new connect.middleware.session.Session(data, session);
+        accept(null, true);
+      });
     });
   });
 
@@ -62,5 +72,5 @@ exports.expressCreateServer = function (hook_name, args, cb) {
   socketIORouter.setSocketIO(io);
   socketIORouter.addComponent("pad", padMessageHandler);
 
-  hooks.callAll("socketio", {"app": args.app, "io": io});
+  hooks.callAll("socketio", {"app": args.app, "io": io, "server": args.server});
 }

src/node/hooks/express/webaccess.js

@@ -56,10 +56,10 @@ exports.basicAuth = function (req, res, next) {
       res.header('WWW-Authenticate', 'Basic realm="Protected Area"');
       if (req.headers.authorization) {
         setTimeout(function () {
-          res.send('Authentication required', 401);
+          res.send(401, 'Authentication required');
         }, 1000);
       } else {
-        res.send('Authentication required', 401);
+        res.send(401, 'Authentication required');
       }
     }));
   }
@@ -88,14 +88,13 @@ exports.basicAuth = function (req, res, next) {
   });
 }
 
-var secret = null;
+exports.secret = null;
 
 exports.expressConfigure = function (hook_name, args, cb) {
   // If the log level specified in the config file is WARN or ERROR the application server never starts listening to requests as reported in issue #158.
   // Not installing the log4js connect logger when the log level has a higher severity than INFO since it would not log at that level anyway.
   if (!(settings.loglevel === "WARN" || settings.loglevel == "ERROR"))
     args.app.use(log4js.connectLogger(httpLogger, { level: log4js.levels.INFO, format: ':status, :method :url'}));
-  args.app.use(express.cookieParser());
 
   /* Do not let express create the session, so that we can retain a
    * reference to it for socket.io to use. Also, set the key (cookie
@@ -104,13 +103,14 @@ exports.expressConfigure = function (hook_name, args, cb) {
 
   if (!exports.sessionStore) {
     exports.sessionStore = new express.session.MemoryStore();
-    secret = randomString(32);
+    exports.secret = randomString(32);
   }
+  
+  args.app.use(express.cookieParser(exports.secret));
 
   args.app.sessionStore = exports.sessionStore;
   args.app.use(express.session({store: args.app.sessionStore,
-                                key: 'express_sid',
-                                secret: secret}));
+                                key: 'express_sid' }));
 
   args.app.use(exports.basicAuth);
 }

src/node/padaccess.js

@@ -15,7 +15,7 @@ module.exports = function (req, res, callback) {
       callback();
     //no access
     } else {
-      res.send("403 - Can't touch this", 403);
+      res.send(403, "403 - Can't touch this");
     }
   });
 }

src/node/server.js

@@ -21,27 +21,49 @@
  * limitations under the License.
  */
 
-var log4js = require('log4js');
-var settings = require('./utils/Settings');
-var db = require('./db/DB');
-var async = require('async');
-var plugins = require("ep_etherpad-lite/static/js/pluginfw/plugins");
-var hooks = require("ep_etherpad-lite/static/js/pluginfw/hooks");
+var log4js = require('log4js')
+  , async = require('async')
+  ;
+
+// set up logger
+log4js.replaceConsole();
+
+var settings
+  , db
+  , plugins
+  , hooks;
 var npm = require("npm/lib/npm.js");
 
-hooks.plugins = plugins;
-
-//set loglevel
-log4js.setGlobalLogLevel(settings.loglevel);
-
 async.waterfall([
+  // load npm
+  function(callback) {
+    npm.load({}, function(er) {
+      callback(er)
+    })
+  },
+  
+  // load everything
+  function(callback) {
+    settings = require('./utils/Settings');
+    db = require('./db/DB');
+    plugins = require("ep_etherpad-lite/static/js/pluginfw/plugins");
+    hooks = require("ep_etherpad-lite/static/js/pluginfw/hooks");
+    hooks.plugins = plugins;
+
+    //set loglevel
+    log4js.setGlobalLogLevel(settings.loglevel);
+    callback();
+  },
+  
   //initalize the database
   function (callback)
   {
     db.init(callback);
   },
 
-  plugins.update,
+  function(callback) {
+    plugins.update(callback)
+  },
 
   function (callback) {
     console.info("Installed plugins: " + plugins.formatPlugins());

src/node/utils/Settings.js

@@ -37,7 +37,7 @@ exports.ip = "0.0.0.0";
 /**
  * The Port ep-lite should listen to
  */
-exports.port = 9001;
+exports.port = process.env.PORT || 9001;
 /*
  * The Type of the database
  */

src/node/utils/caching_middleware.js

@@ -48,7 +48,7 @@ CachingMiddleware.prototype = new function () {
     var old_res = {};
 
     var supportsGzip =
-        req.header('Accept-Encoding', '').indexOf('gzip') != -1;
+        (req.get('Accept-Encoding') || '').indexOf('gzip') != -1;
 
     var path = require('url').parse(req.url).path;
     var cacheKey = (new Buffer(path)).toString('base64').replace(/[\/\+=]/g, '');