Merge pull request openiap#4 from skadefro/master

Fix ssl error

Author: skadefro

.vscode/launch.json

@@ -1,6 +1,15 @@
 {
     "version": "0.2.0",
     "configurations": [
+        {
+            "type": "node",
+            "request": "attach",
+            "name": "Attach to aiotdevred.openrpa.dk",
+            "address": "aiotdevred.openrpa.dk",
+            "port": 9229,
+            "localRoot": "${workspaceFolder}",
+            "remoteRoot": "/data"
+        },
         {
             "type": "node",
             "request": "attach",

OpenFlow/src/WebSocketClient.ts

@@ -88,7 +88,7 @@ export class WebSocketClient {
         var consumer = new amqp_consumer(this._logger, Config.amqp_url, queuename);
         consumer.OnMessage = this.OnMessage.bind(this);
         this.consumers.push(consumer);
-        await consumer.connect(false, true);
+        await consumer.connect(false, autoDelete);
     }
     public async CloseConsumer(queuename:string):Promise<void> {
         var index = -1;

OpenFlowNodeRED/package.json

@@ -22,11 +22,11 @@
     "gulp-shell": "^0.7.0",
     "jsonwebtoken": "^8.5.1",
     "node-red": "^0.20.5",
+    "node-red-contrib-auth-saml": "^1.0.8",
     "passport-google-oauth20": "^2.0.0",
     "passport-openid-connect": "^0.1.0",
     "passport-saml": "^1.0.0",
     "passport-saml-metadata": "^1.6.0",
-    "ssl-root-cas": "^1.3.1",
     "winston": "^3.2.1"
   }
 }

OpenFlowNodeRED/src/Config.ts

@@ -60,7 +60,6 @@ export class Config {
 
 
         try {
-            // rootCas.addFile(path.join(__dirname, '../config/ssl/gd_bundle-g2-g1.crt'));
             if (Config.tls_ca !== "") {
                 var tls_ca: string = Buffer.from(Config.tls_ca, 'base64').toString('ascii')
                 var rootCas = require('ssl-root-cas/latest').create();

OpenFlowNodeRED/src/WebServer.ts

@@ -54,9 +54,12 @@ export class WebServer {
                     var ca:string = Config.tls_ca;
                     if (ca!== "") {
                         if(ca.indexOf("---") === -1) {
-                            ca = Buffer.from(Config.tls_ca, 'base64').toString('ascii');
+                            ca = Buffer.from(ca, 'base64').toString('ascii');
+                        }
+                        if(ca.indexOf("---") > -1) {
+                            console.log(ca);
+                            options.ca = ca;
                         }
-                        options.ca = ca;
                         // options.cert += "\n" + ca;
                     }
                     if(Config.tls_passphrase!=="") {
@@ -86,7 +89,7 @@ export class WebServer {
                 (profile:string | any, done:any)=> {
                     // profile.permissions = "*";
                     done(profile);
-                });
+                }, "");
                 // this.settings.adminAuth = await noderedcontribauthsaml.configure(this._logger, Config.baseurl());clear
 
                 // settings.adminAuth = new noderedcontribauthopenid(this._logger, Config.baseurl());

VERSION

@@ -1 +1 @@
-0.0.66
+0.0.71