Develop

app/config.js

@@ -3,33 +3,60 @@ var
 	, express = require('express')
 	, route = require('./routes')
 	, events = require('events')
+	, crypto = require('crypto')
 	, util = require('util')
 	, path = require('path')
 ;
 
 module.exports = function(app) {
-
-	var mids = middleware(app);	
-
+
 	events.EventEmitter.call(app);
 	util.inherits(events.EventEmitter, app);
 
 	app.set('view engine', 'ejs');
 	app.set('views', path.resolve(__dirname, '..', 'views'));
-	app.use(express.static(path.resolve(__dirname, '..', 'public')));	
+	app.use(express.static(path.resolve(__dirname, '..', 'public')));
 	app.use(express.methodOverride());
+
 	app.use(express.bodyParser());
 	app.use(express.favicon());
+	app.use(express.cookieParser(crypto.randomBytes(7).toString('base64')));
+	app.use(express.cookieSession());	
+
+	app.use(function(req, res, next) {
+		var os = require('os')
+		if (os.platform() !== 'linux') {
+			var err = new Error('Wifi Setup is not implemented on this platform.')
+			return next(err)
+		}
+		app.emit('platformOK', true);
+		next()
+	})
+
 
 	/**
 	 * We can log everything here
 	 */	
 	app.all('*', function(req, res, next) {
-
 		// console.log(req.route);
 		// ^ too verbose, we'll log in each route.
 		next();
+
 	});
 
-	return route(app, mids);	
-};
+
+
+
+	route(app, middleware(this, app));
+	app.use(function(err, req, res, next) {
+		if (!err) return next();
+		console.error(err, err.stack)			
+		res.status(500);
+		res.render('error', {
+			title: 'Sorry',
+			message: err.message
+		})
+	})
+
+	return app
+};

app/middleware.js

@@ -6,7 +6,7 @@ var
 	, state
 ;
 
-module.exports = function(app) {
+module.exports = function(wifi, app) {
 
 	/**
 	 * When device comes up, try to bring the
@@ -124,21 +124,55 @@ module.exports = function(app) {
 			}
 			next();
 		}
+		, hasSerial : function(req, res, next) {
+
+			if(!wifi.serial) {
+
+				return res.redirect('/serial');
+			}
+			next();
+		}
+		, userAuth : function(req, res, next) {
+
+			if((req.session) && req.session.block) { // session already checked
+
+				if(req.session.block == wifi.serial) {
+
+					wifi.log.debug("User has proper credentials in session");
+					return next();
+				}
+				wifi.log.info("User has invalid credential in session");
+			}
+			if((req.query) && req.query.block) { // check new session
+
+				if(req.query.block == wifi.serial) {
+
+					req.session.block = req.query.block;
+					wifi.log.info("User provided proper credentials");
+					return next();
+				}
+				wifi.log.info("User provided invalid credentials");
+			}
+			wifi.log.debug("Redirecting unauthed user to auth screen");
+			res.redirect('/auth');
+		}
 	};
 
 	/**
 	 * Convenience wrappers
 	 */
 	mids.ready = [ 
 
-		mids.hasDevice
+		mids.hasSerial
+		, mids.hasDevice
 		, mids.hasIface 
 		, mids.notCycling
 	];
 
 	mids.online = [ 
 
-		mids.hasDevice
+		mids.hasSerial
+		, mids.hasDevice
 		, mids.hasIface
 		, mids.isConnected 
 	];

app/routes/get-auth.js

@@ -0,0 +1,9 @@
+module.exports = function(app) {
+
+	app.get('/auth', function(req, res, next) {
+
+		app.log.info("Rendering auth screen.");
+		res.render('auth');
+
+	});
+};

app/routes/get-connected.js

@@ -10,7 +10,7 @@
 
 		app.get('/connected', function(req, res, next) {
 
-			console.log("Rendering connected screen.");
+			app.log.info("Rendering connected screen.");
 			res.render('connected');
 			setTimeout(reset, 5000);
 		});

app/routes/get-index.js

@@ -4,7 +4,7 @@
 
 		app.get('/', mids.ready, function(req, res, next) {
 
-			console.log("Rendering index screen.");
+			app.log.info("Rendering index screen.");
 			res.render("index");
 
 		});

app/routes/get-plugin.js

@@ -4,7 +4,7 @@
 
 		app.get('/plugin', function(req, res, next) {
 
-			console.log("Rendering plugin screen.");
+			app.log.info("Rendering plugin screen.");
 			res.render("plugin");
 		});
 	};

app/routes/get-serial.js

@@ -0,0 +1,9 @@
+module.exports = function(app) {
+
+	app.get('/serial', function(req, res, next) {
+
+		app.log.info("Rendering serial screen.");
+		res.render('serial');
+
+	});
+};

app/routes/index.js

@@ -1,27 +1,24 @@
-;(function() {
-
-	var 
-		routes = {
-
-			connected : require('./get-connected')
-			, networks : require('./xhr-networks')
-			, connect : require('./post-connect')
-			, device : require('./xhr-device')
-			, status : require('./get-status')
-			, plugin : require('./get-plugin')
-			, index : require('./get-index')
-		}
-		, router = function(app, mids) {
+var 
+	routes = {
 
-			Object.keys(routes).forEach(function(route) {
-
-				module.exports[route] = routes[route](app, mids);
-			});
+		connected : require('./get-connected')
+		, networks : require('./xhr-networks')
+		, connect : require('./post-connect')
+		, device : require('./xhr-device')
+		, status : require('./get-status')
+		, plugin : require('./get-plugin')
+		, serial : require('./get-serial')
+		, index : require('./get-index')
+	}
+	, router = function(app, mids) {
 
-			return app;	
-		}
-	;
+		Object.keys(routes).forEach(function(route) {
+
+			module.exports[route] = routes[route](app, mids);
+		});
 
-	module.exports = router;
+		return app;	
+	}
+;
 
-})();
+module.exports = router;

app/routes/post-connect.js

@@ -33,7 +33,7 @@
 
 			if(params.ssid && params.ssid.length > 0) { // non-broadcast
 
-				console.log("Client submitting non-broadcast network...");
+				app.log.info("Client submitting non-broadcast network...");
 				if(!params.security) {
 
 					return error(res, "Invalid parameters");
@@ -60,7 +60,7 @@
 
 				var record = cells[params.network] || undefined;
 
-				console.log("Client submitting pre-scanned network...");
+				app.log.info("Client submitting pre-scanned network...");
 				if(!record) { return error(res, "Network not found"); }
 
 				if(params.password && record.encryption) {
@@ -79,14 +79,11 @@
 
 			delete params.network; 
 
-			console.log(
+			app.log.info(
 
-				util.format(
-
-					"Requesting wpa_supplicant config for %s (%s)."
-					, params.ssid || "Unknown Network"
-					, params.encType || "OPEN"
-				)
+				"Requesting wpa_supplicant config for %s (%s)."
+				, params.ssid || "Unknown Network"
+				, params.encType || "OPEN"
 			);
 			app.send("writeConfig", params);
 			res.json({ 'connected' : true });

app/routes/xhr-networks.js

@@ -14,7 +14,7 @@
 		app.get('/networks', function(req, res, next) {
 
 			app.send('wifiScan', true);
-			console.log("Client requested network list...");
+			app.log.info("Client requested network list...");
 			console.log(cells);
 			setTimeout(function() {