plumming dashboard auth

Author: skadefro

OpenFlowNodeRED/src/WebServer.ts

@@ -18,6 +18,7 @@ import { WebSocketClient } from "./WebSocketClient";
 import { noderedcontribopenflowstorage } from "./node-red-contrib-openflow-storage";
 import { SigninMessage, Message } from "./Message";
 import { noderedcontribmiddlewareauth } from "./node-red-contrib-middleware-auth";
+import { dashboardAuth } from "./dashboardAuth";
 
 export class WebServer {
     private static _logger: winston.Logger;
@@ -124,6 +125,8 @@ export class WebServer {
 
                 this.settings.storageModule = new noderedcontribopenflowstorage(logger, socket);
 
+                this.settings.ui.middleware = new dashboardAuth();
+
                 // initialise the runtime with a server and settings
                 await (RED as any).init(server, this.settings);
 

OpenFlowNodeRED/src/dashboardAuth.ts

@@ -0,0 +1,10 @@
+export class dashboardAuth {
+
+    async tokenValidate(username, token) {
+    }
+
+    dashboardAuth(req, res, next) {
+
+        next();
+    }
+}

OpenFlowNodeRED/src/node-red-contrib-openflow-storage.ts

@@ -56,7 +56,8 @@ export class noderedcontribopenflowstorage {
             this._logger.debug("creating new packageFile " + packageFile);
             fs.writeFileSync(packageFile, JSON.stringify(defaultPackage, null, 4));
         }
-        var dbsettings = await this._getSettings();
+        // var dbsettings = await this._getSettings();
+        // spawn gettings, so it starts installing
         return true;
     }
     public async _getFlows(): Promise<any[]> {
@@ -132,33 +133,36 @@ export class noderedcontribopenflowstorage {
             console.error(error);
         }
     }
-    private firstrun: boolean = true;
+    // private firstrun: boolean = true;
     public async _getSettings(): Promise<any> {
         try {
             this._logger.silly("noderedcontribopenflowstorage::_getSettings");
             var result = await NoderedUtil.Query("nodered", { _type: "setting", nodered_id: Config.nodered_id }, null, null, 1, 0, null);
             if (result.length === 0) { return {}; }
 
             var settings = JSON.parse(result[0].settings);
-            if (this.firstrun) {
-                var child_process = require("child_process");
-                var keys = Object.keys(settings.nodes);
-                var modules = "";
-                for (var i = 0; i < keys.length; i++) {
-                    var key = keys[i];
-                    var val = settings.nodes[key];
-                    if (["node-red", "node-red-node-email", "node-red-node-feedparser", "node-red-node-rbe",
-                        "node-red-node-sentiment", "node-red-node-tail", "node-red-node-twitter"].indexOf(key) === -1) {
-                        var pname = val.name + "@" + val.version;
-                        // this._logger.info("Installing " + pname);
-                        // child_process.execSync("npm install " + pname, { stdio: [0, 1, 2], cwd: this.settings.userDir });
-                        modules += (" " + pname);
+            //if (this.firstrun) {
+            var child_process = require("child_process");
+            var keys = Object.keys(settings.nodes);
+            var modules = "";
+            for (var i = 0; i < keys.length; i++) {
+                var key = keys[i];
+                var val = settings.nodes[key];
+                if (["node-red", "node-red-node-email", "node-red-node-feedparser", "node-red-node-rbe",
+                    "node-red-node-sentiment", "node-red-node-tail", "node-red-node-twitter"].indexOf(key) === -1) {
+                    var pname: string = val.name + "@" + val.version;
+                    if (val.pending_version) {
+                        pname = val.name + "@" + val.pending_version;
                     }
+                    // this._logger.info("Installing " + pname);
+                    // child_process.execSync("npm install " + pname, { stdio: [0, 1, 2], cwd: this.settings.userDir });
+                    modules += (" " + pname);
                 }
-                this._logger.info("Installing " + modules);
-                child_process.execSync("npm install " + modules, { stdio: [0, 1, 2], cwd: this.settings.userDir });
-                this.firstrun = false;
             }
+            this._logger.info("Installing " + modules);
+            child_process.execSync("npm install " + modules, { stdio: [0, 1, 2], cwd: this.settings.userDir });
+            //this.firstrun = false;
+            //}
             this._logger.silly("noderedcontribopenflowstorage::_getSettings: return result");
             return settings;
         } catch (error) {

OpenFlowNodeRED/src/nodered_settings.ts

@@ -1,7 +1,14 @@
 import { Config } from "./Config";
 
+export class dashboard_settings {
+    public path: string = "ui";
+    public middleware: any;
+}
 // tslint:disable-next-line: class-name
 export class nodered_settings {
+    constructor() {
+        this.ui = new dashboard_settings();
+    }
     public flowFile: string = "flows.json";
     public settingsFile: string = "nodered_settings.js";
     public nodesDir: string = ".";
@@ -13,6 +20,8 @@ export class nodered_settings {
     public httpStaticAuth: any = null;
     public httpNodeMiddleware: any;
 
+    public ui: dashboard_settings;
+
     public httpAdminRoot: string = "/";
     public httpNodeRoot: string = "/";
     public storageModule: any = null;