mirror of
https://github.com/curl/curl.git
synced 2026-06-21 00:25:37 +03:00
dnsd: implement HTTPS-RR with alpn pref and no-default-alpn
Support HTTPS records in dnsd that have ALPN preferences. Add pytest test_22_* to verify that HTTPS record ALPN preferencces take effect if the HTTPS resolve arrives in time. Fix HTTPS eyeballing use of timeouts for second attempt. Also, make an initial HTTP/1.1 attempt switch off HTTP/2. Closes #21329
This commit is contained in:
Stefan Eissing
Daniel Stenberg
parent
1bf1f8ed6a
commit
a973377cd7
7 changed files with 484 additions and 112 deletions
134
tests/http/test_22_httpsrr.py
Normal file
134
tests/http/test_22_httpsrr.py
Normal file
|
|
@ -0,0 +1,134 @@
|
|||
#!/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 logging
|
||||
import os
|
||||
from datetime import timedelta
|
||||
from typing import Generator
|
||||
|
||||
import pytest
|
||||
from testenv import CurlClient, Env, LocalClient, Dnsd
|
||||
|
||||
log = logging.getLogger(__name__)
|
||||
|
||||
|
||||
@pytest.mark.skipif(condition=not Env.curl_is_debug(), reason="needs curl debug")
|
||||
@pytest.mark.skipif(condition=not Env.curl_override_dns(), reason="no DNS override")
|
||||
@pytest.mark.skipif(condition=not Env.curl_has_feature('HTTPSRR'), reason="no HTTPSRR support")
|
||||
class TestResolve:
|
||||
|
||||
@pytest.fixture(scope='class')
|
||||
def dnsd(self, env: Env) -> Generator[Dnsd, None, None]:
|
||||
dnsd = Dnsd(env=env)
|
||||
assert dnsd.initial_start()
|
||||
yield dnsd
|
||||
dnsd.stop()
|
||||
|
||||
# dnsd a HTTPS-RR that prefers HTTP/1.1.
|
||||
def test_22_01_httpsrr_h1(self, env: Env, httpd, dnsd):
|
||||
dnsd.set_answers(addr_a=['127.0.0.1'],
|
||||
https=['10 . alpn=http/1.1'])
|
||||
run_env = os.environ.copy()
|
||||
run_env['CURL_DNS_SERVER'] = f'127.0.0.1:{dnsd.port}'
|
||||
run_env['CURL_DBG_AWAIT_HTTPSRR'] = '1'
|
||||
run_env['CURL_QUICK_EXIT'] = '1'
|
||||
run_env['CURL_DEBUG'] = 'dns,https-connect'
|
||||
curl = CurlClient(env=env, run_env=run_env, force_resolv=False)
|
||||
url = f'https://{env.authority_for(env.domain1, "http/1.1")}/data.json'
|
||||
r = curl.http_download(urls=[url], with_stats=True)
|
||||
r.check_exit_code(0)
|
||||
r.check_stats(count=1, http_status=200, exitcode=0)
|
||||
assert r.stats[0]['http_version'] == '1.1', f'{r}'
|
||||
|
||||
# dnsd a HTTPS-RR that prefers HTTP/2, this overrides the --http3 option.
|
||||
@pytest.mark.skipif(condition=not Env.curl_override_dns(), reason="no DNS override")
|
||||
@pytest.mark.skipif(condition=not Env.curl_has_feature('HTTPSRR'), reason="no HTTPSRR support")
|
||||
@pytest.mark.skipif(condition=not Env.have_h3(), reason="missing HTTP/3 support")
|
||||
def test_22_02_httpsrr_h3(self, env: Env, httpd, dnsd, nghttpx):
|
||||
dnsd.set_answers(addr_a=['127.0.0.1'],
|
||||
https=['10 . alpn=h2'])
|
||||
run_env = os.environ.copy()
|
||||
run_env['CURL_DNS_SERVER'] = f'127.0.0.1:{dnsd.port}'
|
||||
run_env['CURL_DBG_AWAIT_HTTPSRR'] = '1'
|
||||
run_env['CURL_QUICK_EXIT'] = '1'
|
||||
run_env['CURL_DEBUG'] = 'dns,https-connect'
|
||||
curl = CurlClient(env=env, run_env=run_env, force_resolv=False)
|
||||
url = f'https://{env.authority_for(env.domain1, "http/1.1")}/data.json'
|
||||
r = curl.http_download(urls=[url], with_stats=True, extra_args=[
|
||||
'--http3'
|
||||
])
|
||||
r.check_exit_code(0)
|
||||
r.check_stats(count=1, http_status=200, exitcode=0)
|
||||
assert r.stats[0]['http_version'] == '2', f'{r}'
|
||||
|
||||
# dnsd a HTTPS-RR that prefers HTTP/3.
|
||||
@pytest.mark.skipif(condition=not Env.have_h3(), reason="missing HTTP/3 support")
|
||||
def test_22_03_httpsrr_h3(self, env: Env, httpd, dnsd, nghttpx):
|
||||
dnsd.set_answers(addr_a=['127.0.0.1'],
|
||||
https=['10 . alpn=h3,h2'])
|
||||
run_env = os.environ.copy()
|
||||
run_env['CURL_DNS_SERVER'] = f'127.0.0.1:{dnsd.port}'
|
||||
run_env['CURL_DBG_AWAIT_HTTPSRR'] = '1'
|
||||
run_env['CURL_QUICK_EXIT'] = '1'
|
||||
run_env['CURL_DEBUG'] = 'dns,https-connect'
|
||||
curl = CurlClient(env=env, run_env=run_env, force_resolv=False)
|
||||
url = f'https://{env.authority_for(env.domain1, "http/1.1")}/data.json'
|
||||
r = curl.http_download(urls=[url], with_stats=True)
|
||||
r.check_exit_code(0)
|
||||
r.check_stats(count=1, http_status=200, exitcode=0)
|
||||
assert r.stats[0]['http_version'] == '3', f'{r}'
|
||||
|
||||
# dnsd a HTTPS-RR that prefers HTTP/1.1 for another target, so ignored.
|
||||
def test_22_04_httpsrr_wrong_target(self, env: Env, httpd, dnsd):
|
||||
dnsd.set_answers(addr_a=['127.0.0.1'],
|
||||
https=['10 another alpn=http/1.1'])
|
||||
run_env = os.environ.copy()
|
||||
run_env['CURL_DNS_SERVER'] = f'127.0.0.1:{dnsd.port}'
|
||||
run_env['CURL_DBG_AWAIT_HTTPSRR'] = '1'
|
||||
run_env['CURL_QUICK_EXIT'] = '1'
|
||||
run_env['CURL_DEBUG'] = 'dns,https-connect'
|
||||
curl = CurlClient(env=env, run_env=run_env, force_resolv=False)
|
||||
url = f'https://{env.authority_for(env.domain1, "http/1.1")}/data.json'
|
||||
r = curl.http_download(urls=[url], with_stats=True)
|
||||
r.check_exit_code(0)
|
||||
r.check_stats(count=1, http_status=200, exitcode=0)
|
||||
assert r.stats[0]['http_version'] == '2', f'{r}'
|
||||
|
||||
# dnsd a HTTPS-RR with no-default-alpn, ignored by curl for now
|
||||
def test_22_05_httpsrr_no_default_alpn(self, env: Env, httpd, dnsd):
|
||||
dnsd.set_answers(addr_a=['127.0.0.1'],
|
||||
https=['10 . no-default-alpn alpn=http/1.1'])
|
||||
run_env = os.environ.copy()
|
||||
run_env['CURL_DNS_SERVER'] = f'127.0.0.1:{dnsd.port}'
|
||||
run_env['CURL_DBG_AWAIT_HTTPSRR'] = '1'
|
||||
run_env['CURL_QUICK_EXIT'] = '1'
|
||||
run_env['CURL_DEBUG'] = 'dns,https-connect'
|
||||
curl = CurlClient(env=env, run_env=run_env, force_resolv=False)
|
||||
url = f'https://{env.authority_for(env.domain1, "http/1.1")}/data.json'
|
||||
r = curl.http_download(urls=[url], with_stats=True)
|
||||
r.check_exit_code(0)
|
||||
r.check_stats(count=1, http_status=200, exitcode=0)
|
||||
assert r.stats[0]['http_version'] == '2', f'{r}'
|
||||
Loading…
Add table
Add a link
Reference in a new issue