From 4bb17e043f65a3d17ca3a7ed68648f8e188375e3 Mon Sep 17 00:00:00 2001 From: Callan Bryant Date: Wed, 4 Mar 2020 19:38:48 +0000 Subject: [PATCH] start attempt at interface creation --- configtypes.go | 7 ++++--- go.mod | 3 +++ go.sum | 13 ++++++++++++ init.go | 17 ++++++++-------- reporttypes.go | 2 +- up.go | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 85 insertions(+), 12 deletions(-) create mode 100644 up.go diff --git a/configtypes.go b/configtypes.go index dc94baf..7b172d9 100644 --- a/configtypes.go +++ b/configtypes.go @@ -31,9 +31,10 @@ type PeerConfig struct { type DsnetConfig struct { // domain to append to hostnames. Relies on separate DNS server for // resolution. Informational only. - ExternalIP net.IP `validate:"required"` - ListenPort int `validate:"gte=1024,lte=65535"` - Domain string `validate:"required,gte=1,lte=255"` + ExternalIP net.IP `validate:"required"` + ListenPort int `validate:"gte=1024,lte=65535"` + Domain string `validate:"required,gte=1,lte=255"` + InterfaceName string `validate:"required,gte=1,lte=255"` // IP network from which to allocate automatic sequential addresses // Network is chosen randomly when not specified Network JSONIPNet `validate:"required"` diff --git a/go.mod b/go.mod index f05e9a6..be62b64 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,10 @@ go 1.13 require ( github.com/go-playground/validator/v10 v10.2.0 + github.com/google/uuid v1.1.1 github.com/mikioh/ipaddr v0.0.0-20190404000644-d465c8ab6721 + github.com/vishvananda/netlink v1.0.0 + github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df // indirect golang.org/x/tools v0.0.0-20200302155637-b1e4e04173e0 // indirect golang.zx2c4.com/wireguard/wgctrl v0.0.0-20200205215550-e35592f146e4 ) diff --git a/go.sum b/go.sum index 7284bcf..9008761 100644 --- a/go.sum +++ b/go.sum @@ -11,19 +11,29 @@ github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5a github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY= +github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/jsimonetti/rtnetlink v0.0.0-20190606172950-9527aa82566a/go.mod h1:Oz+70psSo5OFh8DBl0Zv2ACw7Esh6pPUphlvZG9x7uw= github.com/jsimonetti/rtnetlink v0.0.0-20200117123717-f846d4f6c1f4/go.mod h1:WGuG/smIU4J/54PblvSbh+xvCZmpJnFgr3ds6Z55XMQ= github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y= github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= +github.com/mdlayher/genetlink v1.0.0 h1:OoHN1OdyEIkScEmRgxLEe2M9U8ClMytqA5niynLtfj0= github.com/mdlayher/genetlink v1.0.0/go.mod h1:0rJ0h4itni50A86M2kHcgS85ttZazNt7a8H2a2cw0Gc= github.com/mdlayher/netlink v0.0.0-20190409211403-11939a169225/go.mod h1:eQB3mZE4aiYnlUsyGGCOpPETfdQq4Jhsgf1fk3cwQaA= github.com/mdlayher/netlink v1.0.0/go.mod h1:KxeJAFOFLG6AjpyDkQ/iIhxygIUKD+vcwqcnu43w/+M= +github.com/mdlayher/netlink v1.1.0 h1:mpdLgm+brq10nI9zM1BpX1kpDbh3NLl3RSnVq6ZSkfg= github.com/mdlayher/netlink v1.1.0/go.mod h1:H4WCitaheIsdF9yOYu8CFmCgQthAPIWZmcKp9uZHgmY= github.com/mikioh/ipaddr v0.0.0-20190404000644-d465c8ab6721 h1:RlZweED6sbSArvlE924+mUcZuXKLBHA35U7LN621Bws= github.com/mikioh/ipaddr v0.0.0-20190404000644-d465c8ab6721/go.mod h1:Ickgr2WtCLZ2MDGd4Gr0geeCH5HybhRJbonOgQpvSxc= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/vishvananda/netlink v1.0.0 h1:bqNY2lgheFIu1meHUFSH3d7vG93AFyqg3oGbJCOJgSM= +github.com/vishvananda/netlink v1.0.0/go.mod h1:+SR5DhBJrl6ZM7CoCKvpw5BKroDKQ+PJqOg65H/2ktk= +github.com/vishvananda/netlink v1.1.0 h1:1iyaYNBLmP6L0220aDnYQpo1QEV4t4hJ+xEEhhJH8j0= +github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE= +github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df h1:OviZH7qLw/7ZovXvuNyL3XQl8UFofeikI1NW1Gypu7k= +github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191002192127-34f69633bfdc/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= @@ -37,15 +47,18 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191003171128-d98b1b443823/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191007182048-72f939374954/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200202094626-16171245cfb2 h1:CCH4IOTTfewWjGOlSp+zGcjutRKlBEZQ6wTn8ozI/nI= golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190411185658-b44545bcd369/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191003212358-c178f38b412c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5 h1:LfCXLvNmTYH9kEmVgqbnsWfruoXZIrh4YBgqVHtDvw0= golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= diff --git a/init.go b/init.go index 5dae507..1497fce 100644 --- a/init.go +++ b/init.go @@ -22,14 +22,15 @@ func Init() { presharedKey := GenerateJSONKey() conf := DsnetConfig{ - PrivateKey: privateKey, - PresharedKey: presharedKey, - ListenPort: DEFAULT_LISTEN_PORT, - Network: getRandomNetwork(), - Peers: make([]PeerConfig, 0), - Domain: "dsnet", - ReportFile: DEFAULT_REPORT_FILE, - ExternalIP: getExternalIP(), + PrivateKey: privateKey, + PresharedKey: presharedKey, + ListenPort: DEFAULT_LISTEN_PORT, + Network: getRandomNetwork(), + Peers: make([]PeerConfig, 0), + Domain: "dsnet", + ReportFile: DEFAULT_REPORT_FILE, + ExternalIP: getExternalIP(), + InterfaceName: DEFAULT_INTERFACE_NAME, } IP := conf.MustAllocateIP() diff --git a/reporttypes.go b/reporttypes.go index 20b5b69..f733497 100644 --- a/reporttypes.go +++ b/reporttypes.go @@ -60,7 +60,7 @@ type PeerReport struct { // Description of what the host is and/or does Description string // Internal VPN IP address. Added to AllowedIPs in server config as a /32 - IP net.IP + IP net.IP Status Status // TODO ExternalIP support (Endpoint) //ExternalIP net.UDPAddr `validate:"required,udp4_addr"` diff --git a/up.go b/up.go new file mode 100644 index 0000000..0547120 --- /dev/null +++ b/up.go @@ -0,0 +1,55 @@ +package dsnet + +import ( + "net" + + "github.com/vishvananda/netlink" + "golang.zx2c4.com/wireguard/wgctrl" + "golang.zx2c4.com/wireguard/wgctrl/wgtypes" +) + +func Up() { + conf := MustLoadDsnetConfig() + CreateInterface(conf) +} + +func CreateInterface(conf *DsnetConfig) { + linkAttrs := netlink.NewLinkAttrs() + linkAttrs.Name = conf.InterfaceName + + iface := &netlink.GenericLink{ + LinkAttrs: linkAttrs, + LinkType: "wireguard", + } + + err := netlink.LinkAdd(iface) + if err != nil { + ExitFail("Could not add '%s' (%v)", linkAttrs.Name, err) + } + + addr := &netlink.Addr{ + IPNet: &net.IPNet{ + IP: conf.IP, + Mask: conf.Network.IPNet.Mask, + }, + } + + err = netlink.AddrAdd(iface, addr) + if err != nil { + ExitFail("Could not add addr %s to interface %s", addr.IP, err) + } + + deviceConfig := wgtypes.Config{ + PrivateKey: &conf.PrivateKey.Key, + ListenPort: &conf.ListenPort, + } + + wg, err := wgctrl.New() + check(err) + + err = wg.ConfigureDevice(linkAttrs.Name, deviceConfig) + + if err != nil { + ExitFail("Could not configure device '%s' (%v)", linkAttrs.Name, err) + } +}