diff options
Diffstat (limited to 'youtube_dl/extractor/scrippsnetworks.py')
| -rw-r--r-- | youtube_dl/extractor/scrippsnetworks.py | 103 | 
1 files changed, 16 insertions, 87 deletions
| diff --git a/youtube_dl/extractor/scrippsnetworks.py b/youtube_dl/extractor/scrippsnetworks.py index b446a02ba..4023aeef8 100644 --- a/youtube_dl/extractor/scrippsnetworks.py +++ b/youtube_dl/extractor/scrippsnetworks.py @@ -1,13 +1,11 @@  # coding: utf-8  from __future__ import unicode_literals -import datetime  import json  import hashlib -import hmac  import re -from .common import InfoExtractor +from .aws import AWSIE  from .anvato import AnvatoIE  from ..utils import (      smuggle_url, @@ -16,7 +14,7 @@ from ..utils import (  ) -class ScrippsNetworksWatchIE(InfoExtractor): +class ScrippsNetworksWatchIE(AWSIE):      IE_NAME = 'scrippsnetworks:watch'      _VALID_URL = r'''(?x)                      https?:// @@ -64,44 +62,27 @@ class ScrippsNetworksWatchIE(InfoExtractor):          'travelchannel': 'trav',          'geniuskitchen': 'genius',      } -    _SNI_HOST = 'web.api.video.snidigital.com' -    _AWS_REGION = 'us-east-1' -    _AWS_IDENTITY_ID_JSON = json.dumps({ -        'IdentityId': '%s:7655847c-0ae7-4d9b-80d6-56c062927eb3' % _AWS_REGION -    }) -    _AWS_USER_AGENT = 'aws-sdk-js/2.80.0 callback'      _AWS_API_KEY = 'E7wSQmq0qK6xPrF13WmzKiHo4BQ7tip4pQcSXVl1' -    _AWS_SERVICE = 'execute-api' -    _AWS_REQUEST = 'aws4_request' -    _AWS_SIGNED_HEADERS = ';'.join([ -        'host', 'x-amz-date', 'x-amz-security-token', 'x-api-key']) -    _AWS_CANONICAL_REQUEST_TEMPLATE = '''GET -%(uri)s - -host:%(host)s -x-amz-date:%(date)s -x-amz-security-token:%(token)s -x-api-key:%(key)s +    _AWS_PROXY_HOST = 'web.api.video.snidigital.com' -%(signed_headers)s -%(payload_hash)s''' +    _AWS_USER_AGENT = 'aws-sdk-js/2.80.0 callback'      def _real_extract(self, url):          mobj = re.match(self._VALID_URL, url)          site_id, video_id = mobj.group('site', 'id') -        def aws_hash(s): -            return hashlib.sha256(s.encode('utf-8')).hexdigest() - +        aws_identity_id_json = json.dumps({ +            'IdentityId': '%s:7655847c-0ae7-4d9b-80d6-56c062927eb3' % self._AWS_REGION +        }).encode('utf-8')          token = self._download_json( -            'https://cognito-identity.us-east-1.amazonaws.com/', video_id, -            data=self._AWS_IDENTITY_ID_JSON.encode('utf-8'), +            'https://cognito-identity.%s.amazonaws.com/' % self._AWS_REGION, video_id, +            data=aws_identity_id_json,              headers={                  'Accept': '*/*',                  'Content-Type': 'application/x-amz-json-1.1',                  'Referer': url, -                'X-Amz-Content-Sha256': aws_hash(self._AWS_IDENTITY_ID_JSON), +                'X-Amz-Content-Sha256': hashlib.sha256(aws_identity_id_json).hexdigest(),                  'X-Amz-Target': 'AWSCognitoIdentityService.GetOpenIdToken',                  'X-Amz-User-Agent': self._AWS_USER_AGENT,              })['Token'] @@ -124,64 +105,12 @@ x-api-key:%(key)s                  sts, './/{https://sts.amazonaws.com/doc/2011-06-15/}%s' % key,                  fatal=True) -        access_key_id = get('AccessKeyId') -        secret_access_key = get('SecretAccessKey') -        session_token = get('SessionToken') - -        # Task 1: http://docs.aws.amazon.com/general/latest/gr/sigv4-create-canonical-request.html -        uri = '/1/web/brands/%s/episodes/scrid/%s' % (self._SNI_TABLE[site_id], video_id) -        datetime_now = datetime.datetime.utcnow().strftime('%Y%m%dT%H%M%SZ') -        date = datetime_now[:8] -        canonical_string = self._AWS_CANONICAL_REQUEST_TEMPLATE % { -            'uri': uri, -            'host': self._SNI_HOST, -            'date': datetime_now, -            'token': session_token, -            'key': self._AWS_API_KEY, -            'signed_headers': self._AWS_SIGNED_HEADERS, -            'payload_hash': aws_hash(''), -        } - -        # Task 2: http://docs.aws.amazon.com/general/latest/gr/sigv4-create-string-to-sign.html -        credential_string = '/'.join([date, self._AWS_REGION, self._AWS_SERVICE, self._AWS_REQUEST]) -        string_to_sign = '\n'.join([ -            'AWS4-HMAC-SHA256', datetime_now, credential_string, -            aws_hash(canonical_string)]) - -        # Task 3: http://docs.aws.amazon.com/general/latest/gr/sigv4-calculate-signature.html -        def aws_hmac(key, msg): -            return hmac.new(key, msg.encode('utf-8'), hashlib.sha256) - -        def aws_hmac_digest(key, msg): -            return aws_hmac(key, msg).digest() - -        def aws_hmac_hexdigest(key, msg): -            return aws_hmac(key, msg).hexdigest() - -        k_secret = 'AWS4' + secret_access_key -        k_date = aws_hmac_digest(k_secret.encode('utf-8'), date) -        k_region = aws_hmac_digest(k_date, self._AWS_REGION) -        k_service = aws_hmac_digest(k_region, self._AWS_SERVICE) -        k_signing = aws_hmac_digest(k_service, self._AWS_REQUEST) - -        signature = aws_hmac_hexdigest(k_signing, string_to_sign) - -        auth_header = ', '.join([ -            'AWS4-HMAC-SHA256 Credential=%s' % '/'.join( -                [access_key_id, date, self._AWS_REGION, self._AWS_SERVICE, self._AWS_REQUEST]), -            'SignedHeaders=%s' % self._AWS_SIGNED_HEADERS, -            'Signature=%s' % signature, -        ]) - -        mcp_id = self._download_json( -            'https://%s%s' % (self._SNI_HOST, uri), video_id, headers={ -                'Accept': '*/*', -                'Referer': url, -                'Authorization': auth_header, -                'X-Amz-Date': datetime_now, -                'X-Amz-Security-Token': session_token, -                'X-Api-Key': self._AWS_API_KEY, -            })['results'][0]['mcpId'] +        mcp_id = self._aws_execute_api({ +            'uri': '/1/web/brands/%s/episodes/scrid/%s' % (self._SNI_TABLE[site_id], video_id), +            'access_key': get('AccessKeyId'), +            'secret_key': get('SecretAccessKey'), +            'session_token': get('SessionToken'), +        }, video_id)['results'][0]['mcpId']          return self.url_result(              smuggle_url( | 
