qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-15 08:20:30 -07:00
Code Releases Activity

[release-branch.go1] net/url: better parsing of urls with @ symbol in authority

Browse Source 
««« backport 89a9ef95c8db
net/url: better parsing of urls with @ symbol in authority

Fixes #3439

R=r, rsc, dsymonds, n13m3y3r
CC=golang-dev
https://golang.org/cl/6206090

»»»
This commit is contained in:
Alexey Borzenkov 2012-06-13 16:24:05 -04:00 committed by Russ Cox
parent aea18fe74b
commit 603ace6f8a
2 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/pkg/net/url/url.go
View File

@ -401,11 +401,12 @@ Error:
}
func parseAuthority(authority string) (user *Userinfo, host string, err error) {
if strings.Index(authority, "@") < 0 {
i := strings.LastIndex(authority, "@")
if i < 0 {
host = authority
return
}
userinfo, host := split(authority, '@', true)
userinfo, host := authority[:i], authority[i+1:]
if strings.Index(userinfo, ":") < 0 {
if userinfo, err = unescape(userinfo, encodeUserPassword); err != nil {
return

31
src/pkg/net/url/url_test.go
View File

@ -188,6 +188,37 @@ var urltests = []URLTest{
},
"http://user:password@google.com",
},
// unescaped @ in username should not confuse host
{
"http://j@ne:password@google.com",
&URL{
Scheme: "http",
User: UserPassword("j@ne", "password"),
Host: "google.com",
},
"http://j%40ne:password@google.com",
},
// unescaped @ in password should not confuse host
{
"http://jane:p@ssword@google.com",
&URL{
Scheme: "http",
User: UserPassword("jane", "p@ssword"),
Host: "google.com",
},
"http://jane:p%40ssword@google.com",
},
{
"http://j@ne:password@google.com/p@th?q=@go",
&URL{
Scheme: "http",
User: UserPassword("j@ne", "password"),
Host: "google.com",
Path: "/p@th",
RawQuery: "q=@go",
},
"http://j%40ne:password@google.com/p@th?q=@go",
},
{
"http://www.google.com/?q=go+language#foo",
&URL{