Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 8053743024 | |||
| 06088d55c2 | |||
| 83716bb98c | |||
| fb127a58a9 | |||
| 908d73d464 | |||
| 2e716da23f |
+33
-4
@@ -1,17 +1,35 @@
|
||||
package wireguard
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"errors"
|
||||
"fmt"
|
||||
"io"
|
||||
"net/netip"
|
||||
"strconv"
|
||||
"strings"
|
||||
"text/template"
|
||||
|
||||
"darvaza.org/core"
|
||||
"gopkg.in/gcfg.v1"
|
||||
)
|
||||
|
||||
var configTemplate = template.Must(template.New("config").Funcs(template.FuncMap{
|
||||
"StringsJoin": strings.Join,
|
||||
}).Parse(`[Interface]
|
||||
Address = {{.Interface.Address}}
|
||||
PrivateKey = {{.Interface.PrivateKey}}
|
||||
ListenPort = {{.Interface.ListenPort}}
|
||||
{{range .Peer}}
|
||||
|
||||
[Peer]
|
||||
# {{.Endpoint.Name}}
|
||||
PublicKey = {{.PublicKey}}
|
||||
Endpoint = {{.Endpoint}}
|
||||
AllowedIPs = {{ StringsJoin .AllowedIPs ", "}}
|
||||
{{end}}
|
||||
`))
|
||||
|
||||
// Config represents a wgN.conf file
|
||||
type Config struct {
|
||||
Interface InterfaceConfig
|
||||
@@ -19,13 +37,24 @@ type Config struct {
|
||||
}
|
||||
|
||||
// GetAddress is a shortcut to the interface's address
|
||||
func (f *Config) GetAddress() netip.Addr {
|
||||
return f.Interface.Address
|
||||
func (wg *Config) GetAddress() netip.Addr {
|
||||
return wg.Interface.Address
|
||||
}
|
||||
|
||||
// Peers tells how many peers are described
|
||||
func (f *Config) Peers() int {
|
||||
return len(f.Peer)
|
||||
func (wg *Config) Peers() int {
|
||||
return len(wg.Peer)
|
||||
}
|
||||
|
||||
// WriteTo writes a Wireguard [Config] onto the provided [io.Writer]
|
||||
func (wg *Config) WriteTo(w io.Writer) (int64, error) {
|
||||
var buf bytes.Buffer
|
||||
|
||||
if err := configTemplate.Execute(&buf, wg); err != nil {
|
||||
return 0, err
|
||||
}
|
||||
|
||||
return buf.WriteTo(w)
|
||||
}
|
||||
|
||||
// InterfaceConfig represents the [Interface] section
|
||||
|
||||
@@ -268,6 +268,31 @@ func (m *Machine) SyncWireguardConfig(ring int) error {
|
||||
return m.zone.SyncWireguardConfig(ring)
|
||||
}
|
||||
|
||||
func (m *Machine) WriteWireguardConfig(ring int) error {
|
||||
r, err := m.zone.GetRing(ring)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return m.writeWireguardRing(r)
|
||||
}
|
||||
|
||||
func (m *Machine) writeWireguardRing(r *Ring) error {
|
||||
wg, err := r.ExportConfig(m.ID)
|
||||
if err != nil {
|
||||
return nil
|
||||
}
|
||||
|
||||
f, err := m.CreateTruncFile("wg%v.conf", r.Ring)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer f.Close()
|
||||
|
||||
_, err = wg.WriteTo(f)
|
||||
return err
|
||||
}
|
||||
|
||||
func (m *Machine) createRingInfo(ring int, enabled bool) (*RingInfo, error) {
|
||||
keys, err := wireguard.NewKeyPair()
|
||||
if err != nil {
|
||||
|
||||
+32
-1
@@ -1,9 +1,40 @@
|
||||
package zones
|
||||
|
||||
import "git.jpi.io/amery/jpictl/pkg/wireguard"
|
||||
|
||||
type Ring struct {
|
||||
Ring int
|
||||
}
|
||||
|
||||
func (*Ring) ExportConfig(_ int) (*wireguard.Config, error) {
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
func (*Zone) GetRing(_ int) (*Ring, error) {
|
||||
return &Ring{}, nil
|
||||
}
|
||||
|
||||
// SyncWireguardConfig updates all wgN.conf files for the specified
|
||||
// ring
|
||||
func (z *Zone) SyncWireguardConfig(ring int) error {
|
||||
return z.PruneWireguardConfig(ring)
|
||||
err := z.PruneWireguardConfig(ring)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
r, err := z.GetRing(ring)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
z.ForEachMachine(func(p *Machine) bool {
|
||||
if _, ok := p.getRingInfo(ring); ok {
|
||||
err = p.writeWireguardRing(r)
|
||||
}
|
||||
return err != nil
|
||||
})
|
||||
|
||||
return err
|
||||
}
|
||||
|
||||
// PruneWireguardConfig removes wgN.conf files of machines with
|
||||
|
||||
Reference in New Issue
Block a user