From d1d01138326a1525a43d511e36cbddf38c217ab2 Mon Sep 17 00:00:00 2001
From: Callan Bryant <callan.bryant@gmail.com>
Date: Mon, 19 Oct 2020 00:04:05 +0100
Subject: [PATCH] Optionally generate vyatta commands

---
 add.go       | 59 ++++++++++++++++++++++++++++++++++++++++------------
 cmd/dsnet.go |  4 ++++
 2 files changed, 50 insertions(+), 13 deletions(-)

diff --git a/add.go b/add.go
index fcf8cb8..fcde7a1 100644
--- a/add.go
+++ b/add.go
@@ -8,6 +8,41 @@ import (
 	"time"
 )
 
+const wgQuickPeerConf = `[Interface]
+Address = {{ .Peer.IP }}
+PrivateKey={{ .Peer.PrivateKey.Key }}
+{{- if .DsnetConfig.DNS }}
+DNS = {{ .DsnetConfig.DNS }}
+{{ end }}
+
+[Peer]
+PublicKey={{ .DsnetConfig.PrivateKey.PublicKey.Key }}
+PresharedKey={{ .Peer.PresharedKey.Key }}
+Endpoint={{ .DsnetConfig.ExternalIP }}:{{ .DsnetConfig.ListenPort }}
+AllowedIPs={{ .AllowedIPs }}
+PersistentKeepalive={{ .Keepalive }}
+`
+
+const vyattaPeerConf = `[Interface]
+configure
+
+set interfaces wireguard dsnet address {{ .Peer.IP }}
+set interfaces wireguard dsnet route-allowed-ips true
+
+set interfaces wireguard dsnet peer {{ .DsnetConfig.PrivateKey.PublicKey.Key }} endpoint {{ .DsnetConfig.ExternalIP }}:{{ .DsnetConfig.ListenPort }}
+set interfaces wireguard dsnet peer allowed-ips {{.AllowedIPs}}
+set interfaces wireguard dsnet peer persistent-keepalive {{.AllowedIPs}}
+
+{{- if .DsnetConfig.DNS }}
+#set service dns forwarding name-server {{ .DsnetConfig.DNS }}
+{{ end }}
+
+set interfaces wireguard dsnet private-key {{ .Peer.PrivateKey.Key }}
+set interfaces wireguard dsnet preshared-key {{ .Peer.PresharedKey.Key }}
+
+commit; save
+`
+
 func Add() {
 	if len(os.Args) != 3 {
 		// TODO non-red
@@ -58,20 +93,18 @@ func PrintPeerCfg(peer PeerConfig, conf *DsnetConfig) {
 		allowedIPsStr[i+1] = net.String()
 	}
 
-	const peerConf = `[Interface]
-Address = {{ .Peer.IP }}
-PrivateKey={{ .Peer.PrivateKey.Key }}
-{{- if .DsnetConfig.DNS }}
-DNS = {{ .DsnetConfig.DNS }}
-{{ end }}
+	var peerConf string
 
-[Peer]
-PublicKey={{ .DsnetConfig.PrivateKey.PublicKey.Key }}
-PresharedKey={{ .Peer.PresharedKey.Key }}
-Endpoint={{ .DsnetConfig.ExternalIP }}:{{ .DsnetConfig.ListenPort }}
-AllowedIPs={{ .AllowedIPs }}
-PersistentKeepalive={{ .Keepalive }}
-`
+	switch os.Getenv("DSNET_OUTPUT") {
+	// https://manpages.debian.org/unstable/wireguard-tools/wg-quick.8.en.html
+	case "", "wg-quick":
+		peerConf = wgQuickPeerConf
+	// https://github.com/WireGuard/wireguard-vyatta-ubnt/
+	case "vyatta":
+		peerConf = vyattaPeerConf
+	default:
+		ExitFail("Unrecognised DSNET_OUTPUT type")
+	}
 
 	t := template.Must(template.New("peerConf").Parse(peerConf))
 	err := t.Execute(os.Stdout, map[string]interface{}{
diff --git a/cmd/dsnet.go b/cmd/dsnet.go
index 2d95a4b..f7bad9a 100644
--- a/cmd/dsnet.go
+++ b/cmd/dsnet.go
@@ -58,6 +58,10 @@ Available commands:
 	down   : Destroy the interface, run pre/post down
 	sync   : Update wireguard configuration from %[1]s after validating
 
+Environment variables:
+
+	DSNET_OUTPUT=wg-quick : The add command will generate a wg-quick config
+	DSNET_OUTPUT=vyatta   : The add command will generate a vyatta (edgeos) config
 
 dsnet version %[2]s
 commit %[3]s