Compare commits
1 Commits
v0.4.6
..
eebb557fce
| Author | SHA1 | Date | |
|---|---|---|---|
 amery
|
eebb557fce |
+1
-1
@@ -1 +1 @@
|
||||
.tmp
|
||||
/jpictl
|
||||
|
||||
@@ -1,59 +0,0 @@
|
||||
.PHONY: all clean install generate fmt tidy
|
||||
.PHONY: FORCE
|
||||
|
||||
GO ?= go
|
||||
GOFMT ?= gofmt
|
||||
GOFMT_FLAGS = -w -l -s
|
||||
GOGENERATE_FLAGS = -v
|
||||
|
||||
GOPATH ?= $(shell $(GO) env GOPATH)
|
||||
GOBIN ?= $(GOPATH)/bin
|
||||
|
||||
TOOLSDIR := $(CURDIR)/pkg/tools
|
||||
TMPDIR ?= .tmp
|
||||
|
||||
REVIVE ?= $(GOBIN)/revive
|
||||
REVIVE_CONF ?= $(TOOLSDIR)/revive.toml
|
||||
REVIVE_RUN_ARGS ?= -config $(REVIVE_CONF) -formatter friendly
|
||||
REVIVE_INSTALL_URL ?= github.com/mgechev/revive
|
||||
|
||||
GO_INSTALL_URLS = \
|
||||
$(REVIVE_INSTALL_URL) \
|
||||
|
||||
V = 0
|
||||
Q = $(if $(filter 1,$V),,@)
|
||||
M = $(shell if [ "$$(tput colors 2> /dev/null || echo 0)" -ge 8 ]; then printf "\033[34;1m▶\033[0m"; else printf "▶"; fi)
|
||||
|
||||
GO_BUILD = $(GO) build -v
|
||||
GO_BUILD_CMD = $(GO_BUILD) -o "$(OUTDIR)"
|
||||
|
||||
all: get generate tidy build
|
||||
|
||||
install:
|
||||
$Q $(GO) install -v ./cmd/...
|
||||
|
||||
clean: ; $(info $(M) cleaning…)
|
||||
rm -rf $(TMPDIR)
|
||||
|
||||
$(TMPDIR)/index: $(TOOLSDIR)/gen_index.sh Makefile FORCE ; $(info $(M) generating index…)
|
||||
$Q mkdir -p $(@D)
|
||||
$Q $< > $@~
|
||||
$Q if cmp $@ $@~ 2> /dev/null >&2; then rm $@~; else mv $@~ $@; fi
|
||||
|
||||
$(TMPDIR)/gen.mk: $(TOOLSDIR)/gen_mk.sh $(TMPDIR)/index Makefile ; $(info $(M) generating subproject rules…)
|
||||
$Q mkdir -p $(@D)
|
||||
$Q $< $(TMPDIR)/index > $@~
|
||||
$Q if cmp $@ $@~ 2> /dev/null >&2; then rm $@~; else mv $@~ $@; fi
|
||||
|
||||
include $(TMPDIR)/gen.mk
|
||||
|
||||
fmt: ; $(info $(M) reformatting sources…)
|
||||
$Q find . -name '*.go' | xargs -r $(GOFMT) $(GOFMT_FLAGS)
|
||||
|
||||
tidy: fmt
|
||||
|
||||
generate: ; $(info $(M) running go:generate…)
|
||||
$Q git grep -l '^//go:generate' | sort -uV | xargs -r -n1 $(GO) generate $(GOGENERATE_FLAGS)
|
||||
|
||||
$(REVIVE):
|
||||
$Q $(GO) install -v $(REVIVE_INSTALL_URL)
|
||||
@@ -1,19 +0,0 @@
|
||||
package main
|
||||
|
||||
import "git.jpi.io/amery/jpictl/pkg/zones"
|
||||
|
||||
// Config describes the repository
|
||||
type Config struct {
|
||||
Base string
|
||||
Domain string
|
||||
}
|
||||
|
||||
var cfg = &Config{
|
||||
Base: "./m",
|
||||
Domain: "m.jpi.cloud",
|
||||
}
|
||||
|
||||
// LoadZones loads all zones and machines in the config directory
|
||||
func (cfg *Config) LoadZones() (*zones.Zones, error) {
|
||||
return zones.New(cfg.Base, cfg.Domain)
|
||||
}
|
||||
@@ -1,89 +0,0 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"encoding/json"
|
||||
"io"
|
||||
"os"
|
||||
|
||||
"github.com/burntSushi/toml"
|
||||
"github.com/spf13/cobra"
|
||||
"gopkg.in/yaml.v3"
|
||||
)
|
||||
|
||||
// Encoder represents an object that encodes another internally
|
||||
type Encoder interface {
|
||||
Encode(any) error
|
||||
}
|
||||
|
||||
// Encoding represents a type of [Encoder]
|
||||
type Encoding int
|
||||
|
||||
const (
|
||||
// TOMLEncoding represents TOML encoding
|
||||
TOMLEncoding Encoding = iota
|
||||
// JSONEncoding represents JSON encoding
|
||||
JSONEncoding
|
||||
// YAMLEncoding represents YAML encoding
|
||||
YAMLEncoding
|
||||
)
|
||||
|
||||
// NewJSONEncoder returns a JSON [Encoder] to work on the given [io.Writer]
|
||||
func NewJSONEncoder(w io.Writer) Encoder {
|
||||
enc := json.NewEncoder(w)
|
||||
enc.SetIndent(``, ` `)
|
||||
return enc
|
||||
}
|
||||
|
||||
// NewYAMLEncoder returns a YAML [Encoder] to work on the given [io.Writer]
|
||||
func NewYAMLEncoder(w io.Writer) Encoder {
|
||||
enc := yaml.NewEncoder(w)
|
||||
enc.SetIndent(2)
|
||||
return enc
|
||||
}
|
||||
|
||||
// NewTOMLEncoder returns a TOML [Encoder] to work on the given [io.Writer]
|
||||
func NewTOMLEncoder(w io.Writer) Encoder {
|
||||
enc := toml.NewEncoder(w)
|
||||
return enc
|
||||
}
|
||||
|
||||
const encoding = YAMLEncoding
|
||||
|
||||
// Command
|
||||
var dumpCmd = &cobra.Command{
|
||||
Use: "dump",
|
||||
Short: "generates a text representation of the config",
|
||||
RunE: func(_ *cobra.Command, _ []string) error {
|
||||
var buf bytes.Buffer
|
||||
var enc Encoder
|
||||
|
||||
m, err := cfg.LoadZones()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
switch encoding {
|
||||
case JSONEncoding:
|
||||
enc = NewJSONEncoder(&buf)
|
||||
case YAMLEncoding:
|
||||
enc = NewYAMLEncoder(&buf)
|
||||
default:
|
||||
enc = NewTOMLEncoder(&buf)
|
||||
}
|
||||
|
||||
if err = enc.Encode(m); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if _, err = buf.WriteTo(os.Stdout); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return nil
|
||||
},
|
||||
}
|
||||
|
||||
func init() {
|
||||
rootCmd.AddCommand(dumpCmd)
|
||||
}
|
||||
@@ -1,25 +0,0 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"os"
|
||||
|
||||
"github.com/spf13/cobra"
|
||||
)
|
||||
|
||||
// Command
|
||||
var envCmd = &cobra.Command{
|
||||
Use: "env",
|
||||
Short: "generates environment variables for shell scripts",
|
||||
RunE: func(_ *cobra.Command, _ []string) error {
|
||||
m, err := cfg.LoadZones()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return m.WriteEnv(os.Stdout)
|
||||
},
|
||||
}
|
||||
|
||||
func init() {
|
||||
rootCmd.AddCommand(envCmd)
|
||||
}
|
||||
@@ -1,4 +1,3 @@
|
||||
// Package main implements the jpictl command
|
||||
package main
|
||||
|
||||
import (
|
||||
@@ -6,7 +5,6 @@ import (
|
||||
)
|
||||
|
||||
const (
|
||||
// CmdName is the name of the executable
|
||||
CmdName = "jpictl"
|
||||
)
|
||||
|
||||
|
||||
@@ -1,23 +0,0 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"github.com/spf13/cobra"
|
||||
)
|
||||
|
||||
// Command
|
||||
var writeCmd = &cobra.Command{
|
||||
Use: "write",
|
||||
Short: "rewrites all config files",
|
||||
RunE: func(_ *cobra.Command, _ []string) error {
|
||||
m, err := cfg.LoadZones()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return m.SyncAll()
|
||||
},
|
||||
}
|
||||
|
||||
func init() {
|
||||
rootCmd.AddCommand(writeCmd)
|
||||
}
|
||||
@@ -3,42 +3,21 @@ module git.jpi.io/amery/jpictl
|
||||
go 1.19
|
||||
|
||||
require (
|
||||
darvaza.org/core v0.9.5
|
||||
darvaza.org/resolver v0.5.2
|
||||
darvaza.org/sidecar v0.0.0-20230721122716-b9c54b8adbaf
|
||||
darvaza.org/slog v0.5.2
|
||||
github.com/burntSushi/toml v0.3.1
|
||||
github.com/hack-pad/hackpadfs v0.2.1
|
||||
github.com/mgechev/revive v1.3.2
|
||||
github.com/spf13/cobra v1.7.0
|
||||
golang.org/x/crypto v0.12.0
|
||||
gopkg.in/gcfg.v1 v1.2.3
|
||||
gopkg.in/yaml.v3 v3.0.1
|
||||
)
|
||||
|
||||
require (
|
||||
darvaza.org/core v0.9.5 // indirect
|
||||
darvaza.org/slog/handlers/filter v0.4.4 // indirect
|
||||
darvaza.org/slog/handlers/zerolog v0.4.4 // indirect
|
||||
github.com/BurntSushi/toml v1.3.2 // indirect
|
||||
github.com/chavacava/garif v0.0.0-20230227094218-b8c73b2037b8 // indirect
|
||||
github.com/fatih/color v1.15.0 // indirect
|
||||
github.com/fatih/structtag v1.2.0 // indirect
|
||||
github.com/inconshreveable/mousetrap v1.1.0 // indirect
|
||||
github.com/mattn/go-colorable v0.1.13 // indirect
|
||||
github.com/mattn/go-isatty v0.0.19 // indirect
|
||||
github.com/mattn/go-runewidth v0.0.15 // indirect
|
||||
github.com/mgechev/dots v0.0.0-20210922191527-e955255bf517 // indirect
|
||||
github.com/miekg/dns v1.1.55 // indirect
|
||||
github.com/mitchellh/go-homedir v1.1.0 // indirect
|
||||
github.com/olekukonko/tablewriter v0.0.5 // indirect
|
||||
github.com/pkg/errors v0.9.1 // indirect
|
||||
github.com/rivo/uniseg v0.4.4 // indirect
|
||||
github.com/rs/zerolog v1.30.0 // indirect
|
||||
github.com/spf13/pflag v1.0.5 // indirect
|
||||
golang.org/x/mod v0.12.0 // indirect
|
||||
golang.org/x/net v0.14.0 // indirect
|
||||
golang.org/x/sys v0.11.0 // indirect
|
||||
golang.org/x/text v0.12.0 // indirect
|
||||
golang.org/x/tools v0.12.0 // indirect
|
||||
gopkg.in/warnings.v0 v0.1.2 // indirect
|
||||
)
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
darvaza.org/core v0.9.4 h1:HYKmYiWehDtqATF0vBv2i/DvdpNP7YJPu3pOW7h0CWI=
|
||||
darvaza.org/core v0.9.4/go.mod h1:O3tHBMlw+xB47uGh5CUx7dXAujBAMmD8BCRFPZmIw54=
|
||||
darvaza.org/core v0.9.5 h1:sS5pZFwicaxJIQixEiqkMr9GknVHYL+EbKDMkR/4jDM=
|
||||
darvaza.org/core v0.9.5/go.mod h1:O3tHBMlw+xB47uGh5CUx7dXAujBAMmD8BCRFPZmIw54=
|
||||
darvaza.org/resolver v0.5.2 h1:VjHhEr/MJBszeDb7tYlXQ9Bsyh4xrDR7Sd10WAmPD6k=
|
||||
darvaza.org/resolver v0.5.2/go.mod h1:fFvsVPEFeMzUIWlLG47Go/6uJYtRLb9R8HIgYg3uaxE=
|
||||
darvaza.org/sidecar v0.0.0-20230721122716-b9c54b8adbaf h1:ya5ZQicBb/GWll3rlqra8No7oJXks7y1m/cJGYBypv4=
|
||||
darvaza.org/sidecar v0.0.0-20230721122716-b9c54b8adbaf/go.mod h1:by+bPsMa7Rxc/ZYG1qBunrtKocv/DkrPBmyFlmq/j2Q=
|
||||
darvaza.org/slog v0.5.2 h1:8TG1WyHjOyh2vW6t3pjzZVaWzpko5MIIpeI7LWqHFvs=
|
||||
@@ -10,24 +10,9 @@ darvaza.org/slog/handlers/filter v0.4.4 h1:b2e2T9fQzMdJ0ia+f6b7kw9/T9GFwhFCKob/2
|
||||
darvaza.org/slog/handlers/filter v0.4.4/go.mod h1:cQlJWuolB6guLug09sX/8Zrzct++M6SPCGvXR37E7Cc=
|
||||
darvaza.org/slog/handlers/zerolog v0.4.4 h1:OR1ASvH1fBCq3t85t4OU6oJPPuqMB1tsDoSpsh6HVJU=
|
||||
darvaza.org/slog/handlers/zerolog v0.4.4/go.mod h1:t60TeEbFcMLo74CkXC2S0rKlnwF4ixZyBR4fqIJV1GE=
|
||||
github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8=
|
||||
github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
|
||||
github.com/burntSushi/toml v0.3.1 h1:Hu1cOEC2qtKULZJCzym5tyA35bZr3HREuolgiAzMlhY=
|
||||
github.com/burntSushi/toml v0.3.1/go.mod h1:sGTquCpRYr9McuHdv0m6YKIhx8DJGJa4t04/Y9pfSio=
|
||||
github.com/chavacava/garif v0.0.0-20230227094218-b8c73b2037b8 h1:W9o46d2kbNL06lq7UNDPV0zYLzkrde/bjIqO02eoll0=
|
||||
github.com/chavacava/garif v0.0.0-20230227094218-b8c73b2037b8/go.mod h1:gakxgyXaaPkxvLw1XQxNGK4I37ys9iBRzNUx/B7pUCo=
|
||||
github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
|
||||
github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
|
||||
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs=
|
||||
github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw=
|
||||
github.com/fatih/structtag v1.2.0 h1:/OdNE99OxoI/PqaW/SuSK9uxxT3f/tcSZgon/ssNSx4=
|
||||
github.com/fatih/structtag v1.2.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4/aAZl94=
|
||||
github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
|
||||
github.com/hack-pad/hackpadfs v0.2.1 h1:FelFhIhv26gyjujoA/yeFO+6YGlqzmc9la/6iKMIxMw=
|
||||
github.com/hack-pad/hackpadfs v0.2.1/go.mod h1:khQBuCEwGXWakkmq8ZiFUvUZz84ZkJ2KNwKvChs4OrU=
|
||||
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
|
||||
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
|
||||
github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
|
||||
@@ -37,27 +22,11 @@ github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27k
|
||||
github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
|
||||
github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
|
||||
github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
|
||||
github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
|
||||
github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U=
|
||||
github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
|
||||
github.com/mgechev/dots v0.0.0-20210922191527-e955255bf517 h1:zpIH83+oKzcpryru8ceC6BxnoG8TBrhgAvRg8obzup0=
|
||||
github.com/mgechev/dots v0.0.0-20210922191527-e955255bf517/go.mod h1:KQ7+USdGKfpPjXk4Ga+5XxQM4Lm4e3gAogrreFAYpOg=
|
||||
github.com/mgechev/revive v1.3.2 h1:Wb8NQKBaALBJ3xrrj4zpwJwqwNA6nDpyJSEQWcCka6U=
|
||||
github.com/mgechev/revive v1.3.2/go.mod h1:UCLtc7o5vg5aXCwdUTU1kEBQ1v+YXPAkYDIDXbrs5I0=
|
||||
github.com/miekg/dns v1.1.55 h1:GoQ4hpsj0nFLYe+bWiCToyrBEJXkQfOOIvFGFy0lEgo=
|
||||
github.com/miekg/dns v1.1.55/go.mod h1:uInx36IzPl7FYnDcMeVWxj9byh7DutNykX4G9Sj60FY=
|
||||
github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
|
||||
github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
|
||||
github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
|
||||
github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
|
||||
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
|
||||
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
|
||||
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
|
||||
github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis=
|
||||
github.com/rivo/uniseg v0.4.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
|
||||
github.com/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
|
||||
github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
|
||||
github.com/rs/zerolog v1.29.1 h1:cO+d60CHkknCbvzEWxP0S9K6KqyTjrCNUy1LdQLCGPc=
|
||||
github.com/rs/zerolog v1.29.1/go.mod h1:Le6ESbR7hc+DP6Lt1THiV8CQSdkkNrd3R0XbEgp3ZBU=
|
||||
github.com/rs/zerolog v1.30.0 h1:SymVODrcRsaRaSInD9yQtKbtWqwsfoPcRff/oRXLj4c=
|
||||
github.com/rs/zerolog v1.30.0/go.mod h1:/tk+P47gFdPXq4QYjvCmT5/Gsug2nagsFWBWhAiSi1w=
|
||||
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
|
||||
@@ -65,37 +34,22 @@ github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I=
|
||||
github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0=
|
||||
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
|
||||
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
|
||||
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
||||
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
|
||||
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
|
||||
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
||||
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
|
||||
github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
|
||||
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
|
||||
golang.org/x/crypto v0.12.0 h1:tFM/ta59kqch6LlvYnPa0yx5a83cL2nHflFhYKvv9Yk=
|
||||
golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw=
|
||||
golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1 h1:MGwJjxBy0HJshjDNfLsYO8xppfqWlA5ZT9OhtUUhTNw=
|
||||
golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc=
|
||||
golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
|
||||
golang.org/x/net v0.12.0 h1:cfawfvKITfUsFCeJIHJrbSxpeu/E81khclypR0GVT50=
|
||||
golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA=
|
||||
golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14=
|
||||
golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI=
|
||||
golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=
|
||||
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA=
|
||||
golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM=
|
||||
golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4=
|
||||
golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
|
||||
golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc=
|
||||
golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
|
||||
golang.org/x/tools v0.12.0 h1:YW6HUoUmYBpwSgyaGaZq1fHjrBjX1rlpZ54T6mu2kss=
|
||||
golang.org/x/tools v0.12.0/go.mod h1:Sc0INKfu04TlqNoRA1hgpFZbhYXHPr4V5DzpSBTPqQM=
|
||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
|
||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||
gopkg.in/gcfg.v1 v1.2.3 h1:m8OOJ4ccYHnx2f4gQwpno8nAX5OGOh7RLaaz0pj3Ogs=
|
||||
gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o=
|
||||
gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME=
|
||||
gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
|
||||
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
||||
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||
|
||||
@@ -1,63 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
set -eu
|
||||
|
||||
: ${GO:=go}
|
||||
|
||||
MODULES=$(find * -name go.mod -exec dirname '{}' \;)
|
||||
GROUPS="pkg cmd"
|
||||
BASE="$PWD"
|
||||
|
||||
mod() {
|
||||
local d="${1:-.}"
|
||||
grep ^module "$d/go.mod" | cut -d' ' -f2
|
||||
}
|
||||
|
||||
namedir() {
|
||||
local d="$1" g= n=
|
||||
|
||||
if [ "." = "$d" ]; then
|
||||
echo "root"
|
||||
return
|
||||
fi
|
||||
|
||||
for g in $GROUPS; do
|
||||
n="${d#$g/}"
|
||||
if [ "x$n" != "x$d" ]; then
|
||||
echo "$n" | tr '/' '-'
|
||||
return
|
||||
fi
|
||||
done
|
||||
|
||||
echo "$d" | tr '/' '-'
|
||||
}
|
||||
|
||||
mod_replace() {
|
||||
local d="$1"
|
||||
grep "=>" "$d/go.mod" | sed -n -e "s;^.*\($ROOT_MODULE.*\)[ \t]\+=>.*;\1;p"
|
||||
}
|
||||
|
||||
gen_index() {
|
||||
local d= n=
|
||||
|
||||
for d; do
|
||||
n=$(namedir "$d")
|
||||
m=$(mod "$d")
|
||||
echo "$n:$d:$m"
|
||||
done
|
||||
}
|
||||
|
||||
ROOT_MODULE=$(mod)
|
||||
INDEX=$(gen_index $MODULES)
|
||||
|
||||
echo "$INDEX" | while IFS=: read name dir mod; do
|
||||
deps=
|
||||
for dep in $(mod_replace "$dir"); do
|
||||
depname=$(echo "$INDEX" | grep ":$dep$" | cut -d: -f1 | tr '\n' ',' | sed -e 's|,\+$||g')
|
||||
if [ -n "$depname" ]; then
|
||||
deps="${deps:+$deps,}$depname"
|
||||
fi
|
||||
done
|
||||
|
||||
echo "$name:$dir:$mod:$deps"
|
||||
done | sort -V
|
||||
@@ -1,196 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
set -eu
|
||||
|
||||
INDEX="$1"
|
||||
|
||||
PROJECTS="$(cut -d':' -f1 "$INDEX")"
|
||||
COMMANDS="tidy get build test up"
|
||||
|
||||
expand() {
|
||||
local prefix="$1" suffix="$2"
|
||||
local x= out=
|
||||
shift 2
|
||||
|
||||
for x; do
|
||||
out="${out:+$out }${prefix}$x${suffix}"
|
||||
done
|
||||
|
||||
echo "$out"
|
||||
}
|
||||
|
||||
prefixed() {
|
||||
local prefix="${1:+$1-}"
|
||||
shift
|
||||
expand "$prefix" "" "$@"
|
||||
}
|
||||
|
||||
suffixed() {
|
||||
local suffix="${1:+-$1}"
|
||||
shift
|
||||
expand "" "$suffix" "$@"
|
||||
}
|
||||
|
||||
# packed remove excess whitespace from lines of commands
|
||||
packed() {
|
||||
sed -e 's/^[ \t]\+//' -e 's/[ \t]\+$//' -e '/^$/d;' -e '/^#/d';
|
||||
}
|
||||
|
||||
# packet_oneline converts a multiline script into packed single-line equivalent
|
||||
packed_oneline() {
|
||||
packed | tr '\n' ';' | sed -e 's|;$||' -e 's|then;|then |g' -e 's|;[ \t]*|; |g'
|
||||
}
|
||||
|
||||
gen_install_tools() {
|
||||
cat <<EOT
|
||||
for url in \$(GO_INSTALL_URLS); do \$(GO) install -v \$\$url; done
|
||||
EOT
|
||||
}
|
||||
|
||||
gen_revive_exclude() {
|
||||
local self="$1"
|
||||
local dirs= d=
|
||||
|
||||
dirs="$(cut -d: -f2 "$INDEX" | grep -v '^.$' || true)"
|
||||
if [ "." != "$self" ]; then
|
||||
dirs=$(echo "$dirs" | sed -n -e "s;^$self/\(.*\)$;\1;p")
|
||||
fi
|
||||
|
||||
for d in $dirs; do
|
||||
printf -- "-exclude ./$d/... "
|
||||
done
|
||||
}
|
||||
|
||||
for cmd in $COMMANDS; do
|
||||
all="$(prefixed $cmd $PROJECTS)"
|
||||
depsx=
|
||||
|
||||
cat <<EOT
|
||||
.PHONY: $cmd $all
|
||||
$cmd: $all
|
||||
|
||||
EOT
|
||||
|
||||
# default calls
|
||||
case "$cmd" in
|
||||
tidy)
|
||||
call="$(cat <<-EOT | packed
|
||||
\$(GO) mod tidy
|
||||
|
||||
# go vet and revive only if there are .go files
|
||||
#
|
||||
$(cat <<-EOL | packed_oneline
|
||||
set -e
|
||||
FILES="\$\$(\$(GO) list -f '{{len .GoFiles}}' ./...)"
|
||||
if [ -n "\$\$FILES" ]; then
|
||||
\$(GO) vet ./...
|
||||
\$(REVIVE) \$(REVIVE_RUN_ARGS) ./...
|
||||
fi
|
||||
EOL
|
||||
)
|
||||
EOT
|
||||
)"
|
||||
depsx="fmt \$(REVIVE)"
|
||||
;;
|
||||
up)
|
||||
call="\$(GO) get -u -v ./...
|
||||
\$(GO) mod tidy"
|
||||
;;
|
||||
test)
|
||||
call="\$(GO) $cmd ./..."
|
||||
;;
|
||||
*)
|
||||
call="\$(GO) $cmd -v ./..."
|
||||
;;
|
||||
esac
|
||||
|
||||
case "$cmd" in
|
||||
build|test)
|
||||
sequential=true ;;
|
||||
*)
|
||||
sequential=false ;;
|
||||
esac
|
||||
|
||||
while IFS=: read name dir mod deps; do
|
||||
|
||||
deps=$(echo "$deps" | tr ',' ' ')
|
||||
|
||||
# cd $dir
|
||||
if [ "." = "$dir" ]; then
|
||||
# root
|
||||
cd=
|
||||
else
|
||||
cd="cd '$dir'; "
|
||||
fi
|
||||
|
||||
callx="$call"
|
||||
if [ "$name" = root ]; then
|
||||
# special case
|
||||
case "$cmd" in
|
||||
get)
|
||||
cmdx="get -tags tools"
|
||||
;;
|
||||
up)
|
||||
cmdx="get -tags tools -u"
|
||||
;;
|
||||
*)
|
||||
cmdx=
|
||||
;;
|
||||
esac
|
||||
|
||||
[ -z "$cmdx" ] || cmdx="\$(GO) $cmdx -v ./..."
|
||||
|
||||
if [ "up" = "$cmd" ]; then
|
||||
callx="$cmdx
|
||||
\$(GO) mod tidy
|
||||
$(gen_install_tools)"
|
||||
elif [ "get" = "$cmd" ]; then
|
||||
callx="$cmdx
|
||||
$(gen_install_tools)"
|
||||
elif [ -n "$cmdx" ]; then
|
||||
classx="$cmdx"
|
||||
fi
|
||||
|
||||
fi
|
||||
|
||||
if [ "build" = "$cmd" ]; then
|
||||
# special build flags for cmd/*
|
||||
#
|
||||
callx="$(cat <<-EOL | packed_oneline
|
||||
set -e
|
||||
MOD="\$\$(\$(GO) list -f '{{.ImportPath}}' ./...)"
|
||||
if echo "\$\$MOD" | grep -q -e '.*/cmd/[^/]\+\$\$'; then
|
||||
\$(GO_BUILD_CMD) ./...
|
||||
elif [ -n "\$\$MOD" ]; then
|
||||
\$(GO_BUILD) ./...
|
||||
fi
|
||||
EOL
|
||||
)"
|
||||
fi
|
||||
|
||||
if [ "tidy" = "$cmd" ]; then
|
||||
# exclude submodules when running revive
|
||||
#
|
||||
exclude=$(gen_revive_exclude "$dir")
|
||||
if [ -n "$exclude" ]; then
|
||||
callx=$(echo "$callx" | sed -e "s;\(REVIVE)\);\1 $exclude;")
|
||||
fi
|
||||
fi
|
||||
|
||||
if ! $sequential; then
|
||||
deps=
|
||||
fi
|
||||
|
||||
cat <<EOT
|
||||
$cmd-$name:${deps:+ $(prefixed $cmd $deps)}${depsx:+ | $depsx} ; \$(info \$(M) $cmd: $name)
|
||||
$(echo "$callx" | sed -e "/^$/d;" -e "s|^|\t\$(Q) $cd|")
|
||||
|
||||
EOT
|
||||
done < "$INDEX"
|
||||
done
|
||||
|
||||
for x in $PROJECTS; do
|
||||
cat <<EOT
|
||||
$x: $(suffixed $x get build tidy)
|
||||
EOT
|
||||
done
|
||||
@@ -1,35 +0,0 @@
|
||||
ignoreGeneratedHeader = false
|
||||
severity = "error"
|
||||
confidence = 0.8
|
||||
errorCode = 1
|
||||
warningCode = 0
|
||||
enableAllRules = true
|
||||
|
||||
[rule.function-length]
|
||||
arguments = [40,0]
|
||||
severity = "warning"
|
||||
[rule.function-result-limit]
|
||||
arguments = [3]
|
||||
[rule.argument-limit]
|
||||
arguments = [5]
|
||||
[rule.cognitive-complexity]
|
||||
arguments = [7]
|
||||
[rule.cyclomatic]
|
||||
arguments = [10]
|
||||
[rule.line-length-limit]
|
||||
arguments = [100]
|
||||
severity = "warning"
|
||||
[rule.comment-spacings]
|
||||
severity = "warning"
|
||||
[rule.empty-lines]
|
||||
severity = "warning"
|
||||
|
||||
# Disabled rules
|
||||
[rule.max-public-structs]
|
||||
disabled = true
|
||||
[rule.file-header]
|
||||
disabled = true
|
||||
[rule.add-constant]
|
||||
disabled = true
|
||||
[rule.banned-characters]
|
||||
disabled = true
|
||||
@@ -1,7 +0,0 @@
|
||||
//go:build tools
|
||||
|
||||
package tools
|
||||
|
||||
import (
|
||||
_ "github.com/mgechev/revive"
|
||||
)
|
||||
@@ -1,219 +0,0 @@
|
||||
package wireguard
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"io"
|
||||
"net/netip"
|
||||
"strconv"
|
||||
"strings"
|
||||
|
||||
"darvaza.org/core"
|
||||
"gopkg.in/gcfg.v1"
|
||||
)
|
||||
|
||||
// Config represents a wgN.conf file
|
||||
type Config struct {
|
||||
Interface InterfaceConfig
|
||||
Peer []PeerConfig
|
||||
}
|
||||
|
||||
// GetAddress is a shortcut to the interface's address
|
||||
func (f *Config) GetAddress() netip.Addr {
|
||||
return f.Interface.Address
|
||||
}
|
||||
|
||||
// Peers tells how many peers are described
|
||||
func (f *Config) Peers() int {
|
||||
return len(f.Peer)
|
||||
}
|
||||
|
||||
// InterfaceConfig represents the [Interface] section
|
||||
type InterfaceConfig struct {
|
||||
Address netip.Addr
|
||||
PrivateKey PrivateKey
|
||||
ListenPort uint16
|
||||
}
|
||||
|
||||
// PeerConfig represents a [Peer] section
|
||||
type PeerConfig struct {
|
||||
PublicKey PublicKey
|
||||
Endpoint EndpointAddress
|
||||
AllowedIPs []netip.Prefix
|
||||
}
|
||||
|
||||
// EndpointAddress is a host:port pair to reach the Peer
|
||||
type EndpointAddress struct {
|
||||
Host string
|
||||
Port uint16
|
||||
}
|
||||
|
||||
// Name returns the first part of a hostname
|
||||
func (ep EndpointAddress) Name() string {
|
||||
before, _, _ := strings.Cut(ep.Host, ".")
|
||||
return before
|
||||
}
|
||||
|
||||
func (ep EndpointAddress) String() string {
|
||||
switch {
|
||||
case ep.Host == "":
|
||||
return ""
|
||||
case ep.Port == 0:
|
||||
return ep.Host
|
||||
case !strings.ContainsRune(ep.Host, ':'):
|
||||
return fmt.Sprintf("%s:%v", ep.Host, ep.Port)
|
||||
default:
|
||||
return fmt.Sprintf("[%s]:%v", ep.Host, ep.Port)
|
||||
}
|
||||
}
|
||||
|
||||
// FromString sets the EndpointAddress from a given "[host]:port"
|
||||
func (ep *EndpointAddress) FromString(s string) error {
|
||||
host, port, err := core.SplitHostPort(s)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
ep.Host = host
|
||||
|
||||
switch {
|
||||
case port != "":
|
||||
n, _ := strconv.ParseUint(port, 10, 16)
|
||||
ep.Port = uint16(n)
|
||||
default:
|
||||
ep.Port = 0
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
type intermediateConfig struct {
|
||||
Interface interfaceConfig
|
||||
Peer peersConfig
|
||||
}
|
||||
|
||||
func (v *intermediateConfig) Export() (*Config, error) {
|
||||
var out Config
|
||||
var err error
|
||||
|
||||
// Interface
|
||||
out.Interface, err = v.Interface.Export()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
// Peers
|
||||
peers, ok := v.PeersCount()
|
||||
if !ok {
|
||||
return nil, errors.New("inconsistent Peer data")
|
||||
}
|
||||
|
||||
for i := 0; i < peers; i++ {
|
||||
p, err := v.ExportPeer(i)
|
||||
if err != nil {
|
||||
err = core.Wrapf(err, "Peer[%v]:", i)
|
||||
return nil, err
|
||||
}
|
||||
|
||||
out.Peer = append(out.Peer, p)
|
||||
}
|
||||
|
||||
return &out, nil
|
||||
}
|
||||
|
||||
type interfaceConfig struct {
|
||||
Address netip.Addr
|
||||
PrivateKey string
|
||||
ListenPort uint16
|
||||
}
|
||||
|
||||
func (p interfaceConfig) Export() (InterfaceConfig, error) {
|
||||
var err error
|
||||
|
||||
out := InterfaceConfig{
|
||||
Address: p.Address,
|
||||
ListenPort: p.ListenPort,
|
||||
}
|
||||
|
||||
out.PrivateKey, err = PrivateKeyFromBase64(p.PrivateKey)
|
||||
if err != nil {
|
||||
err = core.Wrap(err, "PrivateKey")
|
||||
return InterfaceConfig{}, err
|
||||
}
|
||||
|
||||
return out, nil
|
||||
}
|
||||
|
||||
type peersConfig struct {
|
||||
PublicKey []string
|
||||
Endpoint []string
|
||||
AllowedIPs []string
|
||||
}
|
||||
|
||||
func (v *intermediateConfig) ExportPeer(i int) (PeerConfig, error) {
|
||||
var out PeerConfig
|
||||
|
||||
// Endpoint
|
||||
s := v.Peer.Endpoint[i]
|
||||
err := out.Endpoint.FromString(s)
|
||||
if err != nil {
|
||||
err = core.Wrap(err, "Endpoint")
|
||||
return out, err
|
||||
}
|
||||
|
||||
// PublicKey
|
||||
out.PublicKey, err = PublicKeyFromBase64(v.Peer.PublicKey[i])
|
||||
if err != nil {
|
||||
err = core.Wrap(err, "PublicKey")
|
||||
return out, err
|
||||
}
|
||||
|
||||
// AllowedIPs
|
||||
s = v.Peer.AllowedIPs[i]
|
||||
out.AllowedIPs, err = parseAllowedIPs(s)
|
||||
if err != nil {
|
||||
err = core.Wrap(err, "AllowedIPs")
|
||||
return out, err
|
||||
}
|
||||
|
||||
return out, nil
|
||||
}
|
||||
|
||||
func parseAllowedIPs(data string) ([]netip.Prefix, error) {
|
||||
var out []netip.Prefix
|
||||
|
||||
for _, s := range strings.Split(data, ",") {
|
||||
s = strings.TrimSpace(s)
|
||||
p, err := netip.ParsePrefix(s)
|
||||
if err != nil {
|
||||
return out, err
|
||||
}
|
||||
|
||||
out = append(out, p)
|
||||
}
|
||||
|
||||
return out, nil
|
||||
}
|
||||
|
||||
func (v *intermediateConfig) PeersCount() (int, bool) {
|
||||
c0 := len(v.Peer.Endpoint)
|
||||
c1 := len(v.Peer.PublicKey)
|
||||
c2 := len(v.Peer.AllowedIPs)
|
||||
|
||||
if c0 != c1 || c1 != c2 {
|
||||
return 0, false
|
||||
}
|
||||
|
||||
return c0, true
|
||||
}
|
||||
|
||||
// NewConfigFromReader parses a wgN.conf file
|
||||
func NewConfigFromReader(r io.Reader) (*Config, error) {
|
||||
temp := &intermediateConfig{}
|
||||
|
||||
if err := gcfg.ReadInto(temp, r); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return temp.Export()
|
||||
}
|
||||
@@ -1,219 +0,0 @@
|
||||
package wireguard
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"crypto/rand"
|
||||
"encoding/base64"
|
||||
"errors"
|
||||
"fmt"
|
||||
|
||||
"golang.org/x/crypto/curve25519"
|
||||
)
|
||||
|
||||
const (
|
||||
// PrivateKeySize is the length in bytes of a Wireguard Private Key
|
||||
PrivateKeySize = 32
|
||||
// PublicKeySize is the length in bytes of a Wireguard Public Key
|
||||
PublicKeySize = 32
|
||||
)
|
||||
|
||||
var (
|
||||
// ErrInvalidKeySize indicates the key size is wrong
|
||||
ErrInvalidKeySize = errors.New("invalid key size")
|
||||
// ErrInvalidPrivateKey indicates the private key is invalid
|
||||
ErrInvalidPrivateKey = errors.New("invalid private key")
|
||||
// ErrInvalidPublicKey indicates the public key is invalid
|
||||
ErrInvalidPublicKey = errors.New("invalid public key")
|
||||
)
|
||||
|
||||
type (
|
||||
// PrivateKey is a binary Wireguard Private Key
|
||||
PrivateKey [PrivateKeySize]byte
|
||||
// PublicKey is a binary Wireguard Public Key
|
||||
PublicKey [PublicKeySize]byte
|
||||
)
|
||||
|
||||
func (key PrivateKey) String() string {
|
||||
switch {
|
||||
case key.IsZero():
|
||||
return ""
|
||||
default:
|
||||
return base64.StdEncoding.EncodeToString(key[:])
|
||||
}
|
||||
}
|
||||
|
||||
func (pub PublicKey) String() string {
|
||||
switch {
|
||||
case pub.IsZero():
|
||||
return ""
|
||||
default:
|
||||
return base64.StdEncoding.EncodeToString(pub[:])
|
||||
}
|
||||
}
|
||||
|
||||
// MarshalJSON encodes the key for JSON, omiting empty.
|
||||
func (key PrivateKey) MarshalJSON() ([]byte, error) {
|
||||
return encodeKeyJSON(key.String())
|
||||
}
|
||||
|
||||
// MarshalJSON encodes the key for JSON, omiting empty.
|
||||
func (pub PublicKey) MarshalJSON() ([]byte, error) {
|
||||
return encodeKeyJSON(pub.String())
|
||||
}
|
||||
|
||||
func encodeKeyJSON(s string) ([]byte, error) {
|
||||
var out []byte
|
||||
if s != "" {
|
||||
out = []byte(fmt.Sprintf("%q", s))
|
||||
}
|
||||
|
||||
return out, nil
|
||||
}
|
||||
|
||||
// MarshalYAML encodes the key for YAML, omiting empty.
|
||||
func (key PrivateKey) MarshalYAML() (any, error) {
|
||||
return encodeKeyYAML(key.String())
|
||||
}
|
||||
|
||||
// MarshalYAML encodes the key for YAML, omiting empty.
|
||||
func (pub PublicKey) MarshalYAML() (any, error) {
|
||||
return encodeKeyYAML(pub.String())
|
||||
}
|
||||
|
||||
func encodeKeyYAML(s string) (any, error) {
|
||||
if s == "" {
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
return s, nil
|
||||
}
|
||||
|
||||
// IsZero tells if the key hasn't been set
|
||||
func (key PrivateKey) IsZero() bool {
|
||||
var zero PrivateKey
|
||||
return key.Equal(zero)
|
||||
}
|
||||
|
||||
// IsZero tells if the key hasn't been set
|
||||
func (pub PublicKey) IsZero() bool {
|
||||
var zero PublicKey
|
||||
return pub.Equal(zero)
|
||||
}
|
||||
|
||||
// Equal checks if two private keys are identical
|
||||
func (key PrivateKey) Equal(alter PrivateKey) bool {
|
||||
return bytes.Equal(key[:], alter[:])
|
||||
}
|
||||
|
||||
// Equal checks if two public keys are identical
|
||||
func (pub PublicKey) Equal(alter PublicKey) bool {
|
||||
return bytes.Equal(pub[:], alter[:])
|
||||
}
|
||||
|
||||
// PrivateKeyFromBase64 decodes a base64-based string into
|
||||
// a [PrivateKey]
|
||||
func PrivateKeyFromBase64(data string) (PrivateKey, error) {
|
||||
b, err := decodeKey(data, PrivateKeySize)
|
||||
if err != nil {
|
||||
var zero PrivateKey
|
||||
return zero, err
|
||||
}
|
||||
return *(*[PrivateKeySize]byte)(b), nil
|
||||
}
|
||||
|
||||
// PublicKeyFromBase64 decodes a base64-based string into
|
||||
// a [PublicKey]
|
||||
func PublicKeyFromBase64(data string) (PublicKey, error) {
|
||||
b, err := decodeKey(data, PublicKeySize)
|
||||
if err != nil {
|
||||
var zero PublicKey
|
||||
return zero, err
|
||||
}
|
||||
return *(*[PublicKeySize]byte)(b), nil
|
||||
}
|
||||
|
||||
func decodeKey(data string, size int) ([]byte, error) {
|
||||
b, err := base64.StdEncoding.DecodeString(data)
|
||||
switch {
|
||||
case err != nil:
|
||||
return []byte{}, err
|
||||
case len(b) != size:
|
||||
err = ErrInvalidKeySize
|
||||
return []byte{}, err
|
||||
default:
|
||||
return b, nil
|
||||
}
|
||||
}
|
||||
|
||||
// NewPrivateKey creates a new PrivateKey
|
||||
func NewPrivateKey() (PrivateKey, error) {
|
||||
var s [PrivateKeySize]byte
|
||||
|
||||
_, err := rand.Read(s[:])
|
||||
if err != nil {
|
||||
var zero PrivateKey
|
||||
return zero, err
|
||||
}
|
||||
|
||||
// apply same clamping as wireguard-go/device/noise-helpers.go
|
||||
s[0] &= 0xf8
|
||||
s[31] = (s[31] & 0x7f) | 0x40
|
||||
|
||||
return s, nil
|
||||
}
|
||||
|
||||
// Public generates the corresponding PublicKey
|
||||
func (key PrivateKey) Public() PublicKey {
|
||||
var pub PublicKey
|
||||
if !key.IsZero() {
|
||||
in := (*[PrivateKeySize]byte)(&key)
|
||||
out := (*[PublicKeySize]byte)(&pub)
|
||||
|
||||
curve25519.ScalarBaseMult(out, in)
|
||||
}
|
||||
return pub
|
||||
}
|
||||
|
||||
// KeyPair holds a Key pair
|
||||
type KeyPair struct {
|
||||
PrivateKey PrivateKey
|
||||
PublicKey PublicKey
|
||||
}
|
||||
|
||||
// Validate checks the PublicKey matches the PrivateKey,
|
||||
// and sets the PublicKey if missing
|
||||
func (kp *KeyPair) Validate() error {
|
||||
keyLen := len(kp.PrivateKey)
|
||||
pubLen := len(kp.PublicKey)
|
||||
|
||||
switch {
|
||||
case keyLen != PrivateKeySize:
|
||||
// bad private key
|
||||
return ErrInvalidPrivateKey
|
||||
case pubLen == 0:
|
||||
// no public key, set it
|
||||
kp.PublicKey = kp.PrivateKey.Public()
|
||||
return nil
|
||||
case pubLen != PublicKeySize:
|
||||
// bad public key
|
||||
return ErrInvalidPublicKey
|
||||
case !kp.PrivateKey.Public().Equal(kp.PublicKey):
|
||||
// wrong public key
|
||||
return ErrInvalidPublicKey
|
||||
default:
|
||||
// correct public key
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
// NewKeyPair creates a new KeyPair for Wireguard
|
||||
func NewKeyPair() (KeyPair, error) {
|
||||
var out KeyPair
|
||||
|
||||
key, err := NewPrivateKey()
|
||||
if err == nil {
|
||||
out.PrivateKey = key
|
||||
out.PublicKey = key.Public()
|
||||
}
|
||||
return out, nil
|
||||
}
|
||||
@@ -1,2 +0,0 @@
|
||||
// Package wireguard deals with wireguard config
|
||||
package wireguard
|
||||
@@ -1,102 +0,0 @@
|
||||
package zones
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"fmt"
|
||||
"io"
|
||||
"strings"
|
||||
)
|
||||
|
||||
// WriteEnv generates environment variables for shell scripts
|
||||
func (m *Zones) WriteEnv(w io.Writer) error {
|
||||
var buf bytes.Buffer
|
||||
|
||||
m.writeEnvVarFn(&buf, genEnvZones, "ZONES")
|
||||
m.ForEachZone(func(z *Zone) bool {
|
||||
m.writeEnvZone(&buf, z)
|
||||
return false
|
||||
})
|
||||
|
||||
_, err := buf.WriteTo(w)
|
||||
return err
|
||||
}
|
||||
|
||||
func (m *Zones) writeEnvZone(w io.Writer, z *Zone) {
|
||||
zoneID := z.ID
|
||||
|
||||
// ZONE{zoneID}
|
||||
m.writeEnvVar(w, genEnvZoneNodes(z), "ZONE%v", zoneID)
|
||||
|
||||
// ZONE{zoneID}_NAME
|
||||
m.writeEnvVar(w, z.Name, "ZONE%v_%s", zoneID, "NAME")
|
||||
|
||||
// ZONE{zoneID}_GW
|
||||
gatewayID := getRingZeroGatewayID(z)
|
||||
m.writeEnvVar(w, fmt.Sprintf("%v", gatewayID), "ZONE%v_%s", zoneID, "GW")
|
||||
|
||||
// ZONE{zoneID}_IP
|
||||
ip, _ := RingZeroAddress(zoneID, gatewayID)
|
||||
m.writeEnvVar(w, ip.String(), "ZONE%v_%s", zoneID, "IP")
|
||||
}
|
||||
|
||||
func (m *Zones) writeEnvVarFn(w io.Writer, fn func(*Zones) string, name string, args ...any) {
|
||||
var value string
|
||||
|
||||
if fn != nil {
|
||||
value = fn(m)
|
||||
}
|
||||
|
||||
m.writeEnvVar(w, value, name, args...)
|
||||
}
|
||||
|
||||
func (*Zones) writeEnvVar(w io.Writer, value string, name string, args ...any) {
|
||||
if len(args) > 0 {
|
||||
name = fmt.Sprintf(name, args...)
|
||||
}
|
||||
|
||||
if name != "" {
|
||||
value = strings.TrimSpace(value)
|
||||
|
||||
_, _ = fmt.Fprintf(w, "%s=%q\n", name, value)
|
||||
}
|
||||
}
|
||||
|
||||
func genEnvZones(m *Zones) string {
|
||||
s := make([]string, 0, len(m.Zones))
|
||||
for _, z := range m.Zones {
|
||||
s = append(s, fmt.Sprintf("%v", z.ID))
|
||||
}
|
||||
|
||||
return strings.Join(s, " ")
|
||||
}
|
||||
|
||||
func genEnvZoneNodes(z *Zone) string {
|
||||
s := make([]string, 0, len(z.Machines))
|
||||
for _, p := range z.Machines {
|
||||
s = append(s, p.Name)
|
||||
}
|
||||
return strings.Join(s, " ")
|
||||
}
|
||||
|
||||
func getRingZeroGatewayID(z *Zone) int {
|
||||
var firstNodeID, gatewayID int
|
||||
|
||||
z.ForEachMachine(func(p *Machine) bool {
|
||||
if firstNodeID == 0 {
|
||||
firstNodeID = p.ID
|
||||
}
|
||||
|
||||
if p.IsGateway() {
|
||||
gatewayID = p.ID
|
||||
}
|
||||
|
||||
return gatewayID != 0
|
||||
})
|
||||
|
||||
switch {
|
||||
case gatewayID == 0:
|
||||
return firstNodeID
|
||||
default:
|
||||
return gatewayID
|
||||
}
|
||||
}
|
||||
@@ -1,48 +0,0 @@
|
||||
package zones
|
||||
|
||||
import (
|
||||
"net/netip"
|
||||
"strings"
|
||||
)
|
||||
|
||||
// revive:disable:line-length-limit
|
||||
|
||||
// A Machine is a machine on a Zone
|
||||
type Machine struct {
|
||||
zone *Zone
|
||||
ID int `toml:"id"`
|
||||
Name string `toml:"-" json:"-" yaml:"-"`
|
||||
|
||||
PublicAddresses []netip.Addr `toml:"public,omitempty" json:"public,omitempty" yaml:"public,omitempty"`
|
||||
Rings []*RingInfo `toml:"rings,omitempty" json:"rings,omitempty" yaml:"rings,omitempty"`
|
||||
}
|
||||
|
||||
// revive:enable:line-length-limit
|
||||
|
||||
func (m *Machine) String() string {
|
||||
return m.Name
|
||||
}
|
||||
|
||||
// FullName returns the Name of the machine including domain name
|
||||
func (m *Machine) FullName() string {
|
||||
if domain := m.zone.zones.domain; domain != "" {
|
||||
var s = []string{
|
||||
m.Name,
|
||||
domain,
|
||||
}
|
||||
|
||||
return strings.Join(s, ".")
|
||||
}
|
||||
|
||||
return m.Name
|
||||
}
|
||||
|
||||
// IsGateway tells if the Machine is a ring0 gateway
|
||||
func (m *Machine) IsGateway() bool {
|
||||
_, ok := m.getRingInfo(0)
|
||||
return ok
|
||||
}
|
||||
|
||||
func (m *Machine) getPeerByName(name string) (*Machine, bool) {
|
||||
return m.zone.zones.GetMachineByName(name)
|
||||
}
|
||||
@@ -1,87 +0,0 @@
|
||||
package zones
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"fmt"
|
||||
"io"
|
||||
"os"
|
||||
"path/filepath"
|
||||
|
||||
fs "github.com/hack-pad/hackpadfs"
|
||||
)
|
||||
|
||||
// OpenFile opens a file on the machine's config directory with the specified flags
|
||||
func (m *Machine) OpenFile(name string, flags int, args ...any) (fs.File, error) {
|
||||
base := m.zone.zones.dir
|
||||
fullName := m.getFilename(name, args...)
|
||||
|
||||
return fs.OpenFile(base, fullName, flags, 0644)
|
||||
}
|
||||
|
||||
// CreateTruncFile creates or truncates a file on the machine's config directory
|
||||
func (m *Machine) CreateTruncFile(name string, args ...any) (io.WriteCloser, error) {
|
||||
return m.openWriter(name, os.O_CREATE|os.O_TRUNC, args...)
|
||||
}
|
||||
|
||||
// CreateFile creates a file on the machine's config directory
|
||||
func (m *Machine) CreateFile(name string, args ...any) (io.WriteCloser, error) {
|
||||
return m.openWriter(name, os.O_CREATE, args...)
|
||||
}
|
||||
|
||||
func (m *Machine) openWriter(name string, flags int, args ...any) (io.WriteCloser, error) {
|
||||
f, err := m.OpenFile(name, os.O_WRONLY|flags, args...)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return f.(io.WriteCloser), nil
|
||||
}
|
||||
|
||||
// RemoveFile deletes a file from the machine's config directory
|
||||
func (m *Machine) RemoveFile(name string, args ...any) error {
|
||||
base := m.zone.zones.dir
|
||||
fullName := m.getFilename(name, args...)
|
||||
err := fs.Remove(base, fullName)
|
||||
|
||||
switch {
|
||||
case os.IsNotExist(err):
|
||||
return nil
|
||||
default:
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
// ReadFile reads a file from the machine's config directory
|
||||
func (m *Machine) ReadFile(name string, args ...any) ([]byte, error) {
|
||||
base := m.zone.zones.dir
|
||||
fullName := m.getFilename(name, args...)
|
||||
|
||||
return fs.ReadFile(base, fullName)
|
||||
}
|
||||
|
||||
// WriteStringFile writes the given content to a file on the machine's config directory
|
||||
func (m *Machine) WriteStringFile(value string, name string, args ...any) error {
|
||||
f, err := m.CreateTruncFile(name, args...)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer f.Close()
|
||||
|
||||
buf := bytes.NewBufferString(value)
|
||||
_, err = buf.WriteTo(f)
|
||||
return err
|
||||
}
|
||||
|
||||
func (m *Machine) getFilename(name string, args ...any) string {
|
||||
if len(args) > 0 {
|
||||
name = fmt.Sprintf(name, args...)
|
||||
}
|
||||
|
||||
s := []string{
|
||||
m.zone.Name,
|
||||
m.Name,
|
||||
name,
|
||||
}
|
||||
|
||||
return filepath.Join(s...)
|
||||
}
|
||||
@@ -1,263 +0,0 @@
|
||||
package zones
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"fmt"
|
||||
"io/fs"
|
||||
"os"
|
||||
|
||||
"darvaza.org/core"
|
||||
|
||||
"git.jpi.io/amery/jpictl/pkg/wireguard"
|
||||
)
|
||||
|
||||
// GetWireguardKeys reads a wgN.key/wgN.pub files
|
||||
func (m *Machine) GetWireguardKeys(ring int) (wireguard.KeyPair, error) {
|
||||
var (
|
||||
data []byte
|
||||
err error
|
||||
out wireguard.KeyPair
|
||||
)
|
||||
|
||||
data, err = m.ReadFile("wg%v.key", ring)
|
||||
if err != nil {
|
||||
// failed to read
|
||||
return out, err
|
||||
}
|
||||
|
||||
out.PrivateKey, err = wireguard.PrivateKeyFromBase64(string(data))
|
||||
if err != nil {
|
||||
// bad key
|
||||
err = core.Wrapf(err, "wg%v.key", ring)
|
||||
return out, err
|
||||
}
|
||||
|
||||
data, err = m.ReadFile("wg%v.pub", ring)
|
||||
switch {
|
||||
case os.IsNotExist(err):
|
||||
// no wgN.pub is fine
|
||||
case err != nil:
|
||||
// failed to read
|
||||
return out, err
|
||||
default:
|
||||
// good read
|
||||
out.PublicKey, err = wireguard.PublicKeyFromBase64(string(data))
|
||||
if err != nil {
|
||||
// bad key
|
||||
err = core.Wrapf(err, "wg%v.pub", ring)
|
||||
return out, err
|
||||
}
|
||||
}
|
||||
|
||||
err = out.Validate()
|
||||
return out, err
|
||||
}
|
||||
|
||||
func (m *Machine) tryReadWireguardKeys(ring int) error {
|
||||
kp, err := m.GetWireguardKeys(ring)
|
||||
switch {
|
||||
case os.IsNotExist(err):
|
||||
// ignore
|
||||
return nil
|
||||
case err != nil:
|
||||
// something went wrong
|
||||
return err
|
||||
default:
|
||||
// import keys
|
||||
ri := &RingInfo{
|
||||
Ring: ring,
|
||||
Keys: kp,
|
||||
}
|
||||
|
||||
return m.applyRingInfo(ring, ri)
|
||||
}
|
||||
}
|
||||
|
||||
// WriteWireguardKeys writes the wgN.key/wgN.pub files
|
||||
func (m *Machine) WriteWireguardKeys(ring int) error {
|
||||
var err error
|
||||
var key, pub string
|
||||
var ri *RingInfo
|
||||
|
||||
ri, _ = m.getRingInfo(ring)
|
||||
if ri != nil {
|
||||
key = ri.Keys.PrivateKey.String()
|
||||
pub = ri.Keys.PublicKey.String()
|
||||
}
|
||||
|
||||
switch {
|
||||
case key == "":
|
||||
return fs.ErrNotExist
|
||||
case pub == "":
|
||||
pub = ri.Keys.PrivateKey.Public().String()
|
||||
}
|
||||
|
||||
err = m.WriteStringFile(key+"\n", "wg%v.key", ring)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
err = m.WriteStringFile(pub+"\n", "wg%v.pub", ring)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// RemoveWireguardKeys deletes wgN.key and wgN.pub from
|
||||
// the machine's config directory
|
||||
func (m *Machine) RemoveWireguardKeys(ring int) error {
|
||||
var err error
|
||||
|
||||
err = m.RemoveFile("wg%v.pub", ring)
|
||||
switch {
|
||||
case os.IsNotExist(err):
|
||||
// ignore
|
||||
case err != nil:
|
||||
return err
|
||||
}
|
||||
|
||||
err = m.RemoveFile("wg%v.key", ring)
|
||||
if os.IsNotExist(err) {
|
||||
// ignore
|
||||
err = nil
|
||||
}
|
||||
|
||||
return err
|
||||
}
|
||||
|
||||
// GetWireguardConfig reads a wgN.conf file
|
||||
func (m *Machine) GetWireguardConfig(ring int) (*wireguard.Config, error) {
|
||||
data, err := m.ReadFile("wg%v.conf", ring)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
r := bytes.NewReader(data)
|
||||
return wireguard.NewConfigFromReader(r)
|
||||
}
|
||||
|
||||
func (m *Machine) tryApplyWireguardConfig(ring int) error {
|
||||
wg, err := m.GetWireguardConfig(ring)
|
||||
switch {
|
||||
case os.IsNotExist(err):
|
||||
return nil
|
||||
case err != nil:
|
||||
return err
|
||||
default:
|
||||
return m.applyWireguardConfig(ring, wg)
|
||||
}
|
||||
}
|
||||
|
||||
func (m *Machine) applyWireguardConfig(ring int, wg *wireguard.Config) error {
|
||||
addr := wg.GetAddress()
|
||||
zoneID, nodeID, ok := Rings[ring].Decode(addr)
|
||||
if !ok {
|
||||
return fmt.Errorf("%s: invalid wg%v address: %s", m.Name, ring, addr)
|
||||
}
|
||||
|
||||
if err := m.applyZoneNodeID(zoneID, nodeID); err != nil {
|
||||
err = core.Wrapf(err, "%s: wg%v:%s", m.Name, ring, addr)
|
||||
return err
|
||||
}
|
||||
|
||||
if err := m.applyWireguardInterfaceConfig(ring, wg.Interface); err != nil {
|
||||
err = core.Wrapf(err, "%s: wg%v:%s", m.Name, ring, addr)
|
||||
return err
|
||||
}
|
||||
|
||||
for _, peer := range wg.Peer {
|
||||
if err := m.applyWireguardPeerConfig(ring, peer); err != nil {
|
||||
err = core.Wrapf(err, "%s: wg%v:%s", m.Name, ring, addr)
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (m *Machine) getRingInfo(ring int) (*RingInfo, bool) {
|
||||
for _, ri := range m.Rings {
|
||||
if ri.Ring == ring {
|
||||
return ri, ri.Enabled
|
||||
}
|
||||
}
|
||||
|
||||
return nil, false
|
||||
}
|
||||
|
||||
func (m *Machine) applyRingInfo(ring int, new *RingInfo) error {
|
||||
cur, _ := m.getRingInfo(ring)
|
||||
if cur == nil {
|
||||
// first, append
|
||||
m.Rings = append(m.Rings, new)
|
||||
return nil
|
||||
}
|
||||
|
||||
// extra, merge
|
||||
return cur.Merge(new)
|
||||
}
|
||||
|
||||
func (m *Machine) applyWireguardInterfaceConfig(ring int, data wireguard.InterfaceConfig) error {
|
||||
ri := &RingInfo{
|
||||
Ring: ring,
|
||||
Enabled: true,
|
||||
Keys: wireguard.KeyPair{
|
||||
PrivateKey: data.PrivateKey,
|
||||
},
|
||||
}
|
||||
|
||||
return m.applyRingInfo(ring, ri)
|
||||
}
|
||||
|
||||
func (m *Machine) applyWireguardPeerConfig(ring int, pc wireguard.PeerConfig) error {
|
||||
peer, found := m.getPeerByName(pc.Endpoint.Name())
|
||||
switch {
|
||||
case !found:
|
||||
// unknown
|
||||
case ring == 1 && m.zone != peer.zone:
|
||||
// invalid zone
|
||||
default:
|
||||
// apply RingInfo
|
||||
ri := &RingInfo{
|
||||
Ring: ring,
|
||||
Enabled: true,
|
||||
Keys: wireguard.KeyPair{
|
||||
PublicKey: pc.PublicKey,
|
||||
},
|
||||
}
|
||||
|
||||
return peer.applyRingInfo(ring, ri)
|
||||
}
|
||||
|
||||
return fmt.Errorf("%q: invalid peer endpoint", pc.Endpoint.Host)
|
||||
}
|
||||
|
||||
func (m *Machine) applyZoneNodeID(zoneID, nodeID int) error {
|
||||
switch {
|
||||
case zoneID == 0:
|
||||
return fmt.Errorf("invalid %s", "zoneID")
|
||||
case nodeID == 0:
|
||||
return fmt.Errorf("invalid %s", "nodeID")
|
||||
case m.ID != nodeID:
|
||||
return fmt.Errorf("invalid %s: %v ≠ %v", "zoneID", m.ID, nodeID)
|
||||
case m.zone.ID != 0 && m.zone.ID != zoneID:
|
||||
return fmt.Errorf("invalid %s: %v ≠ %v", "zoneID", m.zone.ID, zoneID)
|
||||
case m.zone.ID == 0:
|
||||
m.zone.ID = zoneID
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// RemoveWireguardConfig deletes wgN.conf from the machine's
|
||||
// config directory.
|
||||
func (m *Machine) RemoveWireguardConfig(ring int) error {
|
||||
err := m.RemoveFile("wg%v.conf", ring)
|
||||
if os.IsNotExist(err) {
|
||||
err = nil
|
||||
}
|
||||
|
||||
return err
|
||||
}
|
||||
@@ -1,63 +0,0 @@
|
||||
package zones
|
||||
|
||||
import (
|
||||
"context"
|
||||
"net/netip"
|
||||
"strconv"
|
||||
"time"
|
||||
)
|
||||
|
||||
func (m *Machine) lookupNetIP() ([]netip.Addr, error) {
|
||||
timeout := 2 * time.Second
|
||||
ctx, cancel := context.WithTimeout(context.Background(), timeout)
|
||||
|
||||
defer cancel()
|
||||
|
||||
return m.zone.zones.resolver.LookupNetIP(ctx, "ip", m.FullName())
|
||||
}
|
||||
|
||||
func (m *Machine) updatePublicAddresses() error {
|
||||
addrs, err := m.lookupNetIP()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
m.PublicAddresses = addrs
|
||||
return nil
|
||||
}
|
||||
|
||||
func (m *Machine) init() error {
|
||||
if err := m.setID(); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
for i := 0; i < RingsCount; i++ {
|
||||
if err := m.tryReadWireguardKeys(i); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (m *Machine) setID() error {
|
||||
zoneName := m.zone.Name
|
||||
suffix := m.Name[len(zoneName)+1:]
|
||||
|
||||
id, err := strconv.ParseInt(suffix, 10, 8)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
m.ID = int(id)
|
||||
return nil
|
||||
}
|
||||
|
||||
func (m *Machine) scan() error {
|
||||
for i := 0; i < RingsCount; i++ {
|
||||
if err := m.tryApplyWireguardConfig(i); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
return m.updatePublicAddresses()
|
||||
}
|
||||
@@ -1,181 +0,0 @@
|
||||
package zones
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"net/netip"
|
||||
|
||||
"git.jpi.io/amery/jpictl/pkg/wireguard"
|
||||
)
|
||||
|
||||
const (
|
||||
// MaxZoneID indicates the highest ID allowed for a Zone
|
||||
MaxZoneID = 0xf
|
||||
// MaxNodeID indicates the highest Machine ID allowed within a Zone
|
||||
MaxNodeID = 0xff - 1
|
||||
// RingsCount indicates how many wireguard rings we have
|
||||
RingsCount = 2
|
||||
// RingZeroPort is the port wireguard uses for ring0
|
||||
RingZeroPort = 51800
|
||||
// RingOnePort is the port wireguard uses for ring1
|
||||
RingOnePort = 51810
|
||||
)
|
||||
|
||||
// RingInfo contains represents the Wireguard endpoint details
|
||||
// for a Machine on a particular ring
|
||||
type RingInfo struct {
|
||||
Ring int `toml:"ring"`
|
||||
Enabled bool `toml:"enabled,omitempty"`
|
||||
Keys wireguard.KeyPair `toml:"keys,omitempty"`
|
||||
}
|
||||
|
||||
// Merge attempts to combine two RingInfo structs
|
||||
func (ri *RingInfo) Merge(alter *RingInfo) error {
|
||||
switch {
|
||||
case alter == nil:
|
||||
return nil
|
||||
case ri.Ring != alter.Ring:
|
||||
// different ring
|
||||
return fmt.Errorf("invalid %s: %v ≠ %v", "ring", ri.Ring, alter.Ring)
|
||||
case ri.Enabled && !alter.Enabled:
|
||||
// can't disable via Merge
|
||||
return fmt.Errorf("invalid %s: %v → %v", "enabled", ri.Enabled, alter.Enabled)
|
||||
case !canMergeKeyPairs(ri.Keys, alter.Keys):
|
||||
// incompatible keypairs
|
||||
return fmt.Errorf("invalid %s: %s ≠ %s", "keys", ri.Keys, alter.Keys)
|
||||
}
|
||||
|
||||
return ri.unsafeMerge(alter)
|
||||
}
|
||||
|
||||
func (ri *RingInfo) unsafeMerge(alter *RingInfo) error {
|
||||
// enable via Merge
|
||||
if alter.Enabled {
|
||||
ri.Enabled = true
|
||||
}
|
||||
|
||||
// fill the gaps on our keypair
|
||||
if ri.Keys.PrivateKey.IsZero() {
|
||||
ri.Keys.PrivateKey = alter.Keys.PrivateKey
|
||||
}
|
||||
if ri.Keys.PublicKey.IsZero() {
|
||||
ri.Keys.PublicKey = alter.Keys.PublicKey
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func canMergeKeyPairs(p1, p2 wireguard.KeyPair) bool {
|
||||
switch {
|
||||
case !p1.PrivateKey.IsZero() && !p2.PrivateKey.IsZero() && !p1.PrivateKey.Equal(p2.PrivateKey):
|
||||
return false
|
||||
case !p1.PublicKey.IsZero() && !p2.PublicKey.IsZero() && !p1.PublicKey.Equal(p2.PublicKey):
|
||||
return false
|
||||
default:
|
||||
return true
|
||||
}
|
||||
}
|
||||
|
||||
// RingAddressEncoder provides encoder/decoder access for a particular
|
||||
// Wireguard ring
|
||||
type RingAddressEncoder struct {
|
||||
ID int
|
||||
Port uint16
|
||||
Encode func(zoneID, nodeID int) (netip.Addr, bool)
|
||||
Decode func(addr netip.Addr) (zoneID, nodeID int, ok bool)
|
||||
}
|
||||
|
||||
var (
|
||||
// RingZero is a wg0 address encoder/decoder
|
||||
RingZero = RingAddressEncoder{
|
||||
ID: 0,
|
||||
Port: RingZeroPort,
|
||||
Decode: ParseRingZeroAddress,
|
||||
Encode: RingZeroAddress,
|
||||
}
|
||||
// RingOne is a wg1 address encoder/decoder
|
||||
RingOne = RingAddressEncoder{
|
||||
ID: 1,
|
||||
Port: RingOnePort,
|
||||
Decode: ParseRingOneAddress,
|
||||
Encode: RingOneAddress,
|
||||
}
|
||||
// Rings provides indexed access to the ring address encoders
|
||||
Rings = [RingsCount]RingAddressEncoder{
|
||||
RingZero,
|
||||
RingOne,
|
||||
}
|
||||
)
|
||||
|
||||
// ValidZoneID checks if the given zoneID is a valid 4 bit zone number.
|
||||
//
|
||||
// 0 is reserved, and only allowed when composing CIDRs.
|
||||
func ValidZoneID(zoneID int) bool {
|
||||
switch {
|
||||
case zoneID < 0 || zoneID > MaxZoneID:
|
||||
return false
|
||||
default:
|
||||
return true
|
||||
}
|
||||
}
|
||||
|
||||
// ValidNodeID checks if the given nodeID is a valid 8 bit number.
|
||||
// nodeID is unique within a Zone.
|
||||
// 0 is reserved, and only allowed when composing CIDRs.
|
||||
func ValidNodeID(nodeID int) bool {
|
||||
switch {
|
||||
case nodeID < 0 || nodeID > MaxNodeID:
|
||||
return false
|
||||
default:
|
||||
return true
|
||||
}
|
||||
}
|
||||
|
||||
// ParseRingZeroAddress extracts zone and node ID from a wg0 [netip.Addr]
|
||||
// wg0 addresses are of the form `10.0.{{zoneID}}.{{nodeID}}`
|
||||
func ParseRingZeroAddress(addr netip.Addr) (zoneID int, nodeID int, ok bool) {
|
||||
if addr.IsValid() {
|
||||
a4 := addr.As4()
|
||||
|
||||
if a4[0] == 10 && a4[1] == 0 {
|
||||
return int(a4[2]), int(a4[3]), true
|
||||
}
|
||||
}
|
||||
return 0, 0, false
|
||||
}
|
||||
|
||||
// RingZeroAddress returns a wg0 IP address
|
||||
func RingZeroAddress(zoneID, nodeID int) (netip.Addr, bool) {
|
||||
switch {
|
||||
case !ValidZoneID(zoneID) || !ValidNodeID(nodeID):
|
||||
return netip.Addr{}, false
|
||||
default:
|
||||
a4 := [4]uint8{10, 0, uint8(zoneID), uint8(nodeID)}
|
||||
return netip.AddrFrom4(a4), true
|
||||
}
|
||||
}
|
||||
|
||||
// ParseRingOneAddress extracts zone and node ID from a wg1 [netip.Addr]
|
||||
// wg1 addresses are of the form `10.{{zoneID << 4}}.{{nodeID}}`
|
||||
func ParseRingOneAddress(addr netip.Addr) (zoneID int, nodeID int, ok bool) {
|
||||
if addr.IsValid() {
|
||||
a4 := addr.As4()
|
||||
|
||||
if a4[0] == 10 && a4[2] == 0 {
|
||||
zoneID = int(a4[1] >> 4)
|
||||
nodeID = int(a4[3])
|
||||
return zoneID, nodeID, true
|
||||
}
|
||||
}
|
||||
return 0, 0, false
|
||||
}
|
||||
|
||||
// RingOneAddress returns a wg1 IP address
|
||||
func RingOneAddress(zoneID, nodeID int) (netip.Addr, bool) {
|
||||
switch {
|
||||
case !ValidZoneID(zoneID) || !ValidNodeID(nodeID):
|
||||
return netip.Addr{}, false
|
||||
default:
|
||||
a4 := [4]uint8{10, uint8(zoneID << 4), 0, uint8(nodeID)}
|
||||
return netip.AddrFrom4(a4), true
|
||||
}
|
||||
}
|
||||
@@ -1,141 +0,0 @@
|
||||
package zones
|
||||
|
||||
import (
|
||||
"io/fs"
|
||||
"sort"
|
||||
)
|
||||
|
||||
func (m *Zones) scan() error {
|
||||
for _, fn := range []func() error{
|
||||
m.scanDirectory,
|
||||
m.scanMachines,
|
||||
m.scanZoneIDs,
|
||||
m.scanSort,
|
||||
} {
|
||||
if err := fn(); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (m *Zones) scanDirectory() error {
|
||||
// each directory is a zone
|
||||
entries, err := fs.ReadDir(m.dir, ".")
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
for _, e := range entries {
|
||||
if e.IsDir() {
|
||||
z := &Zone{
|
||||
zones: m,
|
||||
Name: e.Name(),
|
||||
}
|
||||
|
||||
if err := z.scan(); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
m.Zones = append(m.Zones, z)
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (m *Zones) scanMachines() error {
|
||||
var err error
|
||||
m.ForEachMachine(func(p *Machine) bool {
|
||||
err = p.scan()
|
||||
return err != nil
|
||||
})
|
||||
return err
|
||||
}
|
||||
|
||||
func (m *Zones) scanZoneIDs() error {
|
||||
var hasMissing bool
|
||||
var lastZoneID int
|
||||
|
||||
m.ForEachZone(func(z *Zone) bool {
|
||||
switch {
|
||||
case z.ID == 0:
|
||||
hasMissing = true
|
||||
case z.ID > lastZoneID:
|
||||
lastZoneID = z.ID
|
||||
}
|
||||
|
||||
return false
|
||||
})
|
||||
|
||||
if hasMissing {
|
||||
next := lastZoneID + 1
|
||||
|
||||
m.ForEachZone(func(z *Zone) bool {
|
||||
if z.ID == 0 {
|
||||
z.ID, next = next, next+1
|
||||
}
|
||||
|
||||
return false
|
||||
})
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (m *Zones) scanSort() error {
|
||||
sort.SliceStable(m.Zones, func(i, j int) bool {
|
||||
id1 := m.Zones[i].ID
|
||||
id2 := m.Zones[j].ID
|
||||
return id1 < id2
|
||||
})
|
||||
|
||||
m.ForEachZone(func(z *Zone) bool {
|
||||
sort.SliceStable(z.Machines, func(i, j int) bool {
|
||||
id1 := z.Machines[i].ID
|
||||
id2 := z.Machines[j].ID
|
||||
return id1 < id2
|
||||
})
|
||||
|
||||
return false
|
||||
})
|
||||
|
||||
m.ForEachMachine(func(p *Machine) bool {
|
||||
sort.SliceStable(p.Rings, func(i, j int) bool {
|
||||
ri1 := p.Rings[i]
|
||||
ri2 := p.Rings[j]
|
||||
|
||||
return ri1.Ring < ri2.Ring
|
||||
})
|
||||
|
||||
return false
|
||||
})
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (z *Zone) scan() error {
|
||||
// each directory is a machine
|
||||
entries, err := fs.ReadDir(z.zones.dir, z.Name)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
for _, e := range entries {
|
||||
if e.IsDir() {
|
||||
m := &Machine{
|
||||
zone: z,
|
||||
Name: e.Name(),
|
||||
}
|
||||
|
||||
if err := m.init(); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
z.Machines = append(z.Machines, m)
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
@@ -1,33 +0,0 @@
|
||||
package zones
|
||||
|
||||
// SyncAll updates all config files
|
||||
func (m *Zones) SyncAll() error {
|
||||
for _, fn := range []func() error{
|
||||
m.SyncAllWireguard,
|
||||
} {
|
||||
if err := fn(); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// SyncAllWireguard updates all wireguard config files
|
||||
func (m *Zones) SyncAllWireguard() error {
|
||||
var err error
|
||||
|
||||
for ring := 0; ring < RingsCount; ring++ {
|
||||
err = m.PruneWireguardConfig(ring)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
err = m.WriteWireguardKeys(ring)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
@@ -1,61 +0,0 @@
|
||||
package zones
|
||||
|
||||
import "os"
|
||||
|
||||
// PruneWireguardConfig removes wgN.conf files of machines with
|
||||
// the corresponding ring disabled.
|
||||
func (z *Zone) PruneWireguardConfig(ring int) error {
|
||||
var err error
|
||||
|
||||
z.ForEachMachine(func(p *Machine) bool {
|
||||
_, ok := p.getRingInfo(ring)
|
||||
if !ok {
|
||||
err = p.RemoveWireguardConfig(ring)
|
||||
}
|
||||
return err != nil
|
||||
})
|
||||
|
||||
return err
|
||||
}
|
||||
|
||||
// WriteWireguardKeys rewrites all wgN.{key,pub} files on this zone
|
||||
func (z *Zone) WriteWireguardKeys(ring int) error {
|
||||
var err error
|
||||
|
||||
z.ForEachMachine(func(p *Machine) bool {
|
||||
err = p.WriteWireguardKeys(ring)
|
||||
if os.IsNotExist(err) {
|
||||
// ignore
|
||||
err = nil
|
||||
}
|
||||
|
||||
return err != nil
|
||||
})
|
||||
|
||||
return err
|
||||
}
|
||||
|
||||
// PruneWireguardConfig removes wgN.conf files of machines with
|
||||
// the corresponding ring disabled on all zones
|
||||
func (m *Zones) PruneWireguardConfig(ring int) error {
|
||||
var err error
|
||||
|
||||
m.ForEachZone(func(z *Zone) bool {
|
||||
err = z.PruneWireguardConfig(ring)
|
||||
return err != nil
|
||||
})
|
||||
|
||||
return err
|
||||
}
|
||||
|
||||
// WriteWireguardKeys rewrites all wgN.{key,pub} files
|
||||
func (m *Zones) WriteWireguardKeys(ring int) error {
|
||||
var err error
|
||||
|
||||
m.ForEachZone(func(z *Zone) bool {
|
||||
err = z.WriteWireguardKeys(ring)
|
||||
return err != nil
|
||||
})
|
||||
|
||||
return err
|
||||
}
|
||||
@@ -1,120 +0,0 @@
|
||||
// Package zones contains information about the cluster
|
||||
package zones
|
||||
|
||||
import (
|
||||
"io/fs"
|
||||
"path/filepath"
|
||||
|
||||
"github.com/hack-pad/hackpadfs/os"
|
||||
|
||||
"darvaza.org/resolver"
|
||||
)
|
||||
|
||||
// Zone represents one zone in a cluster
|
||||
type Zone struct {
|
||||
zones *Zones
|
||||
|
||||
ID int `toml:"id"`
|
||||
Name string `toml:"name"`
|
||||
|
||||
Machines []*Machine `toml:"machines"`
|
||||
}
|
||||
|
||||
func (z *Zone) String() string {
|
||||
return z.Name
|
||||
}
|
||||
|
||||
// ForEachMachine calls a function for each Machine in the zone
|
||||
// until instructed to terminate the loop
|
||||
func (z *Zone) ForEachMachine(fn func(*Machine) bool) {
|
||||
for _, p := range z.Machines {
|
||||
if fn(p) {
|
||||
return
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Zones represents all zones in a cluster
|
||||
type Zones struct {
|
||||
dir fs.FS
|
||||
resolver resolver.Resolver
|
||||
domain string
|
||||
|
||||
Zones []*Zone `toml:"zones"`
|
||||
}
|
||||
|
||||
// ForEachMachine calls a function for each Machine in the cluster
|
||||
// until instructed to terminate the loop
|
||||
func (m *Zones) ForEachMachine(fn func(*Machine) bool) {
|
||||
m.ForEachZone(func(z *Zone) bool {
|
||||
var term bool
|
||||
|
||||
z.ForEachMachine(func(p *Machine) bool {
|
||||
term = fn(p)
|
||||
return term
|
||||
})
|
||||
|
||||
return term
|
||||
})
|
||||
}
|
||||
|
||||
// ForEachZone calls a function for each Zone in the cluster
|
||||
// until instructed to terminate the loop
|
||||
func (m *Zones) ForEachZone(fn func(*Zone) bool) {
|
||||
for _, p := range m.Zones {
|
||||
if fn(p) {
|
||||
// terminate
|
||||
return
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// GetMachineByName looks for a machine with the specified
|
||||
// name on any zone
|
||||
func (m *Zones) GetMachineByName(name string) (*Machine, bool) {
|
||||
var out *Machine
|
||||
|
||||
if name != "" {
|
||||
m.ForEachMachine(func(p *Machine) bool {
|
||||
if p.Name == name {
|
||||
out = p
|
||||
}
|
||||
|
||||
return out != nil
|
||||
})
|
||||
}
|
||||
|
||||
return out, out != nil
|
||||
}
|
||||
|
||||
// NewFS builds a [Zones] tree using the given directory
|
||||
func NewFS(dir fs.FS, domain string) (*Zones, error) {
|
||||
lockuper := resolver.NewCloudflareLookuper()
|
||||
|
||||
z := &Zones{
|
||||
dir: dir,
|
||||
resolver: resolver.NewResolver(lockuper),
|
||||
domain: domain,
|
||||
}
|
||||
|
||||
if err := z.scan(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return z, nil
|
||||
}
|
||||
|
||||
// New builds a [Zones] tree using the given directory
|
||||
func New(dir, domain string) (*Zones, error) {
|
||||
dir, err := filepath.Abs(dir)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
base, err := os.NewFS().Sub(dir[1:])
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return NewFS(base, domain)
|
||||
}
|
||||
Reference in New Issue
Block a user