From db30130165bef1ceff04c0163db6676db23ba2fc Mon Sep 17 00:00:00 2001 From: Jeff King Date: Sat, 17 Jun 2023 01:15:59 -0400 Subject: http: handle both "h2" and "h2h3" in curl info lines When redacting auth tokens in trace output from curl, we look for http/2 headers of the form "h2h3 [header: value]". This comes from b637a41ebe (http: redact curl h2h3 headers in info, 2022-11-11). But the "h2h3" prefix changed to just "h2" in curl's fc2f1e547 (http2: support HTTP/2 to forward proxies, non-tunneling, 2023-04-14). That's in released version curl 8.1.0; linking against that version means we'll fail to correctly redact the trace. Our t5559.17 notices and fails. We can fix this by matching either prefix, which should handle both old and new versions. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- http.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'http.c') diff --git a/http.c b/http.c index 8a5ba3f477..f30bd0bca9 100644 --- a/http.c +++ b/http.c @@ -630,7 +630,8 @@ static void redact_sensitive_info_header(struct strbuf *header) * h2h3 [: ] */ if (trace_curl_redact && - skip_iprefix(header->buf, "h2h3 [", &sensitive_header)) { + (skip_iprefix(header->buf, "h2h3 [", &sensitive_header) || + skip_iprefix(header->buf, "h2 [", &sensitive_header))) { if (redact_sensitive_header(header, sensitive_header - header->buf)) { /* redaction ate our closing bracket */ strbuf_addch(header, ']'); -- cgit v1.2.3