6a696e03e7
* 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>
129 lines
3.1 KiB
Go
129 lines
3.1 KiB
Go
// Copyright 2019 the Kilo authors
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package mesh
|
|
|
|
import (
|
|
"net"
|
|
"testing"
|
|
"time"
|
|
|
|
"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
|
|
|
|
"github.com/squat/kilo/pkg/wireguard"
|
|
)
|
|
|
|
func mustKey() wgtypes.Key {
|
|
if k, err := wgtypes.GeneratePrivateKey(); err != nil {
|
|
panic(err.Error())
|
|
} else {
|
|
return k
|
|
}
|
|
}
|
|
|
|
var key = mustKey()
|
|
|
|
func TestReady(t *testing.T) {
|
|
internalIP := oneAddressCIDR(net.ParseIP("1.1.1.1"))
|
|
externalIP := oneAddressCIDR(net.ParseIP("2.2.2.2"))
|
|
for _, tc := range []struct {
|
|
name string
|
|
node *Node
|
|
ready bool
|
|
}{
|
|
{
|
|
name: "nil",
|
|
node: nil,
|
|
ready: false,
|
|
},
|
|
{
|
|
name: "empty fields",
|
|
node: &Node{},
|
|
ready: false,
|
|
},
|
|
{
|
|
name: "empty endpoint",
|
|
node: &Node{
|
|
InternalIP: internalIP,
|
|
Key: key,
|
|
Subnet: &net.IPNet{IP: net.ParseIP("10.2.0.0"), Mask: net.CIDRMask(16, 32)},
|
|
},
|
|
ready: false,
|
|
},
|
|
{
|
|
name: "empty endpoint IP",
|
|
node: &Node{
|
|
Endpoint: wireguard.NewEndpoint(nil, DefaultKiloPort),
|
|
InternalIP: internalIP,
|
|
Key: wgtypes.Key{},
|
|
Subnet: &net.IPNet{IP: net.ParseIP("10.2.0.0"), Mask: net.CIDRMask(16, 32)},
|
|
},
|
|
ready: false,
|
|
},
|
|
{
|
|
name: "empty endpoint port",
|
|
node: &Node{
|
|
Endpoint: wireguard.NewEndpoint(externalIP.IP, 0),
|
|
InternalIP: internalIP,
|
|
Key: wgtypes.Key{},
|
|
Subnet: &net.IPNet{IP: net.ParseIP("10.2.0.0"), Mask: net.CIDRMask(16, 32)},
|
|
},
|
|
ready: false,
|
|
},
|
|
{
|
|
name: "empty internal IP",
|
|
node: &Node{
|
|
Endpoint: wireguard.NewEndpoint(externalIP.IP, DefaultKiloPort),
|
|
Key: wgtypes.Key{},
|
|
Subnet: &net.IPNet{IP: net.ParseIP("10.2.0.0"), Mask: net.CIDRMask(16, 32)},
|
|
},
|
|
ready: false,
|
|
},
|
|
{
|
|
name: "empty key",
|
|
node: &Node{
|
|
Endpoint: wireguard.NewEndpoint(externalIP.IP, DefaultKiloPort),
|
|
InternalIP: internalIP,
|
|
Subnet: &net.IPNet{IP: net.ParseIP("10.2.0.0"), Mask: net.CIDRMask(16, 32)},
|
|
},
|
|
ready: false,
|
|
},
|
|
{
|
|
name: "empty subnet",
|
|
node: &Node{
|
|
Endpoint: wireguard.NewEndpoint(externalIP.IP, DefaultKiloPort),
|
|
InternalIP: internalIP,
|
|
Key: wgtypes.Key{},
|
|
},
|
|
ready: false,
|
|
},
|
|
{
|
|
name: "valid",
|
|
node: &Node{
|
|
Endpoint: wireguard.NewEndpoint(externalIP.IP, DefaultKiloPort),
|
|
InternalIP: internalIP,
|
|
Key: key,
|
|
LastSeen: time.Now().Unix(),
|
|
Subnet: &net.IPNet{IP: net.ParseIP("10.2.0.0"), Mask: net.CIDRMask(16, 32)},
|
|
},
|
|
ready: true,
|
|
},
|
|
} {
|
|
ready := tc.node.Ready()
|
|
if ready != tc.ready {
|
|
t.Errorf("test case %q: expected %t, got %t", tc.name, tc.ready, ready)
|
|
}
|
|
}
|
|
}
|