fix(edit): validate MQTT Integration url (#477)

Correctly validate MQTT integration Url
sensebox · Oct 27, 2023 · 6bf2b59 · 6bf2b59
1 parent b0b7ad0
commit 6bf2b59
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git 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
@@ -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 -->