From 6bf2b59c0e12c80a76f505536537ec06cd07c061 Mon Sep 17 00:00:00 2001
From: Matthias Pfeil <matthias.pfeil@wwu.de>
Date: Fri, 27 Oct 2023 17:34:47 +0200
Subject: [PATCH] fix(edit): validate MQTT Integration url (#477)

Correctly validate MQTT integration Url
---
 app/scripts/controllers/account.box.edit.mqtt.js |  5 +++--
 app/views/account.box.edit.mqtt.html             | 10 +++++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/app/scripts/controllers/account.box.edit.mqtt.js b/app/scripts/controllers/account.box.edit.mqtt.js
index d86c459c..d6c383e9 100644
--- a/app/scripts/controllers/account.box.edit.mqtt.js
+++ b/app/scripts/controllers/account.box.edit.mqtt.js
@@ -16,11 +16,12 @@
       topic: '',
       messageFormat: '',
       decodeOptions: '',
-      connectionOptions: ''
+      connectionOptions: '',
     };
 
     vm.save = save;
-
+    // Inspired by https://regex101.com/r/mIA28O/1
+    vm.urlRegEx = /^((mqtt|ws)s?:\/\/)(([^:\s]+):([^:\s]+)@)?([a-zA-Z0-9.-]+)(:\d{1,5})?(\/[^?#\s]*)?$/;
     activate();
 
     ////
diff --git a/app/views/account.box.edit.mqtt.html b/app/views/account.box.edit.mqtt.html
index 8d09d144..7dc02ccf 100644
--- a/app/views/account.box.edit.mqtt.html
+++ b/app/views/account.box.edit.mqtt.html
@@ -22,7 +22,15 @@ <h2 style="margin-top: 0px; margin-bottom: 0px">{{'EDIT_MQTTOPTIONS'|translate}}
   <!-- MQTT URL -->
   <div ng-class="{'has-error': mqttSettings.mqttURL.$invalid, 'has-success': mqttSettings.mqttURL.$valid }">
     <label for="mqttURL">{{ 'MQTT_URL' | translate}}*</label>
-    <input type="url" name="mqttURL" class="form-control" ng-model="mqtt.settings.url" title="{{ 'PLEASE_SPECIFY_FIRSTNAME' | translate }}" ng-required="mqtt.settings.enabled" ng-disabled="!mqtt.settings.enabled">
+    <input
+      type="text"
+      name="mqttURL"
+      class="form-control"
+      ng-model="mqtt.settings.url"
+      ng-pattern="mqtt.urlRegEx"
+      title="{{ 'PLEASE_SPECIFY_FIRSTNAME' | translate }}"
+      ng-required="mqtt.settings.enabled"
+      ng-disabled="!mqtt.settings.enabled">
   </div>
 
   <!-- MQTT TOPIC -->