Add: AddServerRoute client configuration parameter, which may implement #4

Author: AndrianBdn

Makefile

@@ -1,4 +1,4 @@
-VERSION=0.1.3
+VERSION=0.1.4
 BUILD=`git rev-parse --short=8 HEAD`
 .PHONY: all fmt static precommit arm64 amd64 fmt static test release release_dir
 

README.md

@@ -29,10 +29,10 @@ Make sure you have WireGuard and iptables installed
 To download using curl run:
 ```shell
 # for x86_64 
-curl -SL https://github.com/andrianbdn/wg-cmd/releases/download/v0.1.3/wg-cmd-0.1.3-linux-amd64 -o /usr/local/bin/wg-cmd
+curl -SL https://github.com/andrianbdn/wg-cmd/releases/download/v0.1.4/wg-cmd-0.1.4-linux-amd64 -o /usr/local/bin/wg-cmd
 
 # for arm64 
-curl -SL https://github.com/andrianbdn/wg-cmd/releases/download/v0.1.3/wg-cmd-0.1.3-linux-arm64 -o /usr/local/bin/wg-cmd
+curl -SL https://github.com/andrianbdn/wg-cmd/releases/download/v0.1.4/wg-cmd-0.1.4-linux-arm64 -o /usr/local/bin/wg-cmd
 ```
 
 Set proper permissions and run the tool: 
@@ -105,7 +105,10 @@ client configuration files.
 
 #### client configuration (nnnn-%client%.toml)
 
-Contains `ClientRoute` that overrides the one from server config.
+`ClientRoute` - completely overrides the `ClientRoute` from the server config
+
+`AddServerRoute` - adds additional network to AllowedIPs for the client on the server side (useful 
+when you want to route traffic to one client to another client's network through the server)
 
 `MTU` - Override server MTU with a different value for this client. Set to -1 to omit MTU from this WireGuard client config.
 

app/app.go

@@ -84,6 +84,14 @@ func (a *App) LoadInterface(ifName string) error {
 	return err
 }
 
+func (a *App) GenerateWireguardConfigLog() {
+	_, err := a.GenerateWireguardConfig()
+	if err != nil {
+		// TODO: probably not the best way to handle this error
+		log.Println("Error generating config", err)
+	}
+}
+
 func (a *App) GenerateWireguardConfig() (string, error) {
 	configPath := filepath.Join(a.Settings.WireguardDir, a.State.Server.Interface) + ".conf"
 	return configPath, a.State.GenerateWireguardFile(configPath, false)

backend/client.go

@@ -14,14 +14,15 @@ import (
 )
 
 type Client struct {
-	ipNum       int
-	name        string
-	fileName    string
-	PublicKey   string
-	PrivateKey  string
-	ClientRoute string
-	MTU         int
-	DNS         string
+	ipNum          int
+	name           string
+	fileName       string
+	PublicKey      string
+	PrivateKey     string
+	ClientRoute    string
+	AddServerRoute string
+	MTU            int
+	DNS            string
 }
 
 func ReadClient(dir string, fileName string, ipNum int, name string) (*Client, error) {

backend/generator.go

@@ -31,7 +31,13 @@ func (s *Server) generateServerPeerConfig(client *Client, w io.Writer) error {
 		_, _ = fmt.Fprintln(w, "PresharedKey =", s.PresharedKey)
 	}
 	_, _ = fmt.Fprintln(w, "PublicKey =", client.PublicKey)
-	_, _ = fmt.Fprintln(w, "AllowedIPs =", client.AllowedIps(s))
+
+	allowedIps := client.AllowedIps(s)
+	if client.AddServerRoute != "" {
+		allowedIps = allowedIps + ", " + client.AddServerRoute
+	}
+
+	_, _ = fmt.Fprintln(w, "AllowedIPs =", allowedIps)
 
 	return nil
 }

ext_editor.go

@@ -56,6 +56,10 @@ func (m MainScreen) editorEvents(msg tea.Msg) (bool, tea.Model, tea.Cmd) {
 			m.table = newAppDynamicTableList(m.app, &m.table)
 		}
 
+		// Even if we edit peer, we may need to regenerate the server config
+		// because of AddServerRoute client configuration option mainly
+		m.app.GenerateWireguardConfigLog()
+
 		return true, m, nil
 	}
 

tui_main.go

@@ -218,10 +218,7 @@ func (m MainScreen) ReallyAddPeer(name string) MainScreen {
 		log.Println("Error adding peer", err)
 	}
 	if err == nil {
-		_, err = m.app.GenerateWireguardConfig()
-		if err != nil {
-			log.Println("Error generating config", err)
-		}
+		m.app.GenerateWireguardConfigLog()
 	}
 	m.dialog = nil
 	m.table = newAppDynamicTableList(m.app, &m.table)
@@ -241,10 +238,7 @@ func (m MainScreen) ReallyDeletePeer() MainScreen {
 			log.Println("Error deleting peer", err)
 		}
 		if err == nil {
-			_, err = m.app.GenerateWireguardConfig()
-			if err != nil {
-				log.Println("Error generating config", err)
-			}
+			m.app.GenerateWireguardConfigLog()
 		}
 
 		m.table.DeleteSelectedRow()