fix: validate base URL before passing it to websocket constructor

Closes #316
zachowj · Dec 31, 2020 · 94d603d · 94d603d
1 parent f4e4ce6
commit 94d603d
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 10 deletions.
diff --git a/lib/home-assistant.js b/lib/home-assistant.js
@@ -28,15 +28,6 @@ class HomeAssistant {
     }
 
     async connect() {
-        if (!this.config.baseUrl) {
-            throw new Error('Base URL needs to be set');
-        }
-        if (!/^https?:\/\//.test(this.config.baseUrl)) {
-            throw new Error(
-                'Invalid Base Url. Needs to start with http:// or https://'
-            );
-        }
-
         await this.websocket.connect();
     }
 

diff --git a/nodes/config-server/config-server.js b/nodes/config-server/config-server.js
@@ -2,6 +2,7 @@ const bonjour = require('bonjour')();
 const flatten = require('flat');
 const selectn = require('selectn');
 const uniq = require('lodash.uniq');
+const url = require('url');
 
 const BaseNode = require('../../lib/base-node');
 const HomeAssistant = require('../../lib/home-assistant');
@@ -184,8 +185,15 @@ module.exports = function (RED) {
         }
 
         async init() {
+            const baseUrl = this.credentials.host.trim();
+            const errorMessage = validateBaseUrl(baseUrl);
+            if (errorMessage) {
+                this.node.error(RED._(errorMessage, { url: baseUrl }));
+                return;
+            }
+
             this.homeAssistant = new HomeAssistant({
-                baseUrl: this.credentials.host,
+                baseUrl,
                 apiPass: this.credentials.access_token,
                 legacy: this.nodeConfig.legacy,
                 rejectUnauthorizedCerts: this.nodeConfig
@@ -328,4 +336,22 @@ module.exports = function (RED) {
             access_token: { type: 'text' },
         },
     });
+
+    function validateBaseUrl(baseUrl) {
+        if (!baseUrl) {
+            return 'config-server.errors.empty_base_url';
+        }
+
+        let parsedUrl;
+        try {
+            // eslint-disable-next-line no-new
+            parsedUrl = new url.URL(baseUrl);
+        } catch (e) {
+            return 'config-server.errors.invalid_base_url';
+        }
+
+        if (parsedUrl.protocol !== 'http:' && parsedUrl.protocol !== 'https:') {
+            return 'config-server.errors.invalid_protocol';
+        }
+    }
 };
diff --git a/nodes/config-server/locales/en-US/config-server.json b/nodes/config-server/locales/en-US/config-server.json
@@ -0,0 +1,9 @@
+{
+  "config-server": {
+    "errors": {
+      "empty_base_url": "Home Assistant base URL needs to be set",
+      "invalid_base_url": "Invalid base URL for Home Assistant: [__url__]",
+      "invalid_protocol": "Home Assistnat base URL needs to begin with http:// or https://"
+    }
+  }
+}