aboutsummaryrefslogtreecommitdiffstats
path: root/exec-cmd.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2021-01-07 04:43:58 -0500
committerJunio C Hamano <gitster@pobox.com>2021-01-07 14:25:44 -0800
commita02ea577174ab8ed18f847cf1693f213e0b9c473 (patch)
tree25b72991f84367ef06dd89cc38dad171b372b010 /exec-cmd.c
parentGit 2.20.4 (diff)
downloadgit-a02ea577174ab8ed18f847cf1693f213e0b9c473.tar.gz
git-a02ea577174ab8ed18f847cf1693f213e0b9c473.zip
git_connect_git(): forbid newlines in host and path
When we connect to a git:// server, we send an initial request that looks something like: 002dgit-upload-pack repo.git\0host=example.com If the repo path contains a newline, then it's included literally, and we get: 002egit-upload-pack repo .git\0host=example.com This works fine if you really do have a newline in your repository name; the server side uses the pktline framing to parse the string, not newlines. However, there are many _other_ protocols in the wild that do parse on newlines, such as HTTP. So a carefully constructed git:// URL can actually turn into a valid HTTP request. For example: git://localhost:1234/%0d%0a%0d%0aGET%20/%20HTTP/1.1 %0d%0aHost:localhost%0d%0a%0d%0a becomes: 0050git-upload-pack / GET / HTTP/1.1 Host:localhost host=localhost:1234 on the wire. Again, this isn't a problem for a real Git server, but it does mean that feeding a malicious URL to Git (e.g., through a submodule) can cause it to make unexpected cross-protocol requests. Since repository names with newlines are presumably quite rare (and indeed, we already disallow them in git-over-http), let's just disallow them over this protocol. Hostnames could likewise inject a newline, but this is unlikely a problem in practice; we'd try resolving the hostname with a newline in it, which wouldn't work. Still, it doesn't hurt to err on the side of caution there, since we would not expect them to work in the first place. The ssh and local code paths are unaffected by this patch. In both cases we're trying to run upload-pack via a shell, and will quote the newline so that it makes it intact. An attacker can point an ssh url at an arbitrary port, of course, but unless there's an actual ssh server there, we'd never get as far as sending our shell command anyway. We _could_ similarly restrict newlines in those protocols out of caution, but there seems little benefit to doing so. The new test here is run alongside the git-daemon tests, which cover the same protocol, but it shouldn't actually contact the daemon at all. In theory we could make the test more robust by setting up an actual repository with a newline in it (so that our clone would succeed if our new check didn't kick in). But a repo directory with newline in it is likely not portable across all filesystems. Likewise, we could check git-daemon's log that it was not contacted at all, but we do not currently record the log (and anyway, it would make the test racy with the daemon's log write). We'll just check the client-side stderr to make sure we hit the expected code path. Reported-by: Harold Kim <h.kim@flatt.tech> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'exec-cmd.c')
0 files changed, 0 insertions, 0 deletions
ss='deletions'>-2/+0 2021-12-03clk: qcom: Add support for SDX65 RPMh clocksVamsi krishna Lanka1-0/+25 2021-12-03dt-bindings: clock: Introduce RPMHCC bindings for SDX65Vamsi krishna Lanka1-0/+1 2021-12-02MAINTAINERS: Add entry for Qualcomm clock driversBjorn Andersson1-0/+9 2021-11-14Linux 5.16-rc1v5.16-rc1Linus Torvalds1-2/+2 2021-11-14kconfig: Add support for -Wimplicit-fallthroughGustavo A. R. Silva2-5/+6 2021-11-13perf tests: Remove bash constructs from stat_all_pmu.shJames Clark1-2/+2 2021-11-13perf tests: Remove bash construct from record+zstd_comp_decomp.shJames Clark1-1/+1 2021-11-13perf test: Remove bash construct from stat_bpf_counters.sh testJames Clark1-1/+1 2021-11-13perf bench futex: Fix memory leak of perf_cpu_map__new()Sohaib Mohamed4-0/+4 2021-11-13tools arch x86: Sync the msr-index.h copy with the kernel sourcesArnaldo Carvalho de Melo1-0/+2 2021-11-13tools headers UAPI: Sync drm/i915_drm.h with the kernel sourcesArnaldo Carvalho de Melo1-1/+241 2021-11-13tools headers UAPI: Sync sound/asound.h with the kernel sourcesArnaldo Carvalho de Melo1-1/+1 2021-11-13tools headers UAPI: Sync linux/prctl.h with the kernel sourcesArnaldo Carvalho de Melo1-0/+3 2021-11-13tools headers UAPI: Sync arch prctl headers with the kernel sourcesArnaldo Carvalho de Melo1-0/+4 2021-11-13perf tools: Add more weak libbpf functionsJiri Olsa1-0/+27 2021-11-13perf bpf: Avoid memory leak from perf_env__insert_btf()Ian Rogers3-3/+10 2021-11-13perf symbols: Factor out annotation init/exitIan Rogers3-1/+22 2021-11-13perf symbols: Bit pack to save a byteIan Rogers2-3/+3 2021-11-13perf symbols: Add documentation to 'struct symbol'Ian Rogers1-3/+14 2021-11-13tools headers UAPI: Sync files changed by new futex_waitv syscallArnaldo Carvalho de Melo2-1/+5 2021-11-13perf test bpf: Use ARRAY_CHECK() instead of ad-hoc equivalent, addressing arr...Guo Zhengkui1-1/+1 2021-11-13perf arm-spe: Support hardware-based PID tracingGerman Gomez1-29/+70 2021-11-13perf arm-spe: Save context ID in recordGerman Gomez2-0/+3 2021-11-13perf arm-spe: Update --switch-events docs in 'perf record'German Gomez2-2/+4 2021-11-13perf arm-spe: Track task context switch for cpu-mode eventsNamhyung Kim2-1/+30