http2: fix for http2-prior-knowledge when reusing connections

- refs #10634 where errors in the HTTP/2 framing layer are observed.
- the bug was that on connection reuse, the code attempted to switch
  in yet another layer of HTTP/2 handling instead of detecting that
  this was already in place.
- added pytest testcase reproducing the issue.

Reported-by: rwmjones on github
Fixes #10634
Closes #10643
This commit is contained in:
Stefan Eissing 2023-02-28 11:43:50 +01:00 committed by Daniel Stenberg
parent efa1aba97c
commit cbe9d82c22
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
3 changed files with 28 additions and 1 deletions

View File

@ -2479,7 +2479,8 @@ bool Curl_http2_may_switch(struct Curl_easy *data,
int sockindex) int sockindex)
{ {
(void)sockindex; (void)sockindex;
if(data->state.httpwant == CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE) { if(!Curl_conn_is_http2(data, conn, sockindex) &&
data->state.httpwant == CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE) {
#ifndef CURL_DISABLE_PROXY #ifndef CURL_DISABLE_PROXY
if(conn->bits.httpproxy && !conn->bits.tunnel_proxy) { if(conn->bits.httpproxy && !conn->bits.tunnel_proxy) {
/* We don't support HTTP/2 proxies yet. Also it's debatable /* We don't support HTTP/2 proxies yet. Also it's debatable

View File

@ -221,6 +221,30 @@ class TestDownload:
assert r.exit_code == 0 assert r.exit_code == 0
r.check_stats(count=count, exp_status=200) r.check_stats(count=count, exp_status=200)
@pytest.mark.parametrize("proto", ['http/1.1', 'h2', 'h3'])
def test_02_12_head_serial_https(self, env: Env,
httpd, nghttpx, repeat, proto):
count = 100
urln = f'https://{env.authority_for(env.domain1, proto)}/data-10m?[0-{count-1}]'
curl = CurlClient(env=env)
r = curl.http_download(urls=[urln], alpn_proto=proto, extra_args=[
'--head'
])
assert r.exit_code == 0
r.check_stats(count=count, exp_status=200)
@pytest.mark.parametrize("proto", ['h2'])
def test_02_13_head_serial_h2c(self, env: Env,
httpd, nghttpx, repeat, proto):
count = 100
urln = f'http://{env.domain1}:{env.http_port}/data-10m?[0-{count-1}]'
curl = CurlClient(env=env)
r = curl.http_download(urls=[urln], alpn_proto=proto, extra_args=[
'--head', '--http2-prior-knowledge', '--fail-early'
])
assert r.exit_code == 0
r.check_stats(count=count, exp_status=200)
def test_02_20_h2_small_frames(self, env: Env, httpd, repeat): def test_02_20_h2_small_frames(self, env: Env, httpd, repeat):
# Test case to reproduce content corruption as observed in # Test case to reproduce content corruption as observed in
# https://github.com/curl/curl/issues/10525 # https://github.com/curl/curl/issues/10525

View File

@ -224,6 +224,7 @@ class Httpd:
f'LogLevel proxy_http:trace4', f'LogLevel proxy_http:trace4',
f'H2MinWorkers 16', f'H2MinWorkers 16',
f'H2MaxWorkers 128', f'H2MaxWorkers 128',
f'H2Direct on',
f'Listen {self.env.http_port}', f'Listen {self.env.http_port}',
f'Listen {self.env.https_port}', f'Listen {self.env.https_port}',
f'Listen {self.env.proxy_port}', f'Listen {self.env.proxy_port}',
@ -235,6 +236,7 @@ class Httpd:
f' ServerName {domain1}', f' ServerName {domain1}',
f' ServerAlias localhost', f' ServerAlias localhost',
f' DocumentRoot "{self._docs_dir}"', f' DocumentRoot "{self._docs_dir}"',
f' Protocols h2c http/1.1',
]) ])
conf.extend(self._curltest_conf()) conf.extend(self._curltest_conf())
conf.extend([ conf.extend([