Re: [PATCH 1/3] connect: treat generic proxy processes like ssh processes
- From
Jeff King <peff@peff.net>
- Date
- May 18, 2011, 08:57 UTC
- Message-ID
- <20110518085743.GH27482@sigill.intra.peff.net>
- In-Reply-To
- <4DD2D733.3070004@kdbg.org>
On Tue, May 17, 2011 at 10:14:43PM +0200, Johannes Sixt wrote:
Show 7 quoted lines
> Am 17.05.2011 07:54, schrieb Jeff King: > > On Mon, May 16, 2011 at 09:57:58PM +0200, Johannes Sixt wrote: > >> In my implementation, I xmalloced the pointer array and leaked it. > > I noticed that it actually isn't leaked because finish_connect() frees > it. For this reason, I actually have to wonder why your version that > stored a pointer to automatic storage in ->argv worked.
It probably didn't. As a simple refactoring, I didn't test the proxy codepath, and apparently nothing in our test suite does, either. :(
We can put the patch below on top (it fails with my original series, but passes with the bugfix you noticed).
Show 5 quoted lines
> I would not worry too much today. Of course, functions other than > start_command() might begin to access ->argv[i] with i > 0 later, but > then we have to audit all users of struct child_process anyway. > Currently, only start_command() uses these values, which is always > called at a time when they are still valid.
That makes sense.
-- >8 -- Subject: [PATCH] test core.gitproxy configuration
This is just a basic sanity test to see whether core.gitproxy works at all. Until now, we were not testing anywhere.
Signed-off-by: Jeff King <peff@peff.net> --- This is really basic. Apparently you can do horrible things like
git config core.gitproxy "./proxy for kernel.org" git config core.gitproxy "./other-proxy for example.com"
I can make it more elaborate if we really want to care.
t/t5532-fetch-proxy.sh | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 42 insertions(+), 0 deletions(-) create mode 100755 t/t5532-fetch-proxy.sh
diff --git a/t/t5532-fetch-proxy.sh b/t/t5532-fetch-proxy.sh new file mode 100755 index 0000000..07119d9 --- /dev/null +++ b/t/t5532-fetch-proxy.sh @@ -0,0 +1,42 @@ +#!/bin/sh + +test_description='fetching via git:// using core.gitproxy' +. ./test-lib.sh + +test_expect_success 'setup remote repo' ' + git init remote && + (cd remote && + echo content >file && + git add file && + git commit -m one + ) +' + +cat >proxy <<'EOF' +#!/bin/sh +echo >&2 "proxying for $*" +cmd=`perl -e ' + read(STDIN, $buf, 4); + my $n = hex($buf) - 4; + read(STDIN, $buf, $n); + my ($cmd, $other) = split /\0/, $buf; + # drop absolute-path on repo name + $cmd =~ s{ /}{ }; + print $cmd; +'` +exec $cmd +EOF +chmod +x proxy +test_expect_success 'setup local repo' ' + git remote add fake git://example.com/remote && + git config core.gitproxy ./proxy +' + +test_expect_success 'fetch through proxy works' ' + git fetch fake && + echo one >expect && + git log -1 --format=%s FETCH_HEAD >actual && + test_cmp expect actual +' + +test_done
-- 1.7.5.8.ga95ab