undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

connect.c: ignore extra colon after hostname

Browse Source 
Ignore an extra ':' at the end of the hostname in URL's like
"ssh://example.com:/path/to/repo"

The colon is meant to separate a port number from the hostname.
If the port is empty, the colon should be ignored, see RFC 3986.

It had been working for URLs with ssh:// scheme, but was unintentionally
broken in 86ceb3, "allow ssh://user@[2001:db8::1]/repo.git"

Reported-by: Reid Woodbury Jr. <reidw@rawsound.com>
Signed-off-by: Torsten Bögershausen <tboegi@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Torsten Bögershausen 2015-04-07 22:03:25 +02:00 committed by Junio C Hamano
parent 3f55ccab8e
commit 6b6c5f7a2f
3 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
connect.c
View File

@ -311,6 +311,8 @@ static void get_host_and_port(char **host, const char **port)
if (end != colon + 1 && *end == '\0' && 0 <= portnr && portnr < 65536) { if (end != colon + 1 && *end == '\0' && 0 <= portnr && portnr < 65536) {
*colon = 0; *colon = 0;
*port = colon + 1; *port = colon + 1;
} else if (!colon[1]) {
*colon = 0;
} }
} }
} }

7
t/t5500-fetch-pack.sh
View File

@ -576,14 +576,17 @@ do
do do
for h in host user@host user@[::1] user@::1 for h in host user@host user@[::1] user@::1
do do
test_expect_success "fetch-pack --diag-url $p://$h/$r" ' for c in "" :
do
test_expect_success "fetch-pack --diag-url $p://$h$c/$r" '
check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r" check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
' '
# "/~" -> "~" conversion # "/~" -> "~" conversion
test_expect_success "fetch-pack --diag-url $p://$h/~$r" ' test_expect_success "fetch-pack --diag-url $p://$h$c/~$r" '
check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r" check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
' '
done done
done
for h in host User@host User@[::1] for h in host User@host User@[::1]
do do
test_expect_success "fetch-pack --diag-url $p://$h:22/$r" ' test_expect_success "fetch-pack --diag-url $p://$h:22/$r" '

17
t/t5601-clone.sh
View File

@ -387,14 +387,17 @@ do
done done
#with ssh:// scheme #with ssh:// scheme
test_expect_success 'clone ssh://host.xz/home/user/repo' ' #ignore trailing colon
test_clone_url "ssh://host.xz/home/user/repo" host.xz "/home/user/repo" for tcol in "" :
do
test_expect_success "clone ssh://host.xz$tcol/home/user/repo" '
test_clone_url "ssh://host.xz$tcol/home/user/repo" host.xz /home/user/repo
' '
# from home directory # from home directory
test_expect_success 'clone ssh://host.xz/~repo' ' test_expect_success "clone ssh://host.xz$tcol/~repo" '
test_clone_url "ssh://host.xz/~repo" host.xz "~repo" test_clone_url "ssh://host.xz$tcol/~repo" host.xz "~repo"
' '
done
# with port number # with port number
test_expect_success 'clone ssh://host.xz:22/home/user/repo' ' test_expect_success 'clone ssh://host.xz:22/home/user/repo' '
@ -407,9 +410,9 @@ test_expect_success 'clone ssh://host.xz:22/~repo' '
' '
#IPv6 #IPv6
for tuah in ::1 [::1] user@::1 user@[::1] [user@::1] for tuah in ::1 [::1] [::1]: user@::1 user@[::1] user@[::1]: [user@::1] [user@::1]:
do do
ehost=$(echo $tuah | tr -d "[]") ehost=$(echo $tuah | sed -e "s/1]:/1]/ "| tr -d "[]")
test_expect_success "clone ssh://$tuah/home/user/repo" " test_expect_success "clone ssh://$tuah/home/user/repo" "
test_clone_url ssh://$tuah/home/user/repo $ehost /home/user/repo test_clone_url ssh://$tuah/home/user/repo $ehost /home/user/repo
" "