migrate to golang.zx2c4.com/wireguard/wgctrl (#239)
* migrate to golang.zx2c4.com/wireguard/wgctrl This commit introduces the usage of wgctrl. It avoids the usage of exec calls of the wg command and parsing the output of `wg show`. Signed-off-by: leonnicolas <leonloechner@gmx.de> * vendor wgctrl Signed-off-by: leonnicolas <leonloechner@gmx.de> * apply suggestions from code review Remove wireguard.Enpoint struct and use net.UDPAddr for the resolved endpoint and addr string (dnsanme:port) if a DN was supplied. Signed-off-by: leonnicolas <leonloechner@gmx.de> * pkg/*: use wireguard.Enpoint This commit introduces the wireguard.Enpoint struct. It encapsulates a DN name with port and a net.UPDAddr. The fields are private and only accessible over exported Methods to avoid accidental modification. Also iptables.GetProtocol is improved to avoid ipv4 rules being applied by `ip6tables`. Signed-off-by: leonnicolas <leonloechner@gmx.de> * pkg/wireguard/conf_test.go: add tests for Endpoint Signed-off-by: leonnicolas <leonloechner@gmx.de> * cmd/kg/main.go: validate port range Signed-off-by: leonnicolas <leonloechner@gmx.de> * add suggestions from review Signed-off-by: leonnicolas <leonloechner@gmx.de> * pkg/mesh/mesh.go: use Equal func Implement an Equal func for Enpoint and use it instead of comparing strings. Signed-off-by: leonnicolas <leonloechner@gmx.de> * cmd/kgctl/main.go: check port range Signed-off-by: leonnicolas <leonloechner@gmx.de> * vendor Signed-off-by: leonnicolas <leonloechner@gmx.de>
This commit is contained in:
		| @@ -24,6 +24,8 @@ import ( | ||||
| 	"os" | ||||
| 	"os/exec" | ||||
|  | ||||
| 	"golang.zx2c4.com/wireguard/wgctrl/wgtypes" | ||||
|  | ||||
| 	"github.com/squat/kilo/pkg/mesh" | ||||
| ) | ||||
|  | ||||
| @@ -62,7 +64,7 @@ func (h *graphHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { | ||||
| 			peers[p.Name] = p | ||||
| 		} | ||||
| 	} | ||||
| 	topo, err := mesh.NewTopology(nodes, peers, h.granularity, *h.hostname, 0, []byte{}, h.subnet, nodes[*h.hostname].PersistentKeepalive, nil) | ||||
| 	topo, err := mesh.NewTopology(nodes, peers, h.granularity, *h.hostname, 0, wgtypes.Key{}, h.subnet, nodes[*h.hostname].PersistentKeepalive, nil) | ||||
| 	if err != nil { | ||||
| 		http.Error(w, fmt.Sprintf("failed to create topology: %v", err), http.StatusInternalServerError) | ||||
| 		return | ||||
|   | ||||
| @@ -109,7 +109,7 @@ var ( | ||||
| 	master                string | ||||
| 	mtu                   uint | ||||
| 	topologyLabel         string | ||||
| 	port                  uint | ||||
| 	port                  int | ||||
| 	subnet                string | ||||
| 	resyncPeriod          time.Duration | ||||
| 	iptablesForwardRule   bool | ||||
| @@ -139,7 +139,7 @@ func init() { | ||||
| 	cmd.Flags().StringVar(&master, "master", "", "The address of the Kubernetes API server (overrides any value in kubeconfig).") | ||||
| 	cmd.Flags().UintVar(&mtu, "mtu", wireguard.DefaultMTU, "The MTU of the WireGuard interface created by Kilo.") | ||||
| 	cmd.Flags().StringVar(&topologyLabel, "topology-label", k8s.RegionLabelKey, "Kubernetes node label used to group nodes into logical locations.") | ||||
| 	cmd.Flags().UintVar(&port, "port", mesh.DefaultKiloPort, "The port over which WireGuard peers should communicate.") | ||||
| 	cmd.Flags().IntVar(&port, "port", mesh.DefaultKiloPort, "The port over which WireGuard peers should communicate.") | ||||
| 	cmd.Flags().StringVar(&subnet, "subnet", mesh.DefaultKiloSubnet.String(), "CIDR from which to allocate addresses for WireGuard interfaces.") | ||||
| 	cmd.Flags().DurationVar(&resyncPeriod, "resync-period", 30*time.Second, "How often should the Kilo controllers reconcile?") | ||||
| 	cmd.Flags().BoolVar(&iptablesForwardRule, "iptables-forward-rules", false, "Add default accept rules to the FORWARD chain in iptables. Warning: this may break firewalls with a deny all policy and is potentially insecure!") | ||||
| @@ -234,12 +234,15 @@ func runRoot(_ *cobra.Command, _ []string) error { | ||||
| 		c := kubernetes.NewForConfigOrDie(config) | ||||
| 		kc := kiloclient.NewForConfigOrDie(config) | ||||
| 		ec := apiextensions.NewForConfigOrDie(config) | ||||
| 		b = k8s.New(c, kc, ec, topologyLabel) | ||||
| 		b = k8s.New(c, kc, ec, topologyLabel, log.With(logger, "component", "k8s backend")) | ||||
| 	default: | ||||
| 		return fmt.Errorf("backend %v unknown; possible values are: %s", backend, availableBackends) | ||||
| 	} | ||||
|  | ||||
| 	m, err := mesh.New(b, enc, gr, hostname, uint32(port), s, local, cni, cniPath, iface, cleanUpIface, createIface, mtu, resyncPeriod, prioritisePrivateAddr, iptablesForwardRule, log.With(logger, "component", "kilo")) | ||||
| 	if port < 1 || port > 1<<16-1 { | ||||
| 		return fmt.Errorf("invalid port: port mus be in range [%d:%d], but got %d", 1, 1<<16-1, port) | ||||
| 	} | ||||
| 	m, err := mesh.New(b, enc, gr, hostname, port, s, local, cni, cniPath, iface, cleanUpIface, createIface, mtu, resyncPeriod, prioritisePrivateAddr, iptablesForwardRule, log.With(logger, "component", "kilo")) | ||||
| 	if err != nil { | ||||
| 		return fmt.Errorf("failed to create Kilo mesh: %v", err) | ||||
| 	} | ||||
|   | ||||
		Reference in New Issue
	
	Block a user