Skip to content

Commit e95d1a1

Browse files
peffdscho
authored andcommitted
connect: reject dashed arguments for proxy commands
If you have a GIT_PROXY_COMMAND configured, we will run it with the host/port on the command-line. If a URL contains a mischievous host like "--foo", we don't know how the proxy command may handle it. It's likely to break, but it may also do something dangerous and unwanted (technically it could even do something useful, but that seems unlikely). We should err on the side of caution and reject this before we even run the command. The hostname check matches the one we do in a similar circumstance for ssh. The port check is not present for ssh, but there it's not necessary because the syntax is "-p <port>", and there's no ambiguity on the parsing side. It's not clear whether you can actually get a negative port to the proxy here or not. Doing: git fetch git://remote:-1234/repo.git keeps the "-1234" as part of the hostname, with the default port of 9418. But it's a good idea to keep this check close to the point of running the command to make it clear that there's no way to circumvent it (and at worst it serves as a belt-and-suspenders check). Signed-off-by: Jeff King <[email protected]> Reviewed-by: Jonathan Nieder <[email protected]> Signed-off-by: Junio C Hamano <[email protected]> Signed-off-by: Johannes Schindelin <[email protected]>
1 parent bb61c17 commit e95d1a1

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

connect.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -577,6 +577,11 @@ static struct child_process *git_proxy_connect(int fd[2], char *host)
577577

578578
get_host_and_port(&host, &port);
579579

580+
if (looks_like_command_line_option(host))
581+
die("strange hostname '%s' blocked", host);
582+
if (looks_like_command_line_option(port))
583+
die("strange port '%s' blocked", port);
584+
580585
proxy = xmalloc(sizeof(*proxy));
581586
child_process_init(proxy);
582587
argv_array_push(&proxy->args, git_proxy_command);

t/t5532-fetch-proxy.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,9 @@ test_expect_success 'fetch through proxy works' '
4343
test_cmp expect actual
4444
'
4545

46+
test_expect_success 'funny hostnames are rejected before running proxy' '
47+
test_must_fail git fetch git://-remote/repo.git 2>stderr &&
48+
! grep "proxying for" stderr
49+
'
50+
4651
test_done

0 commit comments

Comments
 (0)