Adding user system

Author: Krylik

app.js

@@ -17,13 +17,27 @@ app.set('views', __dirname + '/views');
 app.set('view engine', 'ejs');
 app.set('env', config.env);
 
+var Knex = require('knex');
+var db = Knex.initialize({
+	client: 'mysql',
+	connection: {
+		host     : config.db.host,
+		user     : config.db.user,
+		password : config.db.pass,
+		database : config.db.name,
+		charset  : 'utf8'
+	}
+});
+
 /**
  * Set up Middleware
  */
 app.use(express.favicon());
 app.use(express.logger('dev'));
 app.use(express.bodyParser());
 app.use(express.methodOverride());
+app.use(express.cookieParser());
+app.use(express.session({secret: 'DU2787GpjHDGGe72ZDBjh23jkDFs'}));
 app.use(app.router);
 app.use(require('stylus').middleware(__dirname + '/public'));
 app.use(express.static(path.join(__dirname, 'public')));
@@ -41,7 +55,8 @@ var supervisordapi = require('supervisord');
 var routes = require('./routes')({
 	'app': app,
 	'config': config,
-	'supervisordapi': supervisordapi
+	'supervisordapi': supervisordapi,
+	'db': db
 });
 
 /**

config.js

@@ -1,9 +1,17 @@
 var config = {};
 
+// Db
+config.db = {
+	host: 'localhost',
+	user: 'root',
+	pass: '',
+	name: 'nodervisor',
+};
+
 // Application
 config.port = 3000;
 config.settingsFile = 'settings.json';
-config.env = 'development';
+config.env = 'production';
 
 // Read and write settings
 config.readSettings = function(){

package.json

@@ -10,6 +10,9 @@
     "ejs": "*",
     "stylus": "*",
     "supervisord": "*",
-    "async": "*"
+    "async": "*",
+    "mysql": "*",
+    "knex": "*",
+    "bcrypt": "*"
   }
 }

public/css/main.css

@@ -213,7 +213,7 @@ nav a:hover {
 
     nav a {
         float: left;
-        width: 27%;
+        width: 20%;
         margin: 0 1.7%;
         padding: 12px 2%;
         margin-bottom: 0;

public/partials/hosts-listing.ejs

@@ -37,7 +37,7 @@ for (state in hostSummary) {
         var hostDisplay = '';
         if (hostCollapsed == 'down') { hostDisplay = 'display: none;' }
     %>
-    <table class="table table-hover table-bordered" style="<%= hostDisplay %>" id="<%= hostName %>">
+    <table class="table table-hover table-striped" style="<%= hostDisplay %>" id="<%= hostName %>">
         <tr>
             <th style="width: 50%;">Process Name</th>
             <th style="width: 10%;">State</th>

routes/ajax_supervisorctl.js

@@ -7,37 +7,43 @@ exports.ajax_supervisorctl = function(params) {
 	var supervisordapi = params.supervisordapi;
 
 	return function(req, res) {
-		var querystring = require('querystring');
-		var host = req.param('host');
-		var process = req.param('process');
-		var action = req.param('action');
 
-		if (config.settings.hosts[host] !== undefined) {
-			var supclient = supervisordapi.connect(config.settings.hosts[host].host);
-			switch (action) {
-				case 'stop': {
-					supclient.stopProcessGroup(process, function(){
-						res.send({result: 'success'});
-					});
-				}
-				break;
-				case 'start': {
-					supclient.startProcess(process, function(){
-						res.send({result: 'success'});
-					});
-				}
-				break;
-				case 'restartAll': {
-					supclient.stopAllProcesses(true, function(){
-						supclient.startAllProcesses(true, function(){
+		if (!req.session.loggedIn) {
+			res.send({error: 'Not logged in'});
+		} else {
+
+			var querystring = require('querystring');
+			var host = req.param('host');
+			var process = req.param('process');
+			var action = req.param('action');
+
+			if (config.settings.hosts[host] !== undefined) {
+				var supclient = supervisordapi.connect(config.settings.hosts[host].host);
+				switch (action) {
+					case 'stop': {
+						supclient.stopProcessGroup(process, function(){
 							res.send({result: 'success'});
 						});
-					});
+					}
+					break;
+					case 'start': {
+						supclient.startProcess(process, function(){
+							res.send({result: 'success'});
+						});
+					}
+					break;
+					case 'restartAll': {
+						supclient.stopAllProcesses(true, function(){
+							supclient.startAllProcesses(true, function(){
+								res.send({result: 'success'});
+							});
+						});
+					}
+					break;
 				}
-				break;
+			} else {
+				res.send({result: 'error', message: 'Host not found'});
 			}
-		} else {
-			res.send({result: 'error', message: 'Host not found'});
 		}
 	};
 };

routes/ajax_supervisord.js

@@ -7,25 +7,30 @@ exports.ajax_supervisord = function(params) {
 	var supervisordapi = params.supervisordapi;
 	var async = require('async');
 	return function(req, res) {
+
+		if (!req.session.loggedIn) {
+			res.send({error: 'Not logged in'});
+		} else {
 
-		var supervisords = {};
-		var hosts = [];
-		for (var hostName in config.settings.hosts) {
-			hosts.push(config.settings.hosts[hostName]);
-		}
-		async.each(hosts, function(host, callback){
-			var supclient = supervisordapi.connect(host.host);
-			var processinfo = supclient.getAllProcessInfo(function(err, result){
-				if (err === null) {
-					supervisords[host.name] = result;
-					return callback();
-				} else {
-					supervisords[host.name] = err;
-					return callback();
-				}
+			var supervisords = {};
+			var hosts = [];
+			for (var hostName in config.settings.hosts) {
+				hosts.push(config.settings.hosts[hostName]);
+			}
+			async.each(hosts, function(host, callback){
+				var supclient = supervisordapi.connect(host.host);
+				var processinfo = supclient.getAllProcessInfo(function(err, result){
+					if (err === null) {
+						supervisords[host.name] = result;
+						return callback();
+					} else {
+						supervisords[host.name] = err;
+						return callback();
+					}
+				});
+			}, function(err){
+				res.send(supervisords);
 			});
-		}, function(err){
-			res.send(supervisords);
-		});
+		}
 	};
 };

routes/settings.js renamed to routes/hosts.js

@@ -2,9 +2,14 @@
  * GET/POST settings page
  */
 
-exports.settings = function(params) {
+exports.hosts = function(params) {
 	var config = params.config;
 	return function(req, res) {
+
+		if (!req.session.loggedIn) {
+			res.redirect('/login');
+		}
+
 		var fs = require('fs');
 		var saved = false;
 		var settings = params.config.settings;
@@ -33,8 +38,8 @@ exports.settings = function(params) {
 			saved = true;
 		}
 
-		res.render('settings', {
-			title: 'Nodervisor - Settings',
+		res.render('hosts', {
+			title: 'Nodervisor - Hosts',
 			settings: settings,
 			saved: saved
 		});

routes/index.js

@@ -23,15 +23,34 @@ function routes(params) {
 	 * Link routes to items in routes array
 	 */
 
-	// Downloads page
+	// Home page
 	app.get('/', routes['supervisord']());
 	app.get('/ajax/supervisord', routes['ajax_supervisord'](params));
 
-	// Setup page
-	app.get('/settings', routes['settings'](params));
-	app.post('/settings', routes['settings'](params));
+	// Hosts page
+	app.get('/hosts', routes['hosts'](params));
+	app.post('/hosts', routes['hosts'](params));
 
-	// Download Control Page
+	// Users page
+	app.get('/users', routes['users'](params));
+	app.post('/users', routes['users'](params));
+
+	// New User page
+	/*
+	app.get('/user/new', routes['users'](params));
+	app.post('/user/new', routes['users'](params)); */
+	// User edit page
+	app.get('/user/:idUser', routes['users'](params));
+	app.post('/user/:idUser', routes['users'](params));
+
+	// Login page
+	app.get('/login', routes['login'](params));
+	app.post('/login', routes['login'](params));
+
+	// Logout page
+	app.get('/logout', routes['logout']());
+
+	// Supervisor Control Page
 	app.get('/ajax/supervisorctl', routes['ajax_supervisorctl'](params));
 }
 

routes/login.js

@@ -0,0 +1,41 @@
+/*
+ * GET/POST login page
+ */
+
+exports.login = function(params) {
+	return function(req, res) {
+		
+		if (req.session.loggedIn) {
+			res.redirect('/');
+		}
+
+		if (req.body.submit !== undefined) {
+			var email = req.body.email;
+			params.db('users')
+				.where('Email', email)
+				.exec(function(err, user){
+					var error = 'Password failed';
+					if (user !== null) {
+						bcrypt = require('bcrypt');
+						req.session.loggedIn = bcrypt.compareSync(req.body.password, user[0].Password);
+					} else {
+						error = 'Email not found';
+					}
+					
+					if (!req.session.loggedIn) {
+						res.render('login', {
+							title: 'Nodervisor - Login',
+							error: error
+						});
+					} else {
+						req.session.user = user[0];
+						res.redirect('/');
+					}
+				});
+		} else {
+			res.render('login', {
+				title: 'Nodervisor - Login',
+			});
+		}
+	};
+};