Git 2.5.6

Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'maint-2.4' into maint-2.5
2017-05-05 12:50:38 +09:00 · 2017-05-05 12:46:53 +09:00 · 2017-05-05 12:43:16 +09:00 · 2017-05-05 12:17:55 +09:00 · 2017-05-05 12:07:27 +09:00
6 changed files with 31 additions and 5 deletions
--- a/Documentation/RelNotes/2.4.12.txt
+++ b/Documentation/RelNotes/2.4.12.txt
@ -0,0 +1,12 @@
 Git v2.4.12 Release Notes
 =========================
 Fixes since v2.4.11
 -------------------
 * "git-shell" rejects a request to serve a repository whose name
   begins with a dash, which makes it no longer possible to get it
   confused into spawning service programs like "git-upload-pack" with
   an option like "--help", which in turn would spawn an interactive
   pager, instead of working with the repository user asked to access
   (i.e. the one whose name is "--help").
--- a/Documentation/RelNotes/2.5.6.txt
+++ b/Documentation/RelNotes/2.5.6.txt
@ -0,0 +1,12 @@
 Git v2.5.6 Release Notes
 ========================
 Fixes since v2.5.5
 ------------------
 * "git-shell" rejects a request to serve a repository whose name
   begins with a dash, which makes it no longer possible to get it
   confused into spawning service programs like "git-upload-pack" with
   an option like "--help", which in turn would spawn an interactive
   pager, instead of working with the repository user asked to access
   (i.e. the one whose name is "--help").
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@ -43,9 +43,10 @@ unreleased) version of Git, that is available from the 'master'
 branch of the `git.git` repository.
 Documentation for older releases are available here:
-* link:v2.5.5/git.html[documentation for release 2.5.5]
+* link:v2.5.6/git.html[documentation for release 2.5.6]
 * release notes for
  link:RelNotes/2.5.6.txt[2.5.6],
  link:RelNotes/2.5.5.txt[2.5.5],
  link:RelNotes/2.5.4.txt[2.5.4],
  link:RelNotes/2.5.3.txt[2.5.3],
@ -53,9 +54,10 @@ Documentation for older releases are available here:
  link:RelNotes/2.5.1.txt[2.5.1],
  link:RelNotes/2.5.0.txt[2.5].
-* link:v2.4.11/git.html[documentation for release 2.4.11]
+* link:v2.4.12/git.html[documentation for release 2.4.12]
 * release notes for
  link:RelNotes/2.4.12.txt[2.4.12],
  link:RelNotes/2.4.11.txt[2.4.11],
  link:RelNotes/2.4.10.txt[2.4.10],
  link:RelNotes/2.4.9.txt[2.4.9],
--- a/2
+++ b/2
@ -1,7 +1,7 @@
 #!/bin/sh
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.5.5
+DEF_VER=v2.5.6
 LF='
 '
--- a/2
+++ b/2
@ -1 +1 @@
-Documentation/RelNotes/2.5.5.txt
+Documentation/RelNotes/2.5.6.txt
--- a/shell.c
+++ b/shell.c
@ -13,7 +13,7 @@ static int do_generic_cmd(const char *me, char *arg)
 	const char *my_argv[4];
 	setup_path();
-	if (!arg || !(arg = sq_dequote(arg)))
+	if (!arg || !(arg = sq_dequote(arg)) || *arg == '-')
 		die("bad argument");
 	if (!starts_with(me, "git-"))
 		die("bad command");
Author	SHA1	Message	Date
Junio C Hamano	ac33201285	Git 2.5.6 Signed-off-by: Junio C Hamano <gitster@pobox.com>	2017-05-05 12:50:38 +09:00
Junio C Hamano	531788af95	Merge branch 'maint-2.4' into maint-2.5	2017-05-05 12:46:53 +09:00
Junio C Hamano	4000b40209	Git 2.4.12 Signed-off-by: Junio C Hamano <gitster@pobox.com>	2017-05-05 12:43:16 +09:00
Junio C Hamano	5a4ffdf587	Merge branch 'jk/shell-no-repository-that-begins-with-dash' into maint-2.4 * jk/shell-no-repository-that-begins-with-dash: shell: disallow repo names beginning with dash	2017-05-05 12:17:55 +09:00
Jeff King	3ec804490a	shell: disallow repo names beginning with dash When a remote server uses git-shell, the client side will connect to it like: ssh server "git-upload-pack 'foo.git'" and we literally exec ("git-upload-pack", "foo.git"). In early versions of upload-pack and receive-pack, we took a repository argument and nothing else. But over time they learned to accept dashed options. If the user passes a repository name that starts with a dash, the results are confusing at best (we complain of a bogus option instead of a non-existent repository) and malicious at worst (the user can start an interactive pager via "--help"). We could pass "--" to the sub-process to make sure the user's argument is interpreted as a branch name. I.e.: git-upload-pack -- -foo.git But adding "--" automatically would make us inconsistent with a normal shell (i.e., when git-shell is not in use), where "-foo.git" would still be an error. For that case, the client would have to specify the "--", but they can't do so reliably, as existing versions of git-shell do not allow more than a single argument. The simplest thing is to simply disallow "-" at the start of the repo name argument. This hasn't worked either with or without git-shell since version 1.0.0, and nobody has complained. Note that this patch just applies to do_generic_cmd(), which runs upload-pack, receive-pack, and upload-archive. There are two other types of commands that git-shell runs: - do_cvs_cmd(), but this already restricts the argument to be the literal string "server" - admin-provided commands in the git-shell-commands directory. We'll pass along arbitrary arguments there, so these commands could have similar problems. But these commands might actually understand dashed arguments, so we cannot just block them here. It's up to the writer of the commands to make sure they are safe. With great power comes great responsibility. Reported-by: Timo Schmid <tschmid@ernw.de> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>	2017-05-05 12:07:27 +09:00
		`@ -1 +1 @@`
			`Documentation/RelNotes/2.5.5.txt`				`Documentation/RelNotes/2.5.6.txt`