Martchus
/
syncthing
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lib/connections: Correctly fixup port in IPv6 listen URLs (#6786) 

Previously tcp://[fe80::1] would get "fixed" to tcp://[[fe80::1]]:22000
which is not great.
This commit is contained in:
Jakob Borg 2020-06-22 17:47:15 +02:00 committed by GitHub
parent cbaef624cf
commit b62b7d269e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/connections/connections_test.go
View File

@ -21,10 +21,21 @@ func TestFixupPort(t *testing.T) {
{"tcp://1.2.3.4:5", "tcp://1.2.3.4:5"},
{"tcp://1.2.3.4:", "tcp://1.2.3.4:22000"},
{"tcp://1.2.3.4", "tcp://1.2.3.4:22000"},
{"tcp://[fe80::1]", "tcp://[fe80::1]:22000"},
{"tcp://[fe80::1]:", "tcp://[fe80::1]:22000"},
{"tcp://[fe80::1]:22000", "tcp://[fe80::1]:22000"},
{"tcp://[fe80::1]:22000", "tcp://[fe80::1]:22000"},
{"tcp://[fe80::1%25abc]", "tcp://[fe80::1%25abc]:22000"},
{"tcp://[fe80::1%25abc]:", "tcp://[fe80::1%25abc]:22000"},
{"tcp://[fe80::1%25abc]:22000", "tcp://[fe80::1%25abc]:22000"},
{"tcp://[fe80::1%25abc]:22000", "tcp://[fe80::1%25abc]:22000"},
}
for _, tc := range cases {
u0, _ := url.Parse(tc[0])
u0, err := url.Parse(tc[0])
if err != nil {
t.Fatal(err)
}
u1 := fixupPort(u0, 22000).String()
if u1 != tc[1] {
t.Errorf("fixupPort(%q, 22000) => %q, expected %q", tc[0], u1, tc[1])

11
lib/connections/util.go
View File

@ -18,10 +18,15 @@ func fixupPort(uri *url.URL, defaultPort int) *url.URL {
host, port, err := net.SplitHostPort(uri.Host)
if err != nil && strings.Contains(err.Error(), "missing port") {
// addr is on the form "1.2.3.4"
copyURI.Host = net.JoinHostPort(uri.Host, strconv.Itoa(defaultPort))
// addr is on the form "1.2.3.4" or "[fe80::1]"
host = uri.Host
if strings.HasPrefix(host, "[") && strings.HasSuffix(host, "]") {
// net.JoinHostPort will add the brackets again
host = host[1 : len(host)-1]
}
copyURI.Host = net.JoinHostPort(host, strconv.Itoa(defaultPort))
} else if err == nil && port == "" {
// addr is on the form "1.2.3.4:"
// addr is on the form "1.2.3.4:" or "[fe80::1]:"
copyURI.Host = net.JoinHostPort(host, strconv.Itoa(defaultPort))
}