mirror of
https://github.com/curl/curl.git
synced 2025-02-05 14:30:10 +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
86 lines
2.6 KiB
Python
86 lines
2.6 KiB
Python
#***************************************************************************
|
|
# _ _ ____ _
|
|
# 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 logging
|
|
import os
|
|
import sys
|
|
from typing import Optional
|
|
|
|
import pytest
|
|
|
|
sys.path.append(os.path.join(os.path.dirname(__file__), '.'))
|
|
|
|
from testenv import Env, Nghttpx, Httpd, NghttpxQuic, NghttpxFwd
|
|
|
|
@pytest.fixture(scope="package")
|
|
def env(pytestconfig) -> Env:
|
|
env = Env(pytestconfig=pytestconfig)
|
|
level = logging.DEBUG if env.verbose > 0 else logging.INFO
|
|
logging.getLogger('').setLevel(level=level)
|
|
if not env.curl_has_protocol('http'):
|
|
pytest.skip("curl built without HTTP support")
|
|
if not env.curl_has_protocol('https'):
|
|
pytest.skip("curl built without HTTPS support")
|
|
if env.setup_incomplete():
|
|
pytest.skip(env.incomplete_reason())
|
|
|
|
env.setup()
|
|
return env
|
|
|
|
@pytest.fixture(scope="package", autouse=True)
|
|
def log_global_env_facts(record_testsuite_property, env):
|
|
record_testsuite_property("http-port", env.http_port)
|
|
|
|
|
|
@pytest.fixture(scope='package')
|
|
def httpd(env) -> Httpd:
|
|
httpd = Httpd(env=env)
|
|
if not httpd.exists():
|
|
pytest.skip(f'httpd not found: {env.httpd}')
|
|
httpd.clear_logs()
|
|
if not httpd.start():
|
|
pytest.fail(f'failed to start httpd: {env.httpd}')
|
|
yield httpd
|
|
httpd.stop()
|
|
|
|
|
|
@pytest.fixture(scope='package')
|
|
def nghttpx(env, httpd) -> Optional[Nghttpx]:
|
|
nghttpx = NghttpxQuic(env=env)
|
|
if env.have_h3():
|
|
nghttpx.clear_logs()
|
|
assert nghttpx.start()
|
|
yield nghttpx
|
|
nghttpx.stop()
|
|
|
|
@pytest.fixture(scope='package')
|
|
def nghttpx_fwd(env, httpd) -> Optional[Nghttpx]:
|
|
nghttpx = NghttpxFwd(env=env)
|
|
if env.have_h3():
|
|
nghttpx.clear_logs()
|
|
assert nghttpx.start()
|
|
yield nghttpx
|
|
nghttpx.stop()
|
|
|