[PATCH] bundle-uri: drain remaining response on invalid bundle-uri lines
- From
Toon Claes <toon@iotcl.com>
- Date
- Apr 8, 2026, 08:58 UTC
- Message-ID
- <20260408-toon-bundle-uri-no-uri-v1-1-d4a0e3937eba@iotcl.com>
On clone, when the client sends the `bundle-uri` command, the server might respond with invalid data. For example if it sends information about a bundle where the 'uri' is empty, it produces the following error:
Cloning into 'foo'...
error: bundle-uri: line has empty key or value
error: error on bundle-uri response line 4: bundle.bundle-1.uri=
error: could not retrieve server-advertised bundle-uri listThis error is bubbled up to `transport_get_remote_bundle_uri()`, which is called by `cmd_clone()` in builtin/clone.c. Over here, the return value of is ignored, so clone continues.
Despite this, it still dies with this error:
fatal: expected 'packfile'
This happens because `get_remote_bundle_uri()` exited early, leaving some unprocessed packet data behind in the read buffer. This is misleading to the user, because it suggests a problem with the packfile exchange, when in reality it's caused by a misconfigured bundle-URI on the server-side.
Fix this by continuing to read packets when an error was encountered, but without processing the remaining lines. This drains the protocol stream so no stale data is left behind and the caller can use it if they like.
With this, clone now continues successfully if invalid bundle-URI data was sent by the server. This is intentional, because since the inception of `transport_get_remote_bundle_uri()` in 0cfde740f0 (clone: request the 'bundle-uri' command when available, 2022-12-22) the return value of that function is ignored in `cmd_clone()` so the clone can continue without bundles.
Signed-off-by: Toon Claes <toon@iotcl.com> --- This patch is a leftover from [1]. In that series I've submitted two patches. Because that series was submitted a long time ago, I'm submitting this as a new series.
The first patch is in meantime superseded by [2], and thus is dropped from this series.
The second patch fixes a misleading "fatal: expected 'packfile'" error that occurs when cloning over HTTP from a server with misconfigured bundle-URIs. It is modified to address Junio's concerns[3]:
> I tend to agree. Instead of papering over a misconfiguration, it > would be better to let the users know, so they have a chance to > report and/or correct such a misconfiguration.
To reiterate, in the previous series I changed the error() to a warning() and Justin and Junio both didn't like this. In this series I didn't remove the error(), but instead I'm ensuring the read buffer is flushed before get_remote_bundle_uri() exits. This leaves a clean state behind and clone can continue. (more details in the commit message).
In reply to that other series, Justin also insisted to implement a server-side fix when bundles are misconfigured. I'm currently on the fence about this, because I don't have a good idea how to address this. I see a few options:
- Emit a warning on server-side: Personally I don't think this is a good idea because this might just end up in the logs somewhere, and no one might ever read them and they would just make the logs explode.
- Exit the upload-pack process: I like this even less. Bundle-URIs are considered to be optional by design. Breaking clone operations because of a misconfiguration of something optional is too drastic.
- On the client-side, read the return value of `transport_get_remote_bundle_uri()` and exit the clone in case of error: This would make the user a lot more aware of the error, and that would encourage the user to inform the server admin to fix the issue. But that breaks their clone, and they cannot continue doing whatever they wanted to do. Their only option to continue is to disable the config transfer.bundleURI, but that's cumbersome.
Because bundle-URIs are optional by design, I believe the changes in this series are sufficient. Also, the series [2] takes a similar approach: have the client gracefully continue in case of misconfigured bundles.
[1]: <20250912-b4-toon-bundle-uri-no-uri-v1-0-f4525a406df8@iotcl.com> [2]: <pull.2134.v2.git.git.1766160106521.gitgitgadget@gmail.com> [3]: <xmqqbjnfmvwo.fsf@gitster.g>
Greets, Toon --- connect.c | 10 +++++++--- t/t5558-clone-bundle-uri.sh | 25 +++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 3 deletions(-)
diff --git a/connect.c b/connect.c index a02583a102..e323455d3b 100644 --- a/connect.c +++ b/connect.c @@ -517,7 +517,7 @@ static void send_capabilities(int fd_out, struct packet_reader *reader) int get_remote_bundle_uri(int fd_out, struct packet_reader *reader, struct bundle_list *bundles, int stateless_rpc) { - int line_nr = 1; + int line_nr = 1, err = 0; /* Assert bundle-uri support */ ensure_server_supports_v2("bundle-uri"); @@ -536,10 +536,14 @@ int get_remote_bundle_uri(int fd_out, struct packet_reader *reader, const char *line = reader->line; line_nr++; + /* Do not parse if an error was encountered */ + if (err) + continue; + if (!bundle_uri_parse_line(bundles, line)) continue; - return error(_("error on bundle-uri response line %d: %s"), + err = error(_("error on bundle-uri response line %d: %s"), line_nr, line); } @@ -554,7 +558,7 @@ int get_remote_bundle_uri(int fd_out, struct packet_reader *reader, check_stateless_delimiter(stateless_rpc, reader, _("expected response end packet after ref listing")); - return 0; + return err; } struct ref **get_remote_refs(int fd_out, struct packet_reader *reader, diff --git a/t/t5558-clone-bundle-uri.sh b/t/t5558-clone-bundle-uri.sh index 7a0943bd36..514cc881b6 100755 --- a/t/t5558-clone-bundle-uri.sh +++ b/t/t5558-clone-bundle-uri.sh @@ -1302,6 +1302,31 @@ test_expect_success 'bundles with newline in target path are rejected' ' test_path_is_missing escape ' +test_expect_success 'bundles advertised with missing URI' ' + git clone --no-local --mirror clone-from \ + "$HTTPD_DOCUMENT_ROOT_PATH/no-uri.git" && + git -C "$HTTPD_DOCUMENT_ROOT_PATH/no-uri.git" config uploadpack.advertiseBundleURIs true && + git -C "$HTTPD_DOCUMENT_ROOT_PATH/no-uri.git" config bundle.version 1 && + git -C "$HTTPD_DOCUMENT_ROOT_PATH/no-uri.git" config bundle.mode all && + git -C "$HTTPD_DOCUMENT_ROOT_PATH/no-uri.git" config bundle.bundle-1.creationToken 1 && + + git -c transfer.bundleURI=true clone \ + "$HTTPD_URL/smart/no-uri.git" target-no-uri +' + +test_expect_success 'bundles advertised with empty URI' ' + git clone --no-local --mirror clone-from \ + "$HTTPD_DOCUMENT_ROOT_PATH/empty-uri.git" && + git -C "$HTTPD_DOCUMENT_ROOT_PATH/empty-uri.git" config uploadpack.advertiseBundleURIs true && + git -C "$HTTPD_DOCUMENT_ROOT_PATH/empty-uri.git" config bundle.version 1 && + git -C "$HTTPD_DOCUMENT_ROOT_PATH/empty-uri.git" config bundle.mode all && + git -C "$HTTPD_DOCUMENT_ROOT_PATH/empty-uri.git" config bundle.bundle-1.uri "" && + git -C "$HTTPD_DOCUMENT_ROOT_PATH/empty-uri.git" config bundle.bundle-1.creationToken 1 && + + git -c transfer.bundleURI=true clone \ + "$HTTPD_URL/smart/empty-uri.git" target-empty-uri +' + # Do not add tests here unless they use the HTTP server, as they will # not run unless the HTTP dependencies exist. --- base-commit: 256554692df0685b45e60778b08802b720880c50 change-id: 20260408-toon-bundle-uri-no-uri-24f661a498aa