mirror of
https://github.com/curl/curl.git
synced 2025-01-24 14:15:18 +08:00
4ae2d9f24d
- currently only on debug build and when env variable CURL_PROXY_TUNNEL_H2 is present. - will ALPN negotiate with the proxy server and switch tunnel filter based on the protocol negotiated. - http/1.1 tunnel code moved into cf-h1-proxy.[ch] - http/2 tunnel code implemented in cf-h2-proxy.[ch] - tunnel start and ALPN set remains in http_proxy.c - moving all haproxy related code into cf-haproxy.[ch] VTLS changes - SSL filters rely solely on the "alpn" specification they are created with and no longer check conn->bits.tls_enable_alpn. - checks on which ALPN specification to use (or none at all) are done in vtls.c when creating the filter. Testing - added a nghttpx forward proxy to the pytest setup that speaks HTTP/2 and forwards all requests to the Apache httpd forward proxy server. - extending test coverage in test_10 cases - adding proxy tests for direct/tunnel h1/h2 use of basic auth. - adding test for http/1.1 and h2 proxy tunneling to pytest Closes #10780
95 lines
3.8 KiB
Python
95 lines
3.8 KiB
Python
#!/usr/bin/env python3
|
|
# -*- coding: utf-8 -*-
|
|
#***************************************************************************
|
|
# _ _ ____ _
|
|
# Project ___| | | | _ \| |
|
|
# / __| | | | |_) | |
|
|
# | (__| |_| | _ <| |___
|
|
# \___|\___/|_| \_\_____|
|
|
#
|
|
# Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
#
|
|
# This software is licensed as described in the file COPYING, which
|
|
# you should have received as part of this distribution. The terms
|
|
# are also available at https://curl.se/docs/copyright.html.
|
|
#
|
|
# You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
# copies of the Software, and permit persons to whom the Software is
|
|
# furnished to do so, under the terms of the COPYING file.
|
|
#
|
|
# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
# KIND, either express or implied.
|
|
#
|
|
# SPDX-License-Identifier: curl
|
|
#
|
|
###########################################################################
|
|
#
|
|
import json
|
|
import logging
|
|
from typing import Optional, Tuple, List, Dict
|
|
import pytest
|
|
|
|
from testenv import Env, CurlClient, ExecResult
|
|
|
|
|
|
log = logging.getLogger(__name__)
|
|
|
|
|
|
@pytest.mark.skipif(condition=not Env.httpd_is_at_least('2.4.55'),
|
|
reason=f"httpd version too old for this: {Env.httpd_version()}")
|
|
class TestErrors:
|
|
|
|
@pytest.fixture(autouse=True, scope='class')
|
|
def _class_scope(self, env, httpd, nghttpx):
|
|
if env.have_h3():
|
|
nghttpx.start_if_needed()
|
|
httpd.clear_extra_configs()
|
|
httpd.reload()
|
|
|
|
# download 1 file, check that we get CURLE_PARTIAL_FILE
|
|
@pytest.mark.parametrize("proto", ['http/1.1', 'h2', 'h3'])
|
|
def test_05_01_partial_1(self, env: Env, httpd, nghttpx, repeat,
|
|
proto):
|
|
if proto == 'h3' and not env.have_h3():
|
|
pytest.skip("h3 not supported")
|
|
if proto == 'h3' and env.curl_uses_lib('msh3'):
|
|
pytest.skip("msh3 stalls here")
|
|
count = 1
|
|
curl = CurlClient(env=env)
|
|
urln = f'https://{env.authority_for(env.domain1, proto)}' \
|
|
f'/curltest/tweak?id=[0-{count - 1}]'\
|
|
'&chunks=3&chunk_size=16000&body_error=reset'
|
|
r = curl.http_download(urls=[urln], alpn_proto=proto, extra_args=[
|
|
'--retry', '0'
|
|
])
|
|
r.check_exit_code(False)
|
|
invalid_stats = []
|
|
for idx, s in enumerate(r.stats):
|
|
if 'exitcode' not in s or s['exitcode'] not in [18, 56, 92]:
|
|
invalid_stats.append(f'request {idx} exit with {s["exitcode"]}')
|
|
assert len(invalid_stats) == 0, f'failed: {invalid_stats}'
|
|
|
|
# download files, check that we get CURLE_PARTIAL_FILE for all
|
|
@pytest.mark.parametrize("proto", ['h2', 'h3'])
|
|
def test_05_02_partial_20(self, env: Env, httpd, nghttpx, repeat,
|
|
proto):
|
|
if proto == 'h3' and not env.have_h3():
|
|
pytest.skip("h3 not supported")
|
|
if proto == 'h3' and env.curl_uses_lib('msh3'):
|
|
pytest.skip("msh3 stalls here")
|
|
count = 20
|
|
curl = CurlClient(env=env)
|
|
urln = f'https://{env.authority_for(env.domain1, proto)}' \
|
|
f'/curltest/tweak?id=[0-{count - 1}]'\
|
|
'&chunks=5&chunk_size=16000&body_error=reset'
|
|
r = curl.http_download(urls=[urln], alpn_proto=proto, extra_args=[
|
|
'--retry', '0', '--parallel',
|
|
])
|
|
r.check_exit_code(False)
|
|
assert len(r.stats) == count, f'did not get all stats: {r}'
|
|
invalid_stats = []
|
|
for idx, s in enumerate(r.stats):
|
|
if 'exitcode' not in s or s['exitcode'] not in [18, 56, 92, 95]:
|
|
invalid_stats.append(f'request {idx} exit with {s["exitcode"]}\n{s}')
|
|
assert len(invalid_stats) == 0, f'failed: {invalid_stats}'
|