mirror of
				https://github.com/yt-dlp/yt-dlp.git
				synced 2025-11-04 08:35:12 +00:00 
			
		
		
		
	Merge pull request #8228 from jaimeMF/disable-file-handler
[YoutubeDL] urlopen: disable the 'file:' protocol (#8227)
This commit is contained in:
		@@ -12,7 +12,7 @@ import copy
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
from test.helper import FakeYDL, assertRegexpMatches
 | 
					from test.helper import FakeYDL, assertRegexpMatches
 | 
				
			||||||
from youtube_dl import YoutubeDL
 | 
					from youtube_dl import YoutubeDL
 | 
				
			||||||
from youtube_dl.compat import compat_str
 | 
					from youtube_dl.compat import compat_str, compat_urllib_error
 | 
				
			||||||
from youtube_dl.extractor import YoutubeIE
 | 
					from youtube_dl.extractor import YoutubeIE
 | 
				
			||||||
from youtube_dl.postprocessor.common import PostProcessor
 | 
					from youtube_dl.postprocessor.common import PostProcessor
 | 
				
			||||||
from youtube_dl.utils import ExtractorError, match_filter_func
 | 
					from youtube_dl.utils import ExtractorError, match_filter_func
 | 
				
			||||||
@@ -631,6 +631,11 @@ class TestYoutubeDL(unittest.TestCase):
 | 
				
			|||||||
        result = get_ids({'playlist_items': '10'})
 | 
					        result = get_ids({'playlist_items': '10'})
 | 
				
			||||||
        self.assertEqual(result, [])
 | 
					        self.assertEqual(result, [])
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    def test_urlopen_no_file_protocol(self):
 | 
				
			||||||
 | 
					        # see https://github.com/rg3/youtube-dl/issues/8227
 | 
				
			||||||
 | 
					        ydl = YDL()
 | 
				
			||||||
 | 
					        self.assertRaises(compat_urllib_error.URLError, ydl.urlopen, 'file:///etc/passwd')
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
if __name__ == '__main__':
 | 
					if __name__ == '__main__':
 | 
				
			||||||
    unittest.main()
 | 
					    unittest.main()
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1986,8 +1986,19 @@ class YoutubeDL(object):
 | 
				
			|||||||
        https_handler = make_HTTPS_handler(self.params, debuglevel=debuglevel)
 | 
					        https_handler = make_HTTPS_handler(self.params, debuglevel=debuglevel)
 | 
				
			||||||
        ydlh = YoutubeDLHandler(self.params, debuglevel=debuglevel)
 | 
					        ydlh = YoutubeDLHandler(self.params, debuglevel=debuglevel)
 | 
				
			||||||
        data_handler = compat_urllib_request_DataHandler()
 | 
					        data_handler = compat_urllib_request_DataHandler()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        # When passing our own FileHandler instance, build_opener won't add the
 | 
				
			||||||
 | 
					        # default FileHandler and allows us to disable the file protocol, which
 | 
				
			||||||
 | 
					        # can be used for malicious purposes (see
 | 
				
			||||||
 | 
					        # https://github.com/rg3/youtube-dl/issues/8227)
 | 
				
			||||||
 | 
					        file_handler = compat_urllib_request.FileHandler()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        def file_open(*args, **kwargs):
 | 
				
			||||||
 | 
					            raise compat_urllib_error.URLError('file:// scheme is explicitly disabled in youtube-dl for security reasons')
 | 
				
			||||||
 | 
					        file_handler.file_open = file_open
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        opener = compat_urllib_request.build_opener(
 | 
					        opener = compat_urllib_request.build_opener(
 | 
				
			||||||
            proxy_handler, https_handler, cookie_processor, ydlh, data_handler)
 | 
					            proxy_handler, https_handler, cookie_processor, ydlh, data_handler, file_handler)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        # Delete the default user-agent header, which would otherwise apply in
 | 
					        # Delete the default user-agent header, which would otherwise apply in
 | 
				
			||||||
        # cases where our custom HTTP handler doesn't come into play
 | 
					        # cases where our custom HTTP handler doesn't come into play
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user