Fix port and key mapping in modered

Author: skadefro

OpenFlowNodeRED/src/Config.ts

@@ -14,7 +14,7 @@ export class Config {
     public static saml_crt: string = Config.getEnv("saml_crt", "");
 
     public static port: number = parseInt(Config.getEnv("port", "1880"));
-    public static nodered_port: number = parseInt(Config.getEnv("port", "0"));
+    public static nodered_port: number = parseInt(Config.getEnv("nodered_port", "0"));
     public static domain: string = Config.getEnv("domain", "localhost");
     public static protocol: string = Config.getEnv("protocol", "http");
     public static nodered_domain_schema: string = Config.getEnv("nodered_domain_schema", "");

OpenFlowNodeRED/src/Crypt.ts

@@ -1,37 +1,42 @@
 import * as crypto from "crypto";
-import * as bcrypt  from "bcryptjs";
+import * as bcrypt from "bcryptjs";
 import * as jsonwebtoken from "jsonwebtoken";
 import { Config } from "./Config";
 import { TokenUser } from "./Message";
 
 export class Crypt {
-    static encryption_key:string = Config.aes_secret.substr(0,32); // must be 256 bytes (32 characters)
-    static iv_length:number = 16; // for AES, this is always 16
-    static bcrypt_salt_rounds:number = 12;
+    // static encryption_key:string = Config.aes_secret.substr(0,32); // must be 256 bytes (32 characters)
+    static iv_length: number = 16; // for AES, this is always 16
+    static bcrypt_salt_rounds: number = 12;
 
-    static encrypt(text:string):string {
-        let iv:Buffer = crypto.randomBytes(Crypt.iv_length);
-        let cipher:crypto.Cipher = crypto.createCipheriv("aes-256-cbc", Buffer.from(Crypt.encryption_key), iv);
-        let encrypted:Buffer = cipher.update((text as any));
+    static encryption_key(): string {
+        var c = Config;
+        return c.aes_secret.substr(0, 32);
+    }
+
+    static encrypt(text: string): string {
+        let iv: Buffer = crypto.randomBytes(Crypt.iv_length);
+        let cipher: crypto.Cipher = crypto.createCipheriv("aes-256-cbc", Buffer.from(Crypt.encryption_key()), iv);
+        let encrypted: Buffer = cipher.update((text as any));
         encrypted = Buffer.concat([encrypted, cipher.final()]);
         return iv.toString("hex") + ":" + encrypted.toString("hex");
     }
 
-    static decrypt(text:string):string {
-        let textParts:string[] = text.split(":");
-        let iv:Buffer = Buffer.from(textParts.shift(), "hex");
-        let encryptedText:Buffer = Buffer.from(textParts.join(":"), "hex");
-        let decipher:crypto.Decipher = crypto.createDecipheriv("aes-256-cbc", Buffer.from(Crypt.encryption_key), iv);
-        let decrypted:Buffer = decipher.update(encryptedText);
+    static decrypt(text: string): string {
+        let textParts: string[] = text.split(":");
+        let iv: Buffer = Buffer.from(textParts.shift(), "hex");
+        let encryptedText: Buffer = Buffer.from(textParts.join(":"), "hex");
+        let decipher: crypto.Decipher = crypto.createDecipheriv("aes-256-cbc", Buffer.from(Crypt.encryption_key()), iv);
+        let decrypted: Buffer = decipher.update(encryptedText);
         decrypted = Buffer.concat([decrypted, decipher.final()]);
         return decrypted.toString();
     }
 
-    static async hash(password: string):Promise<string> {
+    static async hash(password: string): Promise<string> {
         return new Promise<string>(async (resolve, reject) => {
             try {
-                bcrypt.hash(password, Crypt.bcrypt_salt_rounds, async (error, hash)=> {
-                    if(error) { return reject(error); }
+                bcrypt.hash(password, Crypt.bcrypt_salt_rounds, async (error, hash) => {
+                    if (error) { return reject(error); }
                     resolve(hash);
                 });
             } catch (error) {
@@ -40,11 +45,11 @@ export class Crypt {
         });
     }
 
-    static async compare(password: string, passwordhash:string):Promise<boolean> {
+    static async compare(password: string, passwordhash: string): Promise<boolean> {
         return new Promise<boolean>(async (resolve, reject) => {
             try {
-                bcrypt.compare(password, passwordhash, async (error, res)=> {
-                    if(error) { return reject(error); }
+                bcrypt.compare(password, passwordhash, async (error, res) => {
+                    if (error) { return reject(error); }
                     resolve(res);
                 });
             } catch (error) {
@@ -54,13 +59,13 @@ export class Crypt {
     }
 
     static createToken(user: TokenUser): string {
-        var token:string = jsonwebtoken.sign({ data: user }, Crypt.encryption_key,
+        var token: string = jsonwebtoken.sign({ data: user }, Crypt.encryption_key(),
             { expiresIn: "1h" }); // 60 (seconds), "2 days", "10h", "7d"
         return token;
     }
 
     static verityToken(token: string): TokenUser {
-        var o:any = jsonwebtoken.verify(token, Crypt.encryption_key);
+        var o: any = jsonwebtoken.verify(token, Crypt.encryption_key());
         o.data = TokenUser.assign(o.data);
         return o.data;
     }

OpenFlowNodeRED/src/WebServer.ts

@@ -104,6 +104,16 @@ export class WebServer {
                 });
 
                 this.settings = new nodered_settings();
+                var c = Config;
+                if (Config.nodered_port > 0) {
+                    this.settings.uiPort = Config.nodered_port;
+                }
+                else {
+                    this.settings.uiPort = Config.port;
+                }
+
+
+
                 this.settings.userDir = path.join(__dirname, "./nodered");
                 this.settings.nodesDir = path.join(__dirname, "./nodered");
 

OpenFlowNodeRED/src/index.ts

@@ -28,13 +28,14 @@ function isNumeric(num) {
 }
 (async function (): Promise<void> {
     try {
+        var c = Config;
         var socket: WebSocketClient = new WebSocketClient(logger, Config.api_ws_url);
         socket.events.on("onopen", async () => {
 
             var q: SigninMessage = new SigninMessage();
             if (Config.jwt !== "") {
                 q.jwt = Config.jwt;
-            } else if (Crypt.encryption_key !== "") {
+            } else if (Crypt.encryption_key() !== "") {
                 var user = new TokenUser();
                 if (NoderedUtil.IsNullEmpty(Config.nodered_sa)) {
                     user.name = "nodered" + Config.nodered_id;

OpenFlowNodeRED/src/nodered/nodes/NoderedUtil.ts

@@ -197,7 +197,7 @@ export class NoderedUtil {
             Logger.instanse.debug("GetToken::isNumeric: " + this.isNumeric(Config.nodered_id));
             if (Config.jwt !== "") {
                 q.jwt = Config.jwt;
-            } else if (Crypt.encryption_key !== "") {
+            } else if (Crypt.encryption_key() !== "") {
                 var user = new TokenUser();
                 if (NoderedUtil.IsNullEmpty(Config.nodered_sa)) {
                     user.name = "nodered" + Config.nodered_id;

OpenFlowNodeRED/src/nodered/nodes/api_nodes.ts

@@ -67,7 +67,7 @@ export class api_get_jwt {
             } else {
                 if (Config.jwt !== "") {
                     q.jwt = Config.jwt;
-                } else if (Crypt.encryption_key !== "") {
+                } else if (Crypt.encryption_key() !== "") {
                     var user = new TokenUser();
                     if (NoderedUtil.IsNullEmpty(Config.nodered_sa)) {
                         user.name = "nodered" + Config.nodered_id;

VERSION

@@ -1 +1 @@
-0.0.391
+0.0.392

docker-compose-traefik.yml

@@ -45,7 +45,7 @@ services:
       - "traefik.http.routers.web.rule=Host(`localhost.openrpa.dk`)"
       - "traefik.http.routers.web.entrypoints=web"
       - "traefik.frontend.passHostHeader=true"
-    image: "cloudhack/openflow:0.0.391"
+    image: "cloudhack/openflow:0.0.392"
     container_name: "web"
     environment:
       - auto_create_users=true
@@ -80,7 +80,7 @@ services:
       - "traefik.http.routers.nodered.rule=Host(`nodered1.localhost.openrpa.dk`)"
       - "traefik.http.routers.nodered.entrypoints=web"
       - "traefik.http.services.nodered.loadbalancer.server.port=1880"
-    image: "cloudhack/openflownodered:0.0.391"
+    image: "cloudhack/openflownodered:0.0.392"
     container_name: "nodered"
     environment:
       #      - nodered_id=1

docker-compose.yml

@@ -17,7 +17,7 @@ services:
       - "5672:5672"
       - "15672:15672"
   web:
-    image: "cloudhack/openflow:0.0.391"
+    image: "cloudhack/openflow:0.0.392"
     environment:
       - auto_create_users=true
       - auto_create_domains=
@@ -49,7 +49,7 @@ services:
       - "80:80"
       - "5858:5858"
   nodered:
-    image: "cloudhack/openflownodered:0.0.391"
+    image: "cloudhack/openflownodered:0.0.392"
     environment:
       #      - nodered_id=1
       - nodered_sa=nodered1