mirror of
https://github.com/curl/curl.git
synced 2026-06-14 08:35:37 +03:00
73daec6620
Add `data->state.origin` as the origin the transfer is sending the current request to/gets the response from. Use it for request specific properties like authentication, hsts and cookie handling, etc. Unless talking to a forwarding HTTP proxy (e.g. not tunneling), `data->state.origin` and `conn->origin` are the same. With a forwarding HTTP proxy in play, `conn->origin` is set to `conn->http_proxy.peer` and `conn->bits.origin_is_proxy` (a new bit) is set. Remove the connection bits, now replaced with: * `conn->bits.socksproxy` -> `conn->socks_proy.peer` * `conn->bits.httpproxy` -> `conn->http_proy.peer` * `conn->bits.proxy` -> `(conn->socks_proy.peer || conn->http_proy.peer`) * `conn->bits.tunnel_proxy` -> (`conn->http_proy.peer && !conn->bits.origin_is_proxy`) * `(conn->bits.httpproxy && !conn->bits.tunnel_proxy)` -> `conn->bits.origin_is_proxy` Rename `noproxy.[ch]` to `proxy.[ch]`. Move the connection proxy setup code from `url.c` to `proxy.c`. Remove `data->info.conn_remote_port` as no one uses it. Add test_40_02b for a SOCKS connection to a forwarding HTTPS proxy. Update internal documentation about peers and creds. Closes #21967
122 lines
5.1 KiB
Python
122 lines
5.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 logging
|
|
import os
|
|
import time
|
|
from typing import Generator
|
|
|
|
import pytest
|
|
from testenv import CurlClient, Dante, Env
|
|
|
|
log = logging.getLogger(__name__)
|
|
|
|
|
|
@pytest.mark.skipif(condition=not Env.has_danted(), reason="missing danted")
|
|
class TestSocks:
|
|
|
|
@pytest.fixture(scope='class')
|
|
def danted(self, env: Env) -> Generator[Dante, None, None]:
|
|
danted = Dante(env=env)
|
|
assert danted.initial_start()
|
|
time.sleep(1)
|
|
yield danted
|
|
danted.stop()
|
|
|
|
@pytest.fixture(autouse=True, scope='class')
|
|
def _class_scope(self, env, httpd):
|
|
indir = httpd.docs_dir
|
|
env.make_data_file(indir=indir, fname="data-10m", fsize=10 * 1024 * 1024)
|
|
env.make_data_file(indir=env.gen_dir, fname="data-10m", fsize=10 * 1024 * 1024)
|
|
|
|
@pytest.mark.parametrize("sproto", ['socks4', 'socks5'])
|
|
def test_40_01_socks_http(self, env: Env, sproto, danted: Dante, httpd):
|
|
curl = CurlClient(env=env, socks_args=[
|
|
f'--{sproto}', f'127.0.0.1:{danted.port}'
|
|
])
|
|
url = f'http://{env.domain1}:{env.http_port}/data.json'
|
|
r = curl.http_get(url=url)
|
|
r.check_response(http_status=200)
|
|
|
|
@pytest.mark.parametrize("sproto", ['socks4', 'socks5'])
|
|
@pytest.mark.parametrize("proto", Env.http_protos())
|
|
def test_40_02_socks_https(self, env: Env, sproto, proto, danted: Dante, httpd):
|
|
curl = CurlClient(env=env, socks_args=[
|
|
f'--{sproto}', f'127.0.0.1:{danted.port}'
|
|
])
|
|
url = f'https://{env.authority_for(env.domain1, proto)}/data.json'
|
|
r = curl.http_get(url=url, alpn_proto=proto)
|
|
if proto == 'h3':
|
|
assert r.exit_code == 3 # unsupported combination
|
|
else:
|
|
r.check_response(http_status=200)
|
|
|
|
# download via socks to https: proxy (no tunnel)
|
|
@pytest.mark.parametrize("sproto", ['socks4', 'socks5'])
|
|
@pytest.mark.parametrize("proto", Env.http_h1_h2_protos())
|
|
def test_40_02b_socks_https_proxy(self, env: Env, sproto, proto, danted: Dante, httpd):
|
|
if proto == 'h2' and not env.curl_uses_lib('nghttp2'):
|
|
pytest.skip('only supported with nghttp2')
|
|
curl = CurlClient(env=env, socks_args=[
|
|
f'--{sproto}', f'127.0.0.1:{danted.port}'
|
|
])
|
|
url = f'http://localhost:{env.http_port}/data.json'
|
|
xargs = curl.get_proxy_args(proto=proto, tunnel=False)
|
|
r = curl.http_download(urls=[url], alpn_proto=proto, with_stats=True,
|
|
extra_args=xargs)
|
|
r.check_response(http_status=200)
|
|
exp_http_version = '2' if proto == 'h2' else '1.1'
|
|
assert r.stats[0]['proxy_used'] == 1, f'{r}'
|
|
assert r.stats[0]['http_version'] == exp_http_version, f'{r}'
|
|
|
|
@pytest.mark.parametrize("sproto", ['socks4', 'socks5'])
|
|
@pytest.mark.parametrize("proto", Env.http_h1_h2_protos())
|
|
def test_40_03_dl_serial(self, env: Env, httpd, danted, proto, sproto):
|
|
count = 3
|
|
urln = f'https://{env.authority_for(env.domain1, proto)}/data-10m?[0-{count-1}]'
|
|
curl = CurlClient(env=env, socks_args=[
|
|
f'--{sproto}', f'127.0.0.1:{danted.port}'
|
|
])
|
|
r = curl.http_download(urls=[urln], alpn_proto=proto)
|
|
r.check_response(count=count, http_status=200)
|
|
|
|
@pytest.mark.parametrize("sproto", ['socks4', 'socks5'])
|
|
@pytest.mark.parametrize("proto", Env.http_h1_h2_protos())
|
|
def test_40_04_ul_serial(self, env: Env, httpd, danted, proto, sproto):
|
|
fdata = os.path.join(env.gen_dir, 'data-10m')
|
|
count = 2
|
|
curl = CurlClient(env=env, socks_args=[
|
|
f'--{sproto}', f'127.0.0.1:{danted.port}'
|
|
])
|
|
url = f'https://{env.authority_for(env.domain1, proto)}/curltest/echo?id=[0-{count-1}]'
|
|
r = curl.http_upload(urls=[url], data=f'@{fdata}', alpn_proto=proto)
|
|
r.check_stats(count=count, http_status=200, exitcode=0)
|
|
with open(fdata) as fi:
|
|
indata = fi.readlines()
|
|
for i in range(count):
|
|
with open(curl.response_file(i)) as fr:
|
|
respdata = fr.readlines()
|
|
assert respdata == indata
|