felixfoertsch/syncthing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 10 Wiki Activity

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

Browse Source 
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 16:47:15 +01:00
committed by GitHub
parent cbaef624cf
commit b62b7d269e
2 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/connections/connections_test.go
+12 -1
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])