From: Jeff King <peff@peff.net>
To: git@vger.kernel.org
Subject: [PATCH 0/3] remote-curl smart-http discovery cleanup
Date: Fri, 16 Nov 2018 03:44:27 -0500 [thread overview]
Message-ID: <20181116084427.GA31493@sigill.intra.peff.net> (raw)
In-Reply-To: <20181115215152.GK126896@google.com>
On Thu, Nov 15, 2018 at 01:51:52PM -0800, Josh Steadmon wrote:
> > This patch tightens both of those (I also made a few stylistic tweaks,
> > and added the ERR condition to show where it would go). I dunno. Part of
> > me sees this as a nice cleanup, but maybe it is better to just leave it
> > alone. A lot of these behaviors are just how it happens to work now, and
> > not part of the spec, but we don't know what might be relying on them.
>
> At least according to the protocol-v2 and http-protocol docs, the
> stricter behavior seems correct:
>
> For the first point above, dumb servers should never use an
> "application/x-git-*" content type (http-protocol.txt line 163-167).
>
> For the second point, the docs require v2 servers to use
> "application/x-git-*" content types. protocol-v2.txt lines 63-65 state
> that v2 clients should make a smart http request, while
> http-protocol.txt lines 247-252 state that a smart server's response
> type must be "application/x-git-*".
Thanks for digging into the spec. I agree that it's pretty clear that
the appropriate content-type is expected.
> Of course we don't know if other implementations follow the spec, but
> ISTM that this patch at least doesn't contradict how we've promised the
> protocols should work.
These seem like pretty unlikely ways for a buggy server to behave, so I
think it's a reasonable risk. I also checked GitHub's implementation
(which recently learned to speak v2) and made sure that it works. :)
I didn't check JGit, but given the provenance, I assume it's fine.
Amusingly, this does break the test you just added, because it tries to
issue an ERR after claiming "text/html" (and after my patch, we
correctly fall back to dumb-http).
> If no one has any objections, I'll include the diff below in v2. Thanks
> for the help Jeff!
I think it makes sense to do the refactoring first as a separate step.
And of course it needs a commit message. So how about this series (your
original is rebased on top)?
[1/3]: remote-curl: refactor smart-http discovery
[2/3]: remote-curl: tighten "version 2" check for smart-http
[3/3]: remote-curl: die on server-side errors
remote-curl.c | 96 +++++++++++++++++++++------------
t/lib-httpd.sh | 1 +
t/lib-httpd/apache.conf | 4 ++
t/lib-httpd/error-smart-http.sh | 3 ++
t/t5551-http-fetch-smart.sh | 5 ++
5 files changed, 75 insertions(+), 34 deletions(-)
create mode 100644 t/lib-httpd/error-smart-http.sh
-Peff
next prev parent reply other threads:[~2018-11-16 8:44 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-12 22:44 [PATCH] remote-curl: die on server-side errors steadmon
2018-11-12 22:55 ` Stefan Beller
2018-11-13 2:52 ` Junio C Hamano
2018-11-13 3:02 ` Junio C Hamano
2018-11-13 22:15 ` Josh Steadmon
2018-11-13 14:26 ` Jeff King
2018-11-13 22:25 ` Josh Steadmon
2018-11-14 0:49 ` Jeff King
2018-11-14 7:00 ` Jeff King
2018-11-15 21:51 ` Josh Steadmon
2018-11-16 8:44 ` Jeff King [this message]
2018-11-16 8:47 ` [PATCH 1/3] remote-curl: refactor smart-http discovery Jeff King
2018-11-16 20:27 ` Josh Steadmon
2019-02-05 23:29 ` Junio C Hamano
2019-02-06 19:16 ` Jeff King
2019-02-06 19:18 ` Jeff King
2019-02-06 19:29 ` Josh Steadmon
2019-02-06 20:42 ` Junio C Hamano
2019-02-06 21:14 ` Jeff King
2019-02-06 19:18 ` [PATCH 2/3] remote-curl: tighten "version 2" check for smart-http Jeff King
2019-02-06 19:19 ` [PATCH 3/3] t5551: test server-side ERR packet Jeff King
2019-02-06 22:19 ` [PATCH 1/3] remote-curl: refactor smart-http discovery Junio C Hamano
2018-11-16 8:48 ` [PATCH 2/3] remote-curl: tighten "version 2" check for smart-http Jeff King
2018-11-16 20:28 ` Josh Steadmon
2018-11-16 8:49 ` [PATCH 3/3] remote-curl: die on server-side errors Jeff King
2018-11-16 20:04 ` [PATCH 0/3] remote-curl smart-http discovery cleanup Josh Steadmon
2018-12-12 0:25 ` [PATCH v3 0/4] Unify pkt-line error handling and refactor smart-http Josh Steadmon
2018-12-12 0:25 ` [PATCH v3 1/4] pack-protocol.txt: accept error packets in any context Josh Steadmon
2018-12-12 11:02 ` Jeff King
2018-12-13 1:17 ` Masaya Suzuki
2018-12-13 8:04 ` Jeff King
2018-12-13 22:18 ` Josh Steadmon
2018-12-17 21:33 ` Jeff King
2018-12-19 23:30 ` Josh Steadmon
2018-12-20 15:49 ` Jeff King
2018-12-12 0:25 ` [PATCH v3 2/4] remote-curl: refactor smart-http discovery Josh Steadmon
2018-12-12 0:25 ` [PATCH v3 3/4] remote-curl: tighten "version 2" check for smart-http Josh Steadmon
2018-12-12 0:25 ` [PATCH v3 4/4] lib-httpd, t5551: check server-side HTTP errors Josh Steadmon
2018-12-12 8:43 ` [PATCH v3 0/4] Unify pkt-line error handling and refactor smart-http Junio C Hamano
2018-11-13 14:30 ` [PATCH] remote-curl: die on server-side errors Junio C Hamano
2018-11-13 22:28 ` Josh Steadmon
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=20181116084427.GA31493@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
/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).