Skip to main content

Browse the archive

Revision 820d7650cc670d3e4195aad3a5343158c316e8fa authored by Junio C Hamano on 26 July 2017, 17:24:20 UTC, committed by Junio C Hamano on 28 July 2017, 22:51:14 UTC 
connect: reject ssh hostname that begins with a dash
 
When commands like "git fetch" talk with ssh://$rest_of_URL/, the
code splits $rest_of_URL into components like host, port, etc., and
then spawns the underlying "ssh" program by formulating argv[] array
that has:

 - the path to ssh command taken from GIT_SSH_COMMAND, etc.

 - dashed options like '-batch' (for Tortoise), '-p <port>' as
   needed.

 - ssh_host, which is supposed to be the hostname parsed out of
   $rest_of_URL.

 - then the command to be run on the other side, e.g. git
   upload-pack.

If the ssh_host ends up getting '-<anything>', the argv[] that is
used to spawn the command becomes something like:

    { "ssh", "-p", "22", "-<anything>", "command", "to", "run", NULL }

which obviously is bogus, but depending on the actual value of
"<anything>", will make "ssh" parse and use it as an option.

Prevent this by forbidding ssh_host that begins with a "-".

Noticed-by: Joern Schneeweisz of Recurity Labs
Reported-by: Brian at GitLab
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Reviewed-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent c8dd1e3
Raw File
t3002-ls-files-dashpath.sh 
#!/bin/sh
#
# Copyright (c) 2005 Junio C Hamano
#

test_description='git ls-files test (-- to terminate the path list).

This test runs git ls-files --others with the following on the
filesystem.

    path0       - a file
    -foo	- a file with a funny name.
    --		- another file with a funny name.
'
. ./test-lib.sh

test_expect_success \
	setup \
	'echo frotz >path0 &&
	echo frotz >./-foo &&
	echo frotz >./--'

test_expect_success \
    'git ls-files without path restriction.' \
    'git ls-files --others >output &&
     test_cmp output - <<EOF
--
-foo
output
path0
EOF
'

test_expect_success \
    'git ls-files with path restriction.' \
    'git ls-files --others path0 >output &&
	test_cmp output - <<EOF
path0
EOF
'

test_expect_success \
    'git ls-files with path restriction with --.' \
    'git ls-files --others -- path0 >output &&
	test_cmp output - <<EOF
path0
EOF
'

test_expect_success \
    'git ls-files with path restriction with -- --.' \
    'git ls-files --others -- -- >output &&
	test_cmp output - <<EOF
--
EOF
'

test_expect_success \
    'git ls-files with no path restriction.' \
    'git ls-files --others -- >output &&
	test_cmp output - <<EOF
--
-foo
output
path0
EOF
'

test_done
back to top