extern/netbird
1
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2025-06-19 00:06:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Allow adding 3 nameserver addresses (#1588)

Browse Source
This commit is contained in:
Maycon Santos 2024-02-19 14:29:20 +01:00 committed by GitHub
parent 0afd738509
commit cb3408a10b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
management/server/http/api/openapi.yml
View File

@ -904,7 +904,7 @@ components:
nameservers: nameservers:
description: Nameserver list description: Nameserver list
minLength: 1 minLength: 1
maxLength: 2 maxLength: 3
type: array type: array
items: items:
$ref: '#/components/schemas/Nameserver' $ref: '#/components/schemas/Nameserver'

4
management/server/nameserver.go
View File

@ -255,8 +255,8 @@ func validateNSGroupName(name, nsGroupID string, nsGroupMap map[string]*nbdns.Na
func validateNSList(list []nbdns.NameServer) error { func validateNSList(list []nbdns.NameServer) error {
nsListLenght := len(list) nsListLenght := len(list)
if nsListLenght == 0 || nsListLenght > 2 { if nsListLenght == 0 || nsListLenght > 3 {
return status.Errorf(status.InvalidArgument, "the list of nameservers should be 1 or 2, got %d", len(list)) return status.Errorf(status.InvalidArgument, "the list of nameservers should be 1 or 3, got %d", len(list))
} }
return nil return nil
} }

12
management/server/nameserver_test.go
View File

@ -216,7 +216,7 @@ func TestCreateNameServerGroup(t *testing.T) {
shouldCreate: false, shouldCreate: false,
}, },
{ {
name: "Create A NS Group With More Than 2 Nameservers Should Fail", name: "Create A NS Group With More Than 3 Nameservers Should Fail",
inputArgs: input{ inputArgs: input{
name: "super", name: "super",
description: "super", description: "super",
@ -238,6 +238,11 @@ func TestCreateNameServerGroup(t *testing.T) {
NSType: nbdns.UDPNameServerType, NSType: nbdns.UDPNameServerType,
Port: nbdns.DefaultDNSPort, Port: nbdns.DefaultDNSPort,
}, },
{
IP: netip.MustParseAddr("1.1.4.4"),
NSType: nbdns.UDPNameServerType,
Port: nbdns.DefaultDNSPort,
},
}, },
enabled: true, enabled: true,
}, },
@ -457,6 +462,11 @@ func TestSaveNameServerGroup(t *testing.T) {
NSType: nbdns.UDPNameServerType, NSType: nbdns.UDPNameServerType,
Port: nbdns.DefaultDNSPort, Port: nbdns.DefaultDNSPort,
}, },
{
IP: netip.MustParseAddr("1.1.4.4"),
NSType: nbdns.UDPNameServerType,
Port: nbdns.DefaultDNSPort,
},
} }
invalidID := "doesntExist" invalidID := "doesntExist"
validName := "12345678901234567890qw" validName := "12345678901234567890qw"