From db872c426167b378031e914d5406a7b95a66a014 Mon Sep 17 00:00:00 2001
From: Ioannis Dressos <96877388+idressos@users.noreply.github.com>
Date: Sun, 22 Oct 2023 15:36:14 +0300
Subject: [PATCH] Show only connected peers of relevant device in status page

---
 handler/routes.go     | 65 ++++++++++++++++++++++++++-----------------
 templates/status.html |  1 -
 2 files changed, 40 insertions(+), 26 deletions(-)

diff --git a/handler/routes.go b/handler/routes.go
index b5b274a..b57da03 100644
--- a/handler/routes.go
+++ b/handler/routes.go
@@ -2,6 +2,7 @@ package handler
 
 import (
 	"crypto/subtle"
+	"path/filepath"
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
@@ -805,6 +806,16 @@ func GlobalSettings(db store.IStore) echo.HandlerFunc {
 	}
 }
 
+func extractDeviceNameFromConfigPath(db store.IStore) string {
+	settings, err := db.GetGlobalSettings()
+	if err != nil {
+		log.Error("Cannot get global settings: ", err)
+	}
+
+    base := filepath.Base(settings.ConfigFilePath)
+    return strings.TrimSuffix(base, filepath.Ext(base))
+}
+
 // Status handler
 func Status(db store.IStore) echo.HandlerFunc {
 	type PeerVM struct {
@@ -835,6 +846,8 @@ func Status(db store.IStore) echo.HandlerFunc {
 			})
 		}
 
+		deviceName := extractDeviceNameFromConfigPath(db)
+
 		devices, err := wgClient.Devices()
 		if err != nil {
 			return c.Render(http.StatusInternalServerError, "status.html", map[string]interface{}{
@@ -863,35 +876,37 @@ func Status(db store.IStore) echo.HandlerFunc {
 
 			conv := map[bool]int{true: 1, false: 0}
 			for i := range devices {
-				devVm := DeviceVM{Name: devices[i].Name}
-				for j := range devices[i].Peers {
-					var allocatedIPs string
-					for _, ip := range devices[i].Peers[j].AllowedIPs {
-						if len(allocatedIPs) > 0 {
-							allocatedIPs += "</br>"
+				if devices[i].Name == deviceName {
+					devVm := DeviceVM{Name: devices[i].Name}
+					for j := range devices[i].Peers {
+						var allocatedIPs string
+						for _, ip := range devices[i].Peers[j].AllowedIPs {
+							if len(allocatedIPs) > 0 {
+								allocatedIPs += "</br>"
+							}
+							allocatedIPs += ip.String()
 						}
-						allocatedIPs += ip.String()
-					}
-					pVm := PeerVM{
-						PublicKey:         devices[i].Peers[j].PublicKey.String(),
-						ReceivedBytes:     devices[i].Peers[j].ReceiveBytes,
-						TransmitBytes:     devices[i].Peers[j].TransmitBytes,
-						LastHandshakeTime: devices[i].Peers[j].LastHandshakeTime,
-						LastHandshakeRel:  time.Since(devices[i].Peers[j].LastHandshakeTime),
-						AllocatedIP:       allocatedIPs,
-						Endpoint:          devices[i].Peers[j].Endpoint.String(),
-					}
-					pVm.Connected = pVm.LastHandshakeRel.Minutes() < 3.
+						pVm := PeerVM{
+							PublicKey:         devices[i].Peers[j].PublicKey.String(),
+							ReceivedBytes:     devices[i].Peers[j].ReceiveBytes,
+							TransmitBytes:     devices[i].Peers[j].TransmitBytes,
+							LastHandshakeTime: devices[i].Peers[j].LastHandshakeTime,
+							LastHandshakeRel:  time.Since(devices[i].Peers[j].LastHandshakeTime),
+							AllocatedIP:       allocatedIPs,
+							Endpoint:          devices[i].Peers[j].Endpoint.String(),
+						}
+						pVm.Connected = pVm.LastHandshakeRel.Minutes() < 3.
 
-					if _client, ok := m[pVm.PublicKey]; ok {
-						pVm.Name = _client.Name
-						pVm.Email = _client.Email
+						if _client, ok := m[pVm.PublicKey]; ok {
+							pVm.Name = _client.Name
+							pVm.Email = _client.Email
+						}
+						devVm.Peers = append(devVm.Peers, pVm)
 					}
-					devVm.Peers = append(devVm.Peers, pVm)
+					sort.SliceStable(devVm.Peers, func(i, j int) bool { return devVm.Peers[i].Name < devVm.Peers[j].Name })
+					sort.SliceStable(devVm.Peers, func(i, j int) bool { return conv[devVm.Peers[i].Connected] > conv[devVm.Peers[j].Connected] })
+					devicesVm = append(devicesVm, devVm)
 				}
-				sort.SliceStable(devVm.Peers, func(i, j int) bool { return devVm.Peers[i].Name < devVm.Peers[j].Name })
-				sort.SliceStable(devVm.Peers, func(i, j int) bool { return conv[devVm.Peers[i].Connected] > conv[devVm.Peers[j].Connected] })
-				devicesVm = append(devicesVm, devVm)
 			}
 		}
 
diff --git a/templates/status.html b/templates/status.html
index a9b770b..d7c568c 100644
--- a/templates/status.html
+++ b/templates/status.html
@@ -35,7 +35,6 @@ Connected Peers
         {{ end}}
         {{ range $dev := .devices }}
             <table class="table table-sm">
-                <caption>List of connected peers for device with name {{ $dev.Name }} </caption>
               <thead>
                 <tr>
                   <th scope="col">#</th>