Merge pull request #5925 from Jacalz/uri-parse-ipv6-support

Add support for IPv6 addresses in ParseURI

Author: Jacalz

storage/repository/parse.go

@@ -81,22 +81,33 @@ func ParseURI(s string) (fyne.URI, error) {
 		return nil, err
 	}
 
-	authority := ""
+	authority := l.Authority()
+	authBuilder := strings.Builder{}
+	authBuilder.Grow(len(authority.UserInfo()) + len(authority.Host()) + len(authority.Port()) + len("@[]:"))
 
-	if userInfo := l.Authority().UserInfo(); len(userInfo) > 0 {
-		authority += userInfo + "@"
+	if userInfo := authority.UserInfo(); userInfo != "" {
+		authBuilder.WriteString(userInfo)
+		authBuilder.WriteByte('@')
 	}
 
-	authority += l.Authority().Host()
+	// Per RFC 3986, section 3.2.2, IPv6 addresses must be enclosed in square brackets.
+	if host := authority.Host(); strings.Contains(host, ":") {
+		authBuilder.WriteByte('[')
+		authBuilder.WriteString(host)
+		authBuilder.WriteByte(']')
+	} else {
+		authBuilder.WriteString(host)
+	}
 
-	if port := l.Authority().Port(); len(port) > 0 {
-		authority += ":" + port
+	if port := authority.Port(); port != "" {
+		authBuilder.WriteByte(':')
+		authBuilder.WriteString(port)
 	}
 
 	return &uri{
 		scheme:    scheme,
-		authority: authority,
-		path:      l.Authority().Path(),
+		authority: authBuilder.String(),
+		path:      authority.Path(),
 		query:     l.Query().Encode(),
 		fragment:  l.Fragment(),
 	}, nil

storage/repository/parse_test.go

@@ -23,6 +23,16 @@ func TestParseURI(t *testing.T) {
 	uri, err = ParseURI("file://C:/tmp/foo.txt")
 	assert.NoError(t, err)
 	assert.Equal(t, "file://C:/tmp/foo.txt", uri.String())
+
+	IPv6url := "http://[2001:db8:4006:812::200e]:8080/path/page.html"
+	uri, err = ParseURI(IPv6url)
+	assert.NoError(t, err)
+	assert.Equal(t, IPv6url, uri.String())
+
+	IPv6url = "http://[2001:db8:4006:812::200e]/path/page.html"
+	uri, err = ParseURI(IPv6url)
+	assert.NoError(t, err)
+	assert.Equal(t, IPv6url, uri.String())
 }
 
 func TestParseInvalidURI(t *testing.T) {