extern/netbird
1
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2025-08-13 17:07:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "hacky all-operating-systems solution"

Browse Source 
This reverts commit 75fac258e7.
This commit is contained in:
Pascal Fischer
2023-06-09 17:59:06 +02:00
parent 75fac258e7
commit 493ddb4fe3
2 changed files with 84 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
client/internal/routemanager/systemops_nonandroid_test.go
View File

@ -86,59 +86,43 @@ func TestAddExistAndRemoveRoute(t *testing.T) {
t.Fatal("shouldn't return error when fetching the gateway: ", err)
}
testCases := []struct {
name string
prefix netip.Prefix
gateway string
preExistingPrefix netip.Prefix
preExistingGateway string
shouldAddRoute bool
name string
prefix netip.Prefix
preExistingPrefix netip.Prefix
shouldAddRoute bool
}{
{
name: "Should Add And Remove random Route",
prefix: netip.MustParsePrefix("99.99.99.99/32"),
gateway: "127.0.0.1",
shouldAddRoute: true,
},
{
name: "Should Not Add Route if overlaps with default gateway",
prefix: netip.MustParsePrefix(defaultGateway.String() + "/31"),
gateway: "127.0.0.1",
shouldAddRoute: false,
},
{
name: "Should Add Route if bigger network exists",
prefix: netip.MustParsePrefix("100.100.100.0/24"),
gateway: "127.0.0.1",
preExistingPrefix: netip.MustParsePrefix("100.100.0.0/16"),
preExistingGateway: "127.0.0.1",
shouldAddRoute: true,
name: "Should Add Route if bigger network exists",
prefix: netip.MustParsePrefix("100.100.100.0/24"),
preExistingPrefix: netip.MustParsePrefix("100.100.0.0/16"),
shouldAddRoute: true,
},
{
name: "Should Add Route if smaller network exists",
prefix: netip.MustParsePrefix("100.100.0.0/16"),
gateway: "127.0.0.1",
preExistingPrefix: netip.MustParsePrefix("100.100.100.0/24"),
preExistingGateway: "127.0.0.1",
shouldAddRoute: true,
name: "Should Add Route if smaller network exists",
prefix: netip.MustParsePrefix("100.100.0.0/16"),
preExistingPrefix: netip.MustParsePrefix("100.100.100.0/24"),
shouldAddRoute: true,
},
{
name: "Should Not Add Route if same network with same gateway exists",
prefix: netip.MustParsePrefix("100.100.0.0/16"),
gateway: "127.0.0.1",
preExistingPrefix: netip.MustParsePrefix("100.100.0.0/16"),
preExistingGateway: "127.0.0.1",
shouldAddRoute: false,
},
{
name: "Should Not Add Route if same network with different gateway exists",
prefix: netip.MustParsePrefix("100.100.0.0/16"),
gateway: "127.0.0.1",
preExistingPrefix: netip.MustParsePrefix("100.100.0.0/16"),
preExistingGateway: "123.0.0.1",
shouldAddRoute: false,
name: "Should Not Add Route if same network exists",
prefix: netip.MustParsePrefix("100.100.0.0/16"),
preExistingPrefix: netip.MustParsePrefix("100.100.0.0/16"),
shouldAddRoute: false,
},
}
MOCK_ADDR := "127.0.0.1"
for _, testCase := range testCases {
var buf bytes.Buffer
log.SetOutput(&buf)
@ -148,28 +132,28 @@ func TestAddExistAndRemoveRoute(t *testing.T) {
t.Run(testCase.name, func(t *testing.T) {
// Prepare the environment
if testCase.preExistingPrefix.IsValid() {
err := addToRouteTableIfNoExists(testCase.preExistingPrefix, testCase.preExistingGateway)
err := addToRouteTableIfNoExists(testCase.preExistingPrefix, MOCK_ADDR)
require.NoError(t, err, "should not return err when adding pre-existing route")
}
// Add the route
err = addToRouteTableIfNoExists(testCase.prefix, testCase.gateway)
err = addToRouteTableIfNoExists(testCase.prefix, MOCK_ADDR)
require.NoError(t, err, "should not return err when adding pre-existing route")
if testCase.shouldAddRoute {
// test if route exists after adding
ok, err := routeExistsWithSameGateway(testCase.prefix, testCase.gateway)
ok, err := existsInRouteTable(testCase.prefix)
require.NoError(t, err, "should not return err")
require.True(t, ok, "route should exist")
// remove route again if added
err = removeFromRouteTableIfNonSystem(testCase.prefix, testCase.gateway)
err = removeFromRouteTableIfNonSystem(testCase.prefix, MOCK_ADDR)
require.NoError(t, err, "should not return err")
}
// route should either not have been added or should have been removed
// In case of already existing route, it should not have been added (but still exist)
ok, err := routeExistsWithSameGateway(testCase.prefix, testCase.gateway)
ok, err := existsInRouteTable(testCase.prefix)
fmt.Println("Buffer string: ", buf.String())
require.NoError(t, err, "should not return err")
if !strings.Contains(buf.String(), "because it already exists") {