mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2026-06-12 13:54:28 +00:00
Fix allow-unsafe-ext compat option (#16920)
Fix bug in e578e265f7c6ca94a74b30e0d8d6196a4d19fb6a Closes #16919 Authored by: bashonly
This commit is contained in:
parent
a541df1ea5
commit
e47691215f
@ -327,6 +327,12 @@ class TestUtil(unittest.TestCase):
|
|||||||
with self.assertRaises(_UnsafeExtensionError):
|
with self.assertRaises(_UnsafeExtensionError):
|
||||||
prepend_extension('abc.unexpected_ext', ext, 'ext')
|
prepend_extension('abc.unexpected_ext', ext, 'ext')
|
||||||
|
|
||||||
|
# Test allow-unsafe-ext compat option
|
||||||
|
_UnsafeExtensionError._enabled = False
|
||||||
|
self.assertEqual(prepend_extension('abc.ext', 'un/safe'), 'abc.un/safe.ext')
|
||||||
|
# Re-enable sanitization for other tests
|
||||||
|
_UnsafeExtensionError._enabled = True
|
||||||
|
|
||||||
def test_replace_extension(self):
|
def test_replace_extension(self):
|
||||||
self.assertEqual(replace_extension('abc.ext', 'temp'), 'abc.temp')
|
self.assertEqual(replace_extension('abc.ext', 'temp'), 'abc.temp')
|
||||||
self.assertEqual(replace_extension('abc.ext', 'temp', 'ext'), 'abc.temp')
|
self.assertEqual(replace_extension('abc.ext', 'temp', 'ext'), 'abc.temp')
|
||||||
@ -345,6 +351,12 @@ class TestUtil(unittest.TestCase):
|
|||||||
with self.assertRaises(_UnsafeExtensionError):
|
with self.assertRaises(_UnsafeExtensionError):
|
||||||
replace_extension('abc.unexpected_ext', ext, 'ext')
|
replace_extension('abc.unexpected_ext', ext, 'ext')
|
||||||
|
|
||||||
|
# Test allow-unsafe-ext compat option
|
||||||
|
_UnsafeExtensionError._enabled = False
|
||||||
|
self.assertEqual(replace_extension('abc.ext', 'bin'), 'abc.bin')
|
||||||
|
# Re-enable sanitization for other tests
|
||||||
|
_UnsafeExtensionError._enabled = True
|
||||||
|
|
||||||
def test_subtitles_filename(self):
|
def test_subtitles_filename(self):
|
||||||
self.assertEqual(subtitles_filename('abc.ext', 'en', 'vtt'), 'abc.en.vtt')
|
self.assertEqual(subtitles_filename('abc.ext', 'en', 'vtt'), 'abc.en.vtt')
|
||||||
self.assertEqual(subtitles_filename('abc.ext', 'en', 'vtt', 'ext'), 'abc.en.vtt')
|
self.assertEqual(subtitles_filename('abc.ext', 'en', 'vtt', 'ext'), 'abc.en.vtt')
|
||||||
|
|||||||
@ -619,7 +619,7 @@ def validate_options(opts):
|
|||||||
warnings.append(
|
warnings.append(
|
||||||
'Using allow-unsafe-ext opens you up to potential attacks. '
|
'Using allow-unsafe-ext opens you up to potential attacks. '
|
||||||
'Use with great care!')
|
'Use with great care!')
|
||||||
_UnsafeExtensionError.sanitize_extension = lambda x, prepend=False: x
|
_UnsafeExtensionError._enabled = False
|
||||||
|
|
||||||
return warnings, deprecation_warnings
|
return warnings, deprecation_warnings
|
||||||
|
|
||||||
|
|||||||
@ -5218,12 +5218,17 @@ class _UnsafeExtensionError(Exception):
|
|||||||
'sbv',
|
'sbv',
|
||||||
])
|
])
|
||||||
|
|
||||||
|
_enabled = True
|
||||||
|
|
||||||
def __init__(self, extension, /):
|
def __init__(self, extension, /):
|
||||||
super().__init__(f'unsafe file extension: {extension!r}')
|
super().__init__(f'unsafe file extension: {extension!r}')
|
||||||
self.extension = extension
|
self.extension = extension
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def sanitize_extension(cls, extension, /, *, prepend=False, _allowed_exts=()):
|
def sanitize_extension(cls, extension, /, *, prepend=False, _allowed_exts=()):
|
||||||
|
if not cls._enabled:
|
||||||
|
return extension
|
||||||
|
|
||||||
if extension is None:
|
if extension is None:
|
||||||
return None
|
return None
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user