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
82 lines
3.1 KiB
Python
82 lines
3.1 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 difflib
|
|
import filecmp
|
|
import logging
|
|
import os
|
|
import pytest
|
|
|
|
from testenv import Env, CurlClient
|
|
|
|
|
|
log = logging.getLogger(__name__)
|
|
|
|
|
|
@pytest.mark.skipif(condition=Env.curl_uses_lib('bearssl'), reason='BearSSL too slow')
|
|
@pytest.mark.skipif(condition=not Env.have_ssl_curl(), reason=f"curl without SSL")
|
|
class TestReuse:
|
|
|
|
# check if HTTP/1.1 handles 'Connection: close' correctly
|
|
@pytest.mark.parametrize("proto", ['http/1.1'])
|
|
def test_12_01_h1_conn_close(self, env: Env,
|
|
httpd, nghttpx, repeat, proto):
|
|
httpd.clear_extra_configs()
|
|
httpd.set_extra_config('base', [
|
|
f'MaxKeepAliveRequests 1',
|
|
])
|
|
httpd.reload()
|
|
count = 100
|
|
curl = CurlClient(env=env)
|
|
urln = f'https://{env.authority_for(env.domain1, proto)}/data.json?[0-{count-1}]'
|
|
r = curl.http_download(urls=[urln], alpn_proto=proto)
|
|
r.check_response(count=count, http_status=200)
|
|
# Server sends `Connection: close` on every 2nd request, requiring
|
|
# a new connection
|
|
assert r.total_connects == count/2
|
|
|
|
@pytest.mark.parametrize("proto", ['http/1.1'])
|
|
def test_12_02_h1_conn_timeout(self, env: Env,
|
|
httpd, nghttpx, repeat, proto):
|
|
httpd.clear_extra_configs()
|
|
httpd.set_extra_config('base', [
|
|
f'KeepAliveTimeout 1',
|
|
])
|
|
httpd.reload()
|
|
count = 5
|
|
curl = CurlClient(env=env)
|
|
urln = f'https://{env.authority_for(env.domain1, proto)}/data.json?[0-{count-1}]'
|
|
r = curl.http_download(urls=[urln], alpn_proto=proto, extra_args=[
|
|
'--rate', '30/m',
|
|
])
|
|
r.check_response(count=count, http_status=200)
|
|
# Connections time out on server before we send another request,
|
|
assert r.total_connects == count
|
|
# we do not see how often a request was retried in the stats, so
|
|
# we cannot check that connection reuse attempted a connection that
|
|
# was later detected to be "dead". We would like to
|
|
# assert stat['retry_count'] == 0
|