mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-12-18 04:51:45 +03:00
5f61b550fa
Merge in DNS/adguard-home from upd-golibs to master
Squashed commit of the following:
commit 266b002c5450329761dee21d918c80d08e5d8ab9
Merge: 99eb7745d e305bd8e4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 5 14:21:51 2023 +0300
Merge branch 'master' into upd-golibs
commit 99eb7745d0bee190399f9b16cb7151f34a591b54
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 5 14:14:28 2023 +0300
home: imp alignment
commit 556cde56720ce449aec17b500825681fc8c084bf
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 5 13:35:35 2023 +0300
dnsforward: imp naming, docs
commit 1ee99655a3318263db1edbcb9e4eeb33bfe441c8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 5 13:28:39 2023 +0300
home: make ports uint16
commit b228032ea1f5902ab9bac7b5d55d84aaf6354616
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 4 18:56:59 2023 +0300
all: rm system resolvers
commit 4b5becbed5890db80612e53861f000aaf4c869ff
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 4 17:30:16 2023 +0300
all: upd golibs
95 lines
2.3 KiB
Go
95 lines
2.3 KiB
Go
package aghnet_test
|
|
|
|
import (
|
|
"io/fs"
|
|
"net"
|
|
"net/netip"
|
|
"net/url"
|
|
"os"
|
|
"testing"
|
|
|
|
"github.com/AdguardTeam/AdGuardHome/internal/aghnet"
|
|
"github.com/AdguardTeam/golibs/netutil"
|
|
"github.com/AdguardTeam/golibs/testutil"
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
func TestMain(m *testing.M) {
|
|
testutil.DiscardLogOutput(m)
|
|
}
|
|
|
|
// testdata is the filesystem containing data for testing the package.
|
|
var testdata fs.FS = os.DirFS("./testdata")
|
|
|
|
func TestParseAddrPort(t *testing.T) {
|
|
const defaultPort = 1
|
|
|
|
v4addr := netip.MustParseAddr("1.2.3.4")
|
|
|
|
testCases := []struct {
|
|
name string
|
|
input string
|
|
wantErrMsg string
|
|
want netip.AddrPort
|
|
}{{
|
|
name: "success_ip",
|
|
input: v4addr.String(),
|
|
wantErrMsg: "",
|
|
want: netip.AddrPortFrom(v4addr, defaultPort),
|
|
}, {
|
|
name: "success_ip_port",
|
|
input: netutil.JoinHostPort(v4addr.String(), 5),
|
|
wantErrMsg: "",
|
|
want: netip.AddrPortFrom(v4addr, 5),
|
|
}, {
|
|
name: "success_url",
|
|
input: (&url.URL{
|
|
Scheme: "tcp",
|
|
Host: v4addr.String(),
|
|
}).String(),
|
|
wantErrMsg: "",
|
|
want: netip.AddrPortFrom(v4addr, defaultPort),
|
|
}, {
|
|
name: "success_url_port",
|
|
input: (&url.URL{
|
|
Scheme: "tcp",
|
|
Host: netutil.JoinHostPort(v4addr.String(), 5),
|
|
}).String(),
|
|
wantErrMsg: "",
|
|
want: netip.AddrPortFrom(v4addr, 5),
|
|
}, {
|
|
name: "error_invalid_ip",
|
|
input: "256.256.256.256",
|
|
wantErrMsg: `not an ip:port
|
|
ParseAddr("256.256.256.256"): IPv4 field has value >255`,
|
|
want: netip.AddrPort{},
|
|
}, {
|
|
name: "error_invalid_port",
|
|
input: net.JoinHostPort(v4addr.String(), "-5"),
|
|
wantErrMsg: `invalid port "-5" parsing "1.2.3.4:-5"
|
|
ParseAddr("1.2.3.4:-5"): unexpected character (at ":-5")`,
|
|
want: netip.AddrPort{},
|
|
}, {
|
|
name: "error_invalid_url",
|
|
input: "tcp:://1.2.3.4",
|
|
wantErrMsg: `invalid port "//1.2.3.4" parsing "tcp:://1.2.3.4"
|
|
ParseAddr("tcp:://1.2.3.4"): each colon-separated field must have at least ` +
|
|
`one digit (at "tcp:://1.2.3.4")`,
|
|
want: netip.AddrPort{},
|
|
}, {
|
|
name: "empty",
|
|
input: "",
|
|
want: netip.AddrPort{},
|
|
wantErrMsg: `not an ip:port
|
|
ParseAddr(""): unable to parse IP`,
|
|
}}
|
|
|
|
for _, tc := range testCases {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
ap, err := aghnet.ParseAddrPort(tc.input, defaultPort)
|
|
testutil.AssertErrorMsg(t, tc.wantErrMsg, err)
|
|
|
|
assert.Equal(t, tc.want, ap)
|
|
})
|
|
}
|
|
}
|