Merge pull request #951 from QNimbus/fix-issue-950

Fix for issue #950

CHANGELOG.md

@@ -11,10 +11,12 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Add symbol and color properties of event when `CALENDAR_EVENTS` notification is broadcasted from `default/calendar` module.
 
 ### Updated
+- Changed 'default.js' - listen on all attached interfaces by default
 
 ### Fixed
 
 - Fixed issue with incorrect allignment of analog clock when displayed in the center column of the MM
+- Fixed ipWhitelist behaviour to make empty whitelist ([]) allow any and all hosts access to the MM
 
 ## [2.1.2] - 2017-07-01
 

js/defaults.js

@@ -8,7 +8,7 @@
  */
 
 var port = 8080;
-var address = "localhost";
+var address = ""; // Default to listening on all interfaces
 if (typeof(mmPort) !== "undefined") {
 	port = mmPort;
 }

js/electron.js

@@ -46,8 +46,9 @@ function createWindow() {
 	mainWindow = new BrowserWindow(electronOptions);
 
 	// and load the index.html of the app.
-	//mainWindow.loadURL('file://' + __dirname + '../../index.html');
-	mainWindow.loadURL(`http://${config.address}:${config.port}`);
+	// If config.address is not defined or is an empty string (listening on all interfaces), connect to localhost
+	var address = config.address === void 0 | config.address === "" ? config.address = "localhost" : config.address;
+	mainWindow.loadURL(`http://${address}:${config.port}`);
 
 	// Open the DevTools if run with "npm start dev"
 	if (process.argv.includes("dev")) {

js/server.js

@@ -30,7 +30,7 @@ var Server = function(config, callback) {
 	}
 
 	app.use(function(req, res, next) {
-		var result = ipfilter(config.ipWhitelist, {mode: "allow", log: false})(req, res, function(err) {
+		var result = ipfilter(config.ipWhitelist, {mode: config.ipWhitelist.length === 0 ? "deny" : "allow", log: false})(req, res, function(err) {
 			if (err === undefined) {
 				return next();
 			}