R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[nrk] Add X-Forwarded-For HTTP header in info dict

Browse Source
This commit is contained in:
Sergey M․ 2016-11-13 22:28:29 +07:00
parent 690355551c
commit 7e08e2cab0
No known key found for this signature in database
GPG Key ID: 2C393E0F18A9236D
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
youtube_dl/extractor/nrk.py
View File

@ -17,14 +17,15 @@ from ..utils import (
class NRKBaseIE(InfoExtractor): class NRKBaseIE(InfoExtractor):
_faked_ip = None _faked_ip = None
def _download_webpage(self, *args, **kwargs): def _download_webpage_handle(self, *args, **kwargs):
# NRK checks X-Forwarded-For HTTP header in order to figure out the # NRK checks X-Forwarded-For HTTP header in order to figure out the
# origin of the client behind proxy. This allows to bypass geo # origin of the client behind proxy. This allows to bypass geo
# restriction by faking this header's value to some Norway IP. # restriction by faking this header's value to some Norway IP.
# We will do so once we encounter any geo restriction error. # We will do so once we encounter any geo restriction error.
if self._faked_ip: if self._faked_ip:
kwargs.setdefault('headers', {})['X-Forwarded-For'] = self._faked_ip # NB: str is intentional
return super(NRKBaseIE, self)._download_webpage(*args, **kwargs) kwargs.setdefault(str('headers'), {})['X-Forwarded-For'] = self._faked_ip
return super(NRKBaseIE, self)._download_webpage_handle(*args, **kwargs)
def _fake_ip(self): def _fake_ip(self):
# Use fake IP from 37.191.128.0/17 in order to workaround geo # Use fake IP from 37.191.128.0/17 in order to workaround geo
@ -43,6 +44,8 @@ class NRKBaseIE(InfoExtractor):
title = data.get('fullTitle') or data.get('mainTitle') or data['title'] title = data.get('fullTitle') or data.get('mainTitle') or data['title']
video_id = data.get('id') or video_id video_id = data.get('id') or video_id
http_headers = {'X-Forwarded-For': self._faked_ip} if self._faked_ip else {}
entries = [] entries = []
media_assets = data.get('mediaAssets') media_assets = data.get('mediaAssets')
@ -73,6 +76,7 @@ class NRKBaseIE(InfoExtractor):
'duration': duration, 'duration': duration,
'subtitles': subtitles, 'subtitles': subtitles,
'formats': formats, 'formats': formats,
'http_headers': http_headers,
}) })
if not entries: if not entries: