diff options
| author | Remita Amine <remitamine@gmail.com> | 2020-12-30 09:22:30 +0100 |
|---|---|---|
| committer | Remita Amine <remitamine@gmail.com> | 2020-12-30 09:22:30 +0100 |
| commit | 9dd674e1d20440564a3d25f33cd8785695e110f6 (patch) | |
| tree | c0a878181142c7c8267f9c580fb59f7647f9f428 | |
| parent | 9c1e164e0cd77331ea4f0b474b32fd06f84bad71 (diff) | |
| download | youtube-dl-9dd674e1d20440564a3d25f33cd8785695e110f6.tar.gz youtube-dl-9dd674e1d20440564a3d25f33cd8785695e110f6.tar.xz youtube-dl-9dd674e1d20440564a3d25f33cd8785695e110f6.zip | |
[utils] accept only supported protocols in url_or_none
| -rw-r--r-- | test/test_utils.py | 5 | ||||
| -rw-r--r-- | youtube_dl/utils.py | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/test/test_utils.py b/test/test_utils.py index 925a21d34..d49d3239c 100644 --- a/test/test_utils.py +++ b/test/test_utils.py @@ -554,6 +554,11 @@ class TestUtil(unittest.TestCase): self.assertEqual(url_or_none('http$://foo.de'), None) self.assertEqual(url_or_none('http://foo.de'), 'http://foo.de') self.assertEqual(url_or_none('//foo.de'), '//foo.de') + self.assertEqual(url_or_none('s3://foo.de'), None) + self.assertEqual(url_or_none('rtmpte://foo.de'), 'rtmpte://foo.de') + self.assertEqual(url_or_none('mms://foo.de'), 'mms://foo.de') + self.assertEqual(url_or_none('rtspu://foo.de'), 'rtspu://foo.de') + self.assertEqual(url_or_none('ftps://foo.de'), 'ftps://foo.de') def test_parse_age_limit(self): self.assertEqual(parse_age_limit(None), None) diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py index 8cefafd79..d5fb6fd24 100644 --- a/youtube_dl/utils.py +++ b/youtube_dl/utils.py @@ -3640,7 +3640,7 @@ def url_or_none(url): if not url or not isinstance(url, compat_str): return None url = url.strip() - return url if re.match(r'^(?:[a-zA-Z][\da-zA-Z.+-]*:)?//', url) else None + return url if re.match(r'^(?:(?:https?|rt(?:m(?:pt?[es]?|fp)|sp[su]?)|mms|ftps?):)?//', url) else None def parse_duration(s): |