unsafe_routes mtu (#209)
This commit is contained in:
parent
9e2ff7df57
commit
ff64d1f952
|
@ -132,7 +132,7 @@ func parseUnsafeRoutes(config *Config, network *net.IPNet) ([]route, error) {
|
||||||
|
|
||||||
via, ok := rVia.(string)
|
via, ok := rVia.(string)
|
||||||
if !ok {
|
if !ok {
|
||||||
return nil, fmt.Errorf("entry %v.via in tun.unsafe_routes is not a string: %v", i+1, err)
|
return nil, fmt.Errorf("entry %v.via in tun.unsafe_routes is not a string: found %T", i+1, rVia)
|
||||||
}
|
}
|
||||||
|
|
||||||
nVia := net.ParseIP(via)
|
nVia := net.ParseIP(via)
|
||||||
|
@ -147,6 +147,7 @@ func parseUnsafeRoutes(config *Config, network *net.IPNet) ([]route, error) {
|
||||||
|
|
||||||
r := route{
|
r := route{
|
||||||
via: &nVia,
|
via: &nVia,
|
||||||
|
mtu: mtu,
|
||||||
}
|
}
|
||||||
|
|
||||||
_, r.route, err = net.ParseCIDR(fmt.Sprintf("%v", rRoute))
|
_, r.route, err = net.ParseCIDR(fmt.Sprintf("%v", rRoute))
|
||||||
|
|
127
tun_test.go
127
tun_test.go
|
@ -1,9 +1,11 @@
|
||||||
package nebula
|
package nebula
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"github.com/stretchr/testify/assert"
|
"fmt"
|
||||||
"net"
|
"net"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
|
"github.com/stretchr/testify/assert"
|
||||||
)
|
)
|
||||||
|
|
||||||
func Test_parseRoutes(t *testing.T) {
|
func Test_parseRoutes(t *testing.T) {
|
||||||
|
@ -100,3 +102,126 @@ func Test_parseRoutes(t *testing.T) {
|
||||||
t.Fatal("Did not see both routes")
|
t.Fatal("Did not see both routes")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func Test_parseUnsafeRoutes(t *testing.T) {
|
||||||
|
c := NewConfig()
|
||||||
|
_, n, _ := net.ParseCIDR("10.0.0.0/24")
|
||||||
|
|
||||||
|
// test no routes config
|
||||||
|
routes, err := parseUnsafeRoutes(c, n)
|
||||||
|
assert.Nil(t, err)
|
||||||
|
assert.Len(t, routes, 0)
|
||||||
|
|
||||||
|
// not an array
|
||||||
|
c.Settings["tun"] = map[interface{}]interface{}{"unsafe_routes": "hi"}
|
||||||
|
routes, err = parseUnsafeRoutes(c, n)
|
||||||
|
assert.Nil(t, routes)
|
||||||
|
assert.EqualError(t, err, "tun.unsafe_routes is not an array")
|
||||||
|
|
||||||
|
// no routes
|
||||||
|
c.Settings["tun"] = map[interface{}]interface{}{"unsafe_routes": []interface{}{}}
|
||||||
|
routes, err = parseUnsafeRoutes(c, n)
|
||||||
|
assert.Nil(t, err)
|
||||||
|
assert.Len(t, routes, 0)
|
||||||
|
|
||||||
|
// weird route
|
||||||
|
c.Settings["tun"] = map[interface{}]interface{}{"unsafe_routes": []interface{}{"asdf"}}
|
||||||
|
routes, err = parseUnsafeRoutes(c, n)
|
||||||
|
assert.Nil(t, routes)
|
||||||
|
assert.EqualError(t, err, "entry 1 in tun.unsafe_routes is invalid")
|
||||||
|
|
||||||
|
// no via
|
||||||
|
c.Settings["tun"] = map[interface{}]interface{}{"unsafe_routes": []interface{}{map[interface{}]interface{}{}}}
|
||||||
|
routes, err = parseUnsafeRoutes(c, n)
|
||||||
|
assert.Nil(t, routes)
|
||||||
|
assert.EqualError(t, err, "entry 1.via in tun.unsafe_routes is not present")
|
||||||
|
|
||||||
|
// invalid via
|
||||||
|
for _, invalidValue := range []interface{}{
|
||||||
|
127, false, nil, 1.0, []string{"1", "2"},
|
||||||
|
} {
|
||||||
|
c.Settings["tun"] = map[interface{}]interface{}{"unsafe_routes": []interface{}{map[interface{}]interface{}{"via": invalidValue}}}
|
||||||
|
routes, err = parseUnsafeRoutes(c, n)
|
||||||
|
assert.Nil(t, routes)
|
||||||
|
assert.EqualError(t, err, fmt.Sprintf("entry 1.via in tun.unsafe_routes is not a string: found %T", invalidValue))
|
||||||
|
}
|
||||||
|
|
||||||
|
// unparsable via
|
||||||
|
c.Settings["tun"] = map[interface{}]interface{}{"unsafe_routes": []interface{}{map[interface{}]interface{}{"mtu": "500", "via": "nope"}}}
|
||||||
|
routes, err = parseUnsafeRoutes(c, n)
|
||||||
|
assert.Nil(t, routes)
|
||||||
|
assert.EqualError(t, err, "entry 1.via in tun.unsafe_routes failed to parse address: nope")
|
||||||
|
|
||||||
|
// missing route
|
||||||
|
c.Settings["tun"] = map[interface{}]interface{}{"unsafe_routes": []interface{}{map[interface{}]interface{}{"via": "127.0.0.1", "mtu": "500"}}}
|
||||||
|
routes, err = parseUnsafeRoutes(c, n)
|
||||||
|
assert.Nil(t, routes)
|
||||||
|
assert.EqualError(t, err, "entry 1.route in tun.unsafe_routes is not present")
|
||||||
|
|
||||||
|
// unparsable route
|
||||||
|
c.Settings["tun"] = map[interface{}]interface{}{"unsafe_routes": []interface{}{map[interface{}]interface{}{"via": "127.0.0.1", "mtu": "500", "route": "nope"}}}
|
||||||
|
routes, err = parseUnsafeRoutes(c, n)
|
||||||
|
assert.Nil(t, routes)
|
||||||
|
assert.EqualError(t, err, "entry 1.route in tun.unsafe_routes failed to parse: invalid CIDR address: nope")
|
||||||
|
|
||||||
|
// within network range
|
||||||
|
c.Settings["tun"] = map[interface{}]interface{}{"unsafe_routes": []interface{}{map[interface{}]interface{}{"via": "127.0.0.1", "route": "10.0.0.0/24"}}}
|
||||||
|
routes, err = parseUnsafeRoutes(c, n)
|
||||||
|
assert.Nil(t, routes)
|
||||||
|
assert.EqualError(t, err, "entry 1.route in tun.unsafe_routes is contained within the network attached to the certificate; route: 10.0.0.0/24, network: 10.0.0.0/24")
|
||||||
|
|
||||||
|
// below network range
|
||||||
|
c.Settings["tun"] = map[interface{}]interface{}{"unsafe_routes": []interface{}{map[interface{}]interface{}{"via": "127.0.0.1", "route": "1.0.0.0/8"}}}
|
||||||
|
routes, err = parseUnsafeRoutes(c, n)
|
||||||
|
assert.Len(t, routes, 1)
|
||||||
|
assert.Nil(t, err)
|
||||||
|
|
||||||
|
// above network range
|
||||||
|
c.Settings["tun"] = map[interface{}]interface{}{"unsafe_routes": []interface{}{map[interface{}]interface{}{"via": "127.0.0.1", "route": "10.0.1.0/24"}}}
|
||||||
|
routes, err = parseUnsafeRoutes(c, n)
|
||||||
|
assert.Len(t, routes, 1)
|
||||||
|
assert.Nil(t, err)
|
||||||
|
|
||||||
|
// no mtu
|
||||||
|
c.Settings["tun"] = map[interface{}]interface{}{"unsafe_routes": []interface{}{map[interface{}]interface{}{"via": "127.0.0.1", "route": "1.0.0.0/8"}}}
|
||||||
|
routes, err = parseUnsafeRoutes(c, n)
|
||||||
|
assert.Len(t, routes, 1)
|
||||||
|
assert.Equal(t, DEFAULT_MTU, routes[0].mtu)
|
||||||
|
|
||||||
|
// bad mtu
|
||||||
|
c.Settings["tun"] = map[interface{}]interface{}{"unsafe_routes": []interface{}{map[interface{}]interface{}{"via": "127.0.0.1", "mtu": "nope"}}}
|
||||||
|
routes, err = parseUnsafeRoutes(c, n)
|
||||||
|
assert.Nil(t, routes)
|
||||||
|
assert.EqualError(t, err, "entry 1.mtu in tun.unsafe_routes is not an integer: strconv.Atoi: parsing \"nope\": invalid syntax")
|
||||||
|
|
||||||
|
// low mtu
|
||||||
|
c.Settings["tun"] = map[interface{}]interface{}{"unsafe_routes": []interface{}{map[interface{}]interface{}{"via": "127.0.0.1", "mtu": "499"}}}
|
||||||
|
routes, err = parseUnsafeRoutes(c, n)
|
||||||
|
assert.Nil(t, routes)
|
||||||
|
assert.EqualError(t, err, "entry 1.mtu in tun.unsafe_routes is below 500: 499")
|
||||||
|
|
||||||
|
// happy case
|
||||||
|
c.Settings["tun"] = map[interface{}]interface{}{"unsafe_routes": []interface{}{
|
||||||
|
map[interface{}]interface{}{"via": "127.0.0.1", "mtu": "9000", "route": "1.0.0.0/29"},
|
||||||
|
map[interface{}]interface{}{"via": "127.0.0.1", "mtu": "8000", "route": "1.0.0.1/32"},
|
||||||
|
}}
|
||||||
|
routes, err = parseUnsafeRoutes(c, n)
|
||||||
|
assert.Nil(t, err)
|
||||||
|
assert.Len(t, routes, 2)
|
||||||
|
|
||||||
|
tested := 0
|
||||||
|
for _, r := range routes {
|
||||||
|
if r.mtu == 8000 {
|
||||||
|
assert.Equal(t, "1.0.0.1/32", r.route.String())
|
||||||
|
tested++
|
||||||
|
} else {
|
||||||
|
assert.Equal(t, 9000, r.mtu)
|
||||||
|
assert.Equal(t, "1.0.0.0/29", r.route.String())
|
||||||
|
tested++
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if tested != 2 {
|
||||||
|
t.Fatal("Did not see both unsafe_routes")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in New Issue