Merge pull request #919 from RickCarlino/mqtt_updates

Update allowed MQTT channel regex
FarmBot · Jul 19, 2018 · 95350ac · 95350ac
2 parents 60111d0 + ec58467
commit 95350ac
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/app/controllers/api/rmq_utils_controller.rb b/app/controllers/api/rmq_utils_controller.rb
@@ -7,7 +7,8 @@ module Api
   class RmqUtilsController < Api::AbstractController
     # The only valid format for AMQP / MQTT topics.
     # Prevents a whole host of abuse / security issues.
-    TOPIC_REGEX     = /(bot\.device_)\d*\.(from_clients|from_device|logs|status|sync|resources_v0|from_api)\.?.*/
+    TOPIC_REGEX     = \
+      /(bot\.device_)\d*\.(from_clients|from_device|logs|status|sync|resources_v0|from_api)\.?.*/
     MALFORMED_TOPIC = "malformed topic. Must match #{TOPIC_REGEX.inspect}"
     ALL             = [:user, :vhost, :resource, :topic]
     VHOST           = ENV.fetch("MQTT_VHOST") { "/" }