Merge pull request #11 from kayex/develop

MQTT Authentication 🔒

.env.example

@@ -15,6 +15,8 @@ DB_PASSWORD=secret
 
 MQTT_HOST=null
 MQTT_PORT=1883
+MQTT_USER=null
+MQTT_PASS=null
 MQTT_CLIENT_ID=sirius-api
 MQTT_TOPIC=sirius
 

app/Helpers/MQTT.php

@@ -13,20 +13,42 @@
 
 class MQTT
 {
+    private $host;
+    private $port;
+    private $user;
+    private $password;
     private $conn;
+    private $connected = false;
+
+    public function __construct(
+        string $host,
+        string $port,
+        string $clientId,
+        $user = null,
+        $password = null
+    ) {
+        $this->user = $user;
+        $this->password = $password;
 
-    public function __construct(string $host, string $port, string $clientId)
-    {
         $this->conn = new MQTTClient($host, $port, $clientId);
+    }
 
-        if (!$this->conn->connect()) {
-            throw MQTTException::connectionFailed($host, $port);
+    public function publish(string $topic, string $message)
+    {
+        if (!$this->connected) {
+            $this->connect();
         }
+
+        $this->conn->publish($topic, $message);
+        Log::debug("MQTT publish: $message");
     }
 
-    public function publish(string $topic, string $message)
+    private function connect()
     {
-            $this->conn->publish($topic, $message);
-            Log::debug("MQTT publish: $message");
+        if (!$this->conn->connect(true, null, $this->user, $this->password)) {
+            throw MQTTException::connectionFailed($this->host, $this->port);
+        }
+
+        $this->connected = true;
     }
 }

app/Providers/MQTTServiceProvider.php

@@ -14,6 +14,8 @@
 
 class MQTTServiceProvider extends ServiceProvider
 {
+    protected $defer = true;
+
     /**
      * Bootstrap the application services.
      *
@@ -37,7 +39,9 @@ public function register()
             $mqtt = new MQTT(
                 $config->get('mqtt.host'),
                 $config->get('mqtt.port'),
-                $config->get('mqtt.client_id')
+                $config->get('mqtt.client_id'),
+                $config->get('mqtt.user'),
+                $config->get('mqtt.password')
             );
 
             return new MQTTNotifier($mqtt, $config->get('mqtt.topic'));

config/mqtt.php

@@ -3,6 +3,8 @@
 return [
     'host' => env('MQTT_HOST', null),
     'port' => env('MQTT_PORT', 1883),
+    'user' => env('MQTT_USER', null),
+    'password' => env('MQTT_PASS', null),
     'client_id' => env('MQTT_CLIENT_ID', 'sirius-api'),
     'topic' => env('MQTT_TOPIC', 'sirius')
 ];