fix: better sanitize topics (#981)

* fix(hass): nodes sanitized discovery topic * fix: lint issues * fix: better sanitize regex * fix: sanitize only nodeName
zwave-js · Apr 1, 2021 · d8fa77d · d8fa77d
1 parent f2efd4e
commit d8fa77d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/lib/Gateway.js b/lib/Gateway.js
@@ -669,7 +669,9 @@ function deviceInfo (node, nodeName) {
  * @returns The topic string for this device discovery
  */
 function getDiscoveryTopic (hassDevice, nodeName) {
-  return `${hassDevice.type}/${nodeName}/${hassDevice.object_id}/config`
+  return `${hassDevice.type}/${utils.sanitizeTopic(nodeName, true)}/${
+    hassDevice.object_id
+  }/config`
 }
 
 /**

diff --git a/lib/utils.js b/lib/utils.js
@@ -130,7 +130,7 @@ function sanitizeTopic (str, sanitizeSlash) {
   // replace spaces with '_'
   str = str.replace(/\s/g, '_')
   // remove special chars
-  return str.replace(/[+*#\\.'`!?^=(),"%[\]:;{}]+/g, '')
+  return str.replace(/[^A-Za-z0-9-_/]/g, '')
 }
 
 /**