From: "Andrzej Hunt via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Jeff King <peff@peff.net>, Taylor Blau <me@ttaylorr.com>,
"brian m . carlson" <sandals@crustytoothpaste.net>,
Andrzej Hunt <andrzej@ahunt.org>,
Andrzej Hunt <andrzej@ahunt.org>
Subject: [PATCH] connect: also update offset for features without values
Date: Sat, 18 Sep 2021 13:14:32 +0000 [thread overview]
Message-ID: <pull.1091.git.git.1631970872884.gitgitgadget@gmail.com> (raw)
From: Andrzej Hunt <andrzej@ahunt.org>
parse_feature_value() does not update offset if the feature being
searched for does not specify a value. A loop that uses
parse_feature_value() to find a feature which was specified without a
value therefore might never exit (such loops will typically use
next_server_feature_value() as opposed to parse_feature_value() itself).
This usually isn't an issue: there's no point in using
next_server_feature_value() to search for repeated instances of the same
capability unless that capability typically specifies a value - but a
broken server could send a response that omits the value for a feature
even when we are expecting a value.
Therefore we add an offset update calculation for the no-value case,
which helps ensure that loops using next_server_feature_value() will
always terminate.
next_server_feature_value(), and the offset calculation, were first
added in 2.28 in:
2c6a403d96 (connect: add function to parse multiple v1 capability values, 2020-05-25)
Thanks to Peff for authoring the test.
Co-authored-by: Jeff King <peff@peff.net>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Andrzej Hunt <andrzej@ahunt.org>
---
connect: also update offset for features without values
This is a small patch to avoid an infinite loop which can occur when a
broken server forgets to include a value when specifying symref in the
capabilities list.
Thanks to Peff for writing the test.
Note: I modified the test by adding and object-format=... to the
injected server response, because the oid that we're using is the
default hash (which will be e.g. sha256 for some CI jobs), but our
protocol handler assumes sha1 unless a different hash has been
explicitly specified. I'm open to alternative suggestions.
ATB,
Andrzej
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1091%2Fahunt%2Fconnectloop-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1091/ahunt/connectloop-v1
Pull-Request: https://github.com/git/git/pull/1091
connect.c | 2 ++
t/t5704-protocol-violations.sh | 13 +++++++++++++
2 files changed, 15 insertions(+)
diff --git a/connect.c b/connect.c
index aff13a270e6..eaf7d6d2618 100644
--- a/connect.c
+++ b/connect.c
@@ -557,6 +557,8 @@ const char *parse_feature_value(const char *feature_list, const char *feature, i
if (!*value || isspace(*value)) {
if (lenp)
*lenp = 0;
+ if (offset)
+ *offset = found + len - feature_list;
return value;
}
/* feature with a value (e.g., "agent=git/1.2.3") */
diff --git a/t/t5704-protocol-violations.sh b/t/t5704-protocol-violations.sh
index 5c941949b98..34538cebf01 100755
--- a/t/t5704-protocol-violations.sh
+++ b/t/t5704-protocol-violations.sh
@@ -32,4 +32,17 @@ test_expect_success 'extra delim packet in v2 fetch args' '
test_i18ngrep "expected flush after fetch arguments" err
'
+test_expect_success 'bogus symref in v0 capabilities' '
+ test_commit foo &&
+ oid=$(git rev-parse HEAD) &&
+ {
+ printf "%s HEAD\0symref object-format=%s\n" "$oid" "$GIT_DEFAULT_HASH" |
+ test-tool pkt-line pack-raw-stdin &&
+ printf "0000"
+ } >input &&
+ git ls-remote --upload-pack="cat input ;:" . >actual &&
+ printf "%s\tHEAD\n" "$oid" >expect &&
+ test_cmp expect actual
+'
+
test_done
base-commit: 186eaaae567db501179c0af0bf89b34cbea02c26
--
gitgitgadget
next reply other threads:[~2021-09-18 13:14 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-18 13:14 Andrzej Hunt via GitGitGadget [this message]
2021-09-18 15:53 ` [PATCH] connect: also update offset for features without values Taylor Blau
2021-09-18 22:05 ` Jeff King
2021-09-18 22:35 ` Taylor Blau
2021-09-19 1:02 ` Eric Sunshine
2021-09-19 2:20 ` Jeff King
2021-09-19 2:53 ` Eric Sunshine
2021-09-19 7:12 ` Junio C Hamano
2021-09-26 15:14 ` Andrzej Hunt
2021-09-18 17:18 ` brian m. carlson
2021-09-23 21:20 ` Junio C Hamano
2021-09-23 21:38 ` Jeff King
2021-09-23 21:52 ` Junio C Hamano
2021-09-23 22:02 ` Jeff King
2021-09-26 15:16 ` Andrzej Hunt
2021-09-26 15:58 ` [PATCH v2] " Andrzej Hunt via GitGitGadget
2021-09-27 19:47 ` Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=pull.1091.git.git.1631970872884.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=andrzej@ahunt.org \
--cc=git@vger.kernel.org \
--cc=me@ttaylorr.com \
--cc=peff@peff.net \
--cc=sandals@crustytoothpaste.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).