mirrors/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2025-10-31 22:55:18 +00:00
Code Issues Projects Releases Wiki Activity

[networking] Add strict Request extension checking (#7604)

Browse Source 
Authored by: coletdjnz
Co-authored-by: pukkandan <pukkandan.ytdlp@gmail.com>
This commit is contained in:
coletdjnz
2023-07-23 17:17:15 +12:00
committed by GitHub
parent 11de6fec9c
commit 86aea0d3a2
3 changed files with 58 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
test/test_networking.py
View File

@@ -804,10 +804,10 @@ class TestUrllibRequestHandler(TestRequestHandlerBase):
assert not isinstance(exc_info.value, TransportError)
def run_validation(handler, fail, req, **handler_kwargs):
def run_validation(handler, error, req, **handler_kwargs):
with handler(**handler_kwargs) as rh:
if fail:
with pytest.raises(UnsupportedRequest):
if error:
with pytest.raises(error):
rh.validate(req)
else:
rh.validate(req)
@@ -824,6 +824,9 @@ class TestRequestHandlerValidation:
_SUPPORTED_PROXY_SCHEMES = None
_SUPPORTED_URL_SCHEMES = None
def _check_extensions(self, extensions):
extensions.clear()
class HTTPSupportedRH(ValidationRH):
_SUPPORTED_URL_SCHEMES = ('http',)
@@ -834,26 +837,26 @@ class TestRequestHandlerValidation:
('https', False, {}),
('data', False, {}),
('ftp', False, {}),
('file', True, {}),
('file', UnsupportedRequest, {}),
('file', False, {'enable_file_urls': True}),
]),
(NoCheckRH, [('http', False, {})]),
(ValidationRH, [('http', True, {})])
(ValidationRH, [('http', UnsupportedRequest, {})])
]
PROXY_SCHEME_TESTS = [
# scheme, expected to fail
('Urllib', [
('http', False),
('https', True),
('https', UnsupportedRequest),
('socks4', False),
('socks4a', False),
('socks5', False),
('socks5h', False),
('socks', True),
('socks', UnsupportedRequest),
]),
(NoCheckRH, [('http', False)]),
(HTTPSupportedRH, [('http', True)]),
(HTTPSupportedRH, [('http', UnsupportedRequest)]),
]
PROXY_KEY_TESTS = [
@@ -863,8 +866,22 @@ class TestRequestHandlerValidation:
('unrelated', False),
]),
(NoCheckRH, [('all', False)]),
(HTTPSupportedRH, [('all', True)]),
(HTTPSupportedRH, [('no', True)]),
(HTTPSupportedRH, [('all', UnsupportedRequest)]),
(HTTPSupportedRH, [('no', UnsupportedRequest)]),
]
EXTENSION_TESTS = [
('Urllib', [
({'cookiejar': 'notacookiejar'}, AssertionError),
({'cookiejar': CookieJar()}, False),
({'timeout': 1}, False),
({'timeout': 'notatimeout'}, AssertionError),
({'unsupported': 'value'}, UnsupportedRequest),
]),
(NoCheckRH, [
({'cookiejar': 'notacookiejar'}, False),
({'somerandom': 'test'}, False), # but any extension is allowed through
]),
]
@pytest.mark.parametrize('handler,scheme,fail,handler_kwargs', [
@@ -907,15 +924,16 @@ class TestRequestHandlerValidation:
@pytest.mark.parametrize('proxy_url', ['//example.com', 'example.com', '127.0.0.1'])
@pytest.mark.parametrize('handler', ['Urllib'], indirect=True)
def test_missing_proxy_scheme(self, handler, proxy_url):
run_validation(handler, True, Request('http://', proxies={'http': 'example.com'}))
run_validation(handler, UnsupportedRequest, Request('http://', proxies={'http': 'example.com'}))
@pytest.mark.parametrize('handler', ['Urllib'], indirect=True)
def test_cookiejar_extension(self, handler):
run_validation(handler, True, Request('http://', extensions={'cookiejar': 'notacookiejar'}))
@pytest.mark.parametrize('handler', ['Urllib'], indirect=True)
def test_timeout_extension(self, handler):
run_validation(handler, True, Request('http://', extensions={'timeout': 'notavalidtimeout'}))
@pytest.mark.parametrize('handler,extensions,fail', [
(handler_tests[0], extensions, fail)
for handler_tests in EXTENSION_TESTS
for extensions, fail in handler_tests[1]
], indirect=['handler'])
def test_extension(self, handler, extensions, fail):
run_validation(
handler, fail, Request('http://', extensions=extensions))
def test_invalid_request_type(self):
rh = self.ValidationRH(logger=FakeLogger())