#115 refactor: getinterface method is now part of the wireguard config

+ Also added calls to AddClient and RemoveClient where needed

Linguard/Core.Test/Mocks/DefaultConfiguration.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Linq;
 using Linguard.Core.Configuration;
 using Linguard.Core.Drivers.TrafficStorage;
 using Linguard.Core.Models.Wireguard;
@@ -9,14 +10,23 @@ namespace Core.Test.Mocks;
 public sealed class DefaultConfiguration : Mock<IConfiguration> {
 
     public DefaultConfiguration() {
-        SetupProperty(c => c.Wireguard, new Mock<IWireguardConfiguration>().
-            SetupProperty(c => c.Interfaces, new HashSet<Interface>())
-            .Object);
+        SetupProperty(c => c.Wireguard, GetWireguardConfigurationMock().Object);
         SetupProperty(c => c.Logging, new Mock<ILoggingConfiguration>().Object);
         SetupProperty(c => c.Traffic, new Mock<ITrafficConfiguration>()
             .SetupProperty(c => c.StorageDriver, new Mock<ITrafficStorageDriver>().Object)
             .Object);
         SetupProperty(c => c.Web, new Mock<IWebConfiguration>().Object);
         Setup(o => o.Clone()).Returns(Object);
     }
+
+    private Mock<IWireguardConfiguration> GetWireguardConfigurationMock() {
+        var wireguardConfiguration = new Mock<IWireguardConfiguration>();
+        var interfaces = new HashSet<Interface>();
+        wireguardConfiguration.Setup(o => o.GetInterface(It.IsAny<Client>()))
+            .Returns<Client>(c => 
+                interfaces.SingleOrDefault(i => i.Clients.Contains(c))
+            );
+        wireguardConfiguration.SetupProperty(c => c.Interfaces, interfaces);
+        return wireguardConfiguration;
+    }
 }

Linguard/Core/Configuration/IWireguardConfiguration.cs

@@ -28,4 +28,10 @@ public interface IWireguardConfiguration : ICloneable {
     /// Default endpoint for all peers if none specified at interface level.  
     /// </summary>
     public Uri? Endpoint { get; set; }
+    /// <summary>
+    /// Get the interface associated to a given client or <c>default</c> if none.
+    /// </summary>
+    /// <param name="client"></param>
+    /// <returns></returns>
+    Interface? GetInterface(Client client);
 }

Linguard/Core/Configuration/WireguardConfiguration.cs

@@ -10,7 +10,9 @@ public class WireguardConfiguration : IWireguardConfiguration {
     public Uri? PrimaryDns { get; set; }
     public Uri? SecondaryDns { get; set; }
     public Uri? Endpoint { get; set; }
-
+    public Interface? GetInterface(Client client) => Interfaces
+        .SingleOrDefault(i => i.Clients.Contains(client));
+
     public object Clone() {
         return MemberwiseClone();
     }

Linguard/Core/Services/IWireguardService.cs

@@ -3,12 +3,14 @@
 
 namespace Linguard.Core.Services; 
 
+/// <summary>
+/// Provides an abstraction layer to interact with Wireguard.
+/// </summary>
 public interface IWireguardService {
-    Interface? GetInterface(Client client);
     void StartInterface(Interface iface);
     void StopInterface(Interface iface);
     void AddClient(Interface iface, Client client);
-    void RemoveClient(Interface iface, Client client);
+    void RemoveClient(Client client);
     string? GenerateWireguardPrivateKey();
     string? GenerateWireguardPublicKey(string privateKey);
     DateTime GetLastHandshake(Client client);

Linguard/Core/Services/WireguardService.cs

@@ -19,9 +19,6 @@ public WireguardService(IConfigurationManager configurationManager, ISystemWrapp
 
     private IWireguardConfiguration Configuration => _configurationManager.Configuration.Wireguard;
 
-    public Interface? GetInterface(Client client) => Configuration.Interfaces
-        .SingleOrDefault(i => i.Clients.Contains(client));
-
     public void StartInterface(Interface @interface) {
         var result = _systemWrapper
             .RunCommand($"sudo {Configuration.WireguardQuickBin} up {@interface.Name}");
@@ -41,7 +38,8 @@ public void AddClient(Interface iface, Client client) {
         if (!result.Success) throw new WireguardException(result.Stderr);
     }
 
-    public void RemoveClient(Interface iface, Client client) {
+    public void RemoveClient(Client client) {
+        var iface = Configuration.GetInterface(client);
         var cmd = $"sudo {Configuration.WireguardQuickBin} set {iface.Name} peer {client.PublicKey} remove";
         var result = _systemWrapper.RunCommand(cmd);
         if (!result.Success) throw new WireguardException(result.Stderr);
@@ -63,7 +61,7 @@ public string GenerateWireguardPublicKey(string privateKey) {
 
     public DateTime GetLastHandshake(Client client) {
         var rawData = _systemWrapper
-            .RunCommand($"{Configuration.WireguardBin} show {GetInterface(client).Name} dump")
+            .RunCommand($"{Configuration.WireguardBin} show {Configuration.GetInterface(client).Name} dump")
             .Stdout;
         try {
             return WireguardDumpParser.GetLastHandshake(rawData, client);
@@ -82,7 +80,7 @@ public IEnumerable<TrafficData> GetTrafficData() {
     }
 
     public TrafficData? GetTrafficData(Client client) {
-        var data = GetTrafficData(GetInterface(client));
+        var data = GetTrafficData(Configuration.GetInterface(client));
         return data.SingleOrDefault(e => e.Peer.Equals(client));
     }
 

Linguard/Web/Pages/AddClient.razor

@@ -52,6 +52,7 @@
     private void Submit(Client client) {
         var result = _validator.Validate(client);
         if (result.IsValid) {
+            _wireguardService.AddClient(Interface, client);
             Interface!.Clients.Add(client);
             _configurationManager.Save();
             _navigationManager.NavigateTo("wireguard");

Linguard/Web/Pages/Wireguard.razor

@@ -85,8 +85,8 @@
         <RadzenDataGridColumn TItem="Client" Property="IPv6Address" Title="IPv6"/>
         <RadzenDataGridColumn TItem="Client" Title="Interface">
             <Template Context="data">
-                <a href="/interface/@(_wireguardService.GetInterface(data)?.Id)">
-                    @(_wireguardService.GetInterface(data)?.Name)
+                <a href="/interface/@(Configuration.Wireguard.GetInterface(data)?.Id)">
+                    @(Configuration.Wireguard.GetInterface(data)?.Name)
                 </a>
             </Template>
         </RadzenDataGridColumn>

Linguard/Web/Services/WebService.cs

@@ -50,6 +50,7 @@ public void RemoveWireguardModel(IWireguardPeer peer) {
                 RemoveInterface(iface);
                 break;
         }
+        ConfigurationManager.Save();
     }
 
     public byte[] GetQrCode(IWireguardPeer peer) {
@@ -59,12 +60,11 @@ public byte[] GetQrCode(IWireguardPeer peer) {
     }
 
     private void RemoveClient(Client client) {
-        WireguardService.GetInterface(client)?.Clients.Remove(client);
-        ConfigurationManager.Save();
+        WireguardService.RemoveClient(client);
+        Configuration.GetInterface(client)?.Clients.Remove(client);
     }
 
     private void RemoveInterface(Interface iface) {
         Configuration.Interfaces.Remove(iface);
-        ConfigurationManager.Save();
     }
 }

Linguard/Web/Shared/ClientConfigurationForm.razor

@@ -202,7 +202,7 @@
     protected override void OnInitialized() {
         base.OnInitialized();
         if (Interface == default) {
-            Interface = _wireguardService.GetInterface(Client);
+            Interface = Configuration.Wireguard.GetInterface(Client);
         }
     }
 

Linguard/WebMock/Program.cs

@@ -27,7 +27,7 @@
 
 var manager = new DefaultConfigurationManager().Object;
 var systemMock = new SystemMock().Object;
-var wireguardServiceMock = new WireguardServiceMock(manager, systemMock).Object;
+var wireguardServiceMock = new WireguardServiceMock(systemMock).Object;
 builder.Services.AddSingleton(manager);
 builder.Services.AddSingleton(systemMock);
 builder.Services.AddSingleton(wireguardServiceMock);

Linguard/WebMock/WireguardServiceMock.cs

@@ -1,21 +1,15 @@
-using Linguard.Core.Managers;
-using Linguard.Core.Models.Wireguard;
+using Linguard.Core.Models.Wireguard;
 using Linguard.Core.OS;
 using Linguard.Core.Services;
 using Moq;
 
 namespace WebMock; 
 
 public class WireguardServiceMock : Mock<IWireguardService> {
-    public WireguardServiceMock(IConfigurationManager configurationManager, ISystemWrapper systemWrapper) {
+    public WireguardServiceMock(ISystemWrapper systemWrapper) {
         Setup(o => o.StartInterface(It.IsAny<Interface>()))
             .Callback<Interface>(systemWrapper.AddNetworkInterface);
         Setup(o => o.StopInterface(It.IsAny<Interface>()))
             .Callback<Interface>(systemWrapper.RemoveNetworkInterface);
-        Setup(o => o.GetInterface(It.IsAny<Client>()))
-            .Returns<Client>(c => 
-                configurationManager.Configuration.Wireguard.Interfaces
-                    .SingleOrDefault(i => i.Clients.Contains(c))
-                );
     }
 }