TLS and Auth Support (#99)

hobbyquaker · Oct 4, 2019 · 3025810 · 3025810
1 parent 7cbe77b
commit 3025810
Show file tree

Hide file tree

Showing 5 changed files with 223 additions and 24 deletions.
diff --git a/main.js b/main.js
@@ -184,6 +184,10 @@ function findInterfaces() {
                 config.daemons[iface] = {
                     type: iface,
                     ip: config.ccuAddress,
+                    isSecure: config.useTLS,
+                    useAuth: config.useAuth,
+                    user: config.user,
+                    pass: config.pass,
                     port: ports[iface],
                     protocol: iface === 'CUxD' ? 'binrpc' : 'xmlrpc',
                     reinitTimeout: iface === 'HmIP' ? 600000 : 60000,
@@ -194,7 +198,11 @@ function findInterfaces() {
         initRpcClients();
         if (regaPresent) {
             rega = new Rega({
-                host: config.ccuAddress
+                host: config.ccuAddress,
+                tls: config.useTls,
+                auth: config.useAuth,
+                user: config.user,
+                pass: config.pass
             });
             getRegaNames();
         }
@@ -311,11 +319,25 @@ function initRpcClients() {
         config.daemons[daemon].ident = daemon === 'CUxD' ? 'CUxD' : 'hmm_' + daemon;
         daemonIndex[config.daemons[daemon].ident] = daemon;
 
-        rpcClients[daemon] = (config.daemons[daemon].protocol === 'binrpc' ? binrpc : xmlrpc).createClient({
+        const clientOptions = {
             host: config.daemons[daemon].ip,
             port: config.daemons[daemon].port,
             path: config.daemons[daemon].path,
-        });
+            isSecure: config.daemons[daemon].isSecure,
+        };
+
+        if (config.daemons[daemon].isSecure && config.daemons[daemon].ident !== 'CUxD') {
+            config.daemons[daemon].port = 40000 + config.daemons[daemon].port;
+        }
+
+        if (config.daemons[daemon].useAuth) {
+            clientOptions.basic_auth = {
+                user: config.daemons[daemon].user,
+                pass: config.daemons[daemon].pass
+            }
+        }
+
+        rpcClients[daemon] = (config.daemons[daemon].protocol === 'binrpc' ? binrpc : xmlrpc).createClient(clientOptions);
 
         initRpcServer(config.daemons[daemon].protocol);
         init(daemon);

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homematic-manager",
-  "version": "2.5.1",
+  "version": "2.6.0",
   "private": true,
   "dependencies": {
     "async": "2.6.2",
@@ -11,7 +11,7 @@
     "electron-window-state": "5.0.3",
     "free-jqgrid": "4.15.5",
     "hm-discover": "1.1.0",
-    "homematic-rega": "1.3.5",
+    "homematic-rega": "^1.4.0",
     "homematic-xmlrpc": "1.0.2",
     "instascan": "1.0.0",
     "jquery": "3.3.1",