xsteadfastx/dsnet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Optionally generate vyatta commands

Browse Source
This commit is contained in:
Callan Bryant 2020-10-19 00:04:05 +01:00
parent a4b900dee7
commit d1d0113832
No known key found for this signature in database
GPG Key ID: C31FA9DF3ACBFFAA
2 changed files with 50 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
add.go
View File

@ -8,6 +8,41 @@ import (
"time" "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() { func Add() {
if len(os.Args) != 3 { if len(os.Args) != 3 {
// TODO non-red // TODO non-red
@ -58,20 +93,18 @@ func PrintPeerCfg(peer PeerConfig, conf *DsnetConfig) {
allowedIPsStr[i+1] = net.String() allowedIPsStr[i+1] = net.String()
} }
const peerConf = `[Interface] var peerConf string
Address = {{ .Peer.IP }}
PrivateKey={{ .Peer.PrivateKey.Key }}
{{- if .DsnetConfig.DNS }}
DNS = {{ .DsnetConfig.DNS }}
{{ end }}
[Peer] switch os.Getenv("DSNET_OUTPUT") {
PublicKey={{ .DsnetConfig.PrivateKey.PublicKey.Key }} // https://manpages.debian.org/unstable/wireguard-tools/wg-quick.8.en.html
PresharedKey={{ .Peer.PresharedKey.Key }} case "", "wg-quick":
Endpoint={{ .DsnetConfig.ExternalIP }}:{{ .DsnetConfig.ListenPort }} peerConf = wgQuickPeerConf
AllowedIPs={{ .AllowedIPs }} // https://github.com/WireGuard/wireguard-vyatta-ubnt/
PersistentKeepalive={{ .Keepalive }} case "vyatta":
` peerConf = vyattaPeerConf
default:
ExitFail("Unrecognised DSNET_OUTPUT type")
}
t := template.Must(template.New("peerConf").Parse(peerConf)) t := template.Must(template.New("peerConf").Parse(peerConf))
err := t.Execute(os.Stdout, map[string]interface{}{ err := t.Execute(os.Stdout, map[string]interface{}{

4
cmd/dsnet.go
View File

@ -58,6 +58,10 @@ Available commands:
down : Destroy the interface, run pre/post down down : Destroy the interface, run pre/post down
sync : Update wireguard configuration from %[1]s after validating 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 dsnet version %[2]s
commit %[3]s commit %[3]s