Merge pull request #50 from xterm-inator/peer-names

Add peer name or comment of name to router depending on MikroTik version

api/app/Listeners/CreateWireGuardPeer.php

@@ -27,6 +27,7 @@ public function __construct()
     public function handle(ConfigCreated $event): void
     {
         $peer = new Peer(
+            $event->config->peer_name,
             $event->config->address,
             $event->config->peer_public_key,
             config('services.wireguard.interface'),

api/app/RouterOS/Data/Peer.php

@@ -4,11 +4,16 @@
 
 readonly class Peer
 {
+    public string $name;
+
     public function __construct(
+        $name,
         public string $allowedAddress,
         public string $publicKey,
         public string $interface,
         public string $presharedKey,
     )
-    {}
+    {
+        $this->name = preg_replace('/[^A-Za-z0-9 .\-_@+]/', '', $name);
+    }
 }

api/app/RouterOS/Data/Resource.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace App\RouterOS\Data;
+
+readonly class Resource
+{
+    public string $version;
+
+    public function __construct(string $version)
+    {
+        $this->version = explode(' ', $version)[0];
+    }
+}

api/app/RouterOS/Data/WireGuardInterface.php

@@ -2,8 +2,8 @@
 
 namespace App\RouterOS\Data;
 
-class WireGuardInterface
+readonly class WireGuardInterface
 {
-    public function __construct(public readonly string $publicKey)
+    public function __construct(public string $publicKey)
     {}
 }

api/app/RouterOS/Resource.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace App\RouterOS;
+
+use App\RouterOS\Data\Resource as ResourceData;
+
+class Resource extends RouterOS
+{
+
+    public static function getRouterResource(): ResourceData
+    {
+        $routerOS = new self();
+
+        $response = $routerOS->client->query('/system/resource/print')->read();
+        if ($response) {
+            return new ResourceData($response[0]['version']);
+        }
+
+        throw new \Exception('Could not find WireGuard interface');
+    }
+}

api/app/RouterOS/WireGuard.php

@@ -63,12 +63,15 @@ public static function getPeers(): array
     public static function createPeer(Peer $peer): void
     {
         $routerOS = new self();
+        $resource = Resource::getRouterResource();
+        $useName = version_compare($resource->version, '7.15') >= 0;
 
         $query = new Query('/interface/wireguard/peers/add');
         $query->equal('allowed-address',  $peer->allowedAddress)
             ->equal('interface', $peer->interface)
             ->equal('public-key', $peer->publicKey)
-            ->equal('preshared-key', $peer->presharedKey);
+            ->equal('preshared-key', $peer->presharedKey)
+            ->equal($useName ? 'name' : 'comment', $peer->name);
 
         $routerOS->client->query($query)->read();
     }