[adn] fix extraction
This commit is contained in:
		@@ -1,8 +1,11 @@
 | 
			
		||||
# coding: utf-8
 | 
			
		||||
from __future__ import unicode_literals
 | 
			
		||||
 | 
			
		||||
import base64
 | 
			
		||||
import binascii
 | 
			
		||||
import json
 | 
			
		||||
import os
 | 
			
		||||
import random
 | 
			
		||||
 | 
			
		||||
from .common import InfoExtractor
 | 
			
		||||
from ..aes import aes_cbc_decrypt
 | 
			
		||||
@@ -12,9 +15,12 @@ from ..compat import (
 | 
			
		||||
)
 | 
			
		||||
from ..utils import (
 | 
			
		||||
    bytes_to_intlist,
 | 
			
		||||
    bytes_to_long,
 | 
			
		||||
    ExtractorError,
 | 
			
		||||
    float_or_none,
 | 
			
		||||
    intlist_to_bytes,
 | 
			
		||||
    long_to_bytes,
 | 
			
		||||
    pkcs1pad,
 | 
			
		||||
    srt_subtitles_timecode,
 | 
			
		||||
    strip_or_none,
 | 
			
		||||
    urljoin,
 | 
			
		||||
@@ -35,6 +41,7 @@ class ADNIE(InfoExtractor):
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
    _BASE_URL = 'http://animedigitalnetwork.fr'
 | 
			
		||||
    _RSA_KEY = (0xc35ae1e4356b65a73b551493da94b8cb443491c0aa092a357a5aee57ffc14dda85326f42d716e539a34542a0d3f363adf16c5ec222d713d5997194030ee2e4f0d1fb328c01a81cf6868c090d50de8e169c6b13d1675b9eeed1cbc51e1fffca9b38af07f37abd790924cd3bee59d0257cfda4fe5f3f0534877e21ce5821447d1b, 65537)
 | 
			
		||||
 | 
			
		||||
    def _get_subtitles(self, sub_path, video_id):
 | 
			
		||||
        if not sub_path:
 | 
			
		||||
@@ -42,16 +49,14 @@ class ADNIE(InfoExtractor):
 | 
			
		||||
 | 
			
		||||
        enc_subtitles = self._download_webpage(
 | 
			
		||||
            urljoin(self._BASE_URL, sub_path),
 | 
			
		||||
            video_id, fatal=False, headers={
 | 
			
		||||
                'User-Agent': 'Mozilla/5.0 (X11; Linux x86_64; rv:53.0) Gecko/20100101 Firefox/53.0',
 | 
			
		||||
            })
 | 
			
		||||
            video_id, fatal=False)
 | 
			
		||||
        if not enc_subtitles:
 | 
			
		||||
            return None
 | 
			
		||||
 | 
			
		||||
        # http://animedigitalnetwork.fr/components/com_vodvideo/videojs/adn-vjs.min.js
 | 
			
		||||
        dec_subtitles = intlist_to_bytes(aes_cbc_decrypt(
 | 
			
		||||
            bytes_to_intlist(compat_b64decode(enc_subtitles[24:])),
 | 
			
		||||
            bytes_to_intlist(b'\xc8\x6e\x06\xbc\xbe\xc6\x49\xf5\x88\x0d\xc8\x47\xc4\x27\x0c\x60'),
 | 
			
		||||
            bytes_to_intlist(binascii.unhexlify(self._K + '9032ad7083106400')),
 | 
			
		||||
            bytes_to_intlist(compat_b64decode(enc_subtitles[:24]))
 | 
			
		||||
        ))
 | 
			
		||||
        subtitles_json = self._parse_json(
 | 
			
		||||
@@ -112,11 +117,24 @@ class ADNIE(InfoExtractor):
 | 
			
		||||
        error = None
 | 
			
		||||
        if not links:
 | 
			
		||||
            links_url = player_config.get('linksurl') or options['videoUrl']
 | 
			
		||||
            links_data = self._download_json(urljoin(
 | 
			
		||||
                self._BASE_URL, links_url), video_id)
 | 
			
		||||
            token = options['token']
 | 
			
		||||
            self._K = ''.join([random.choice('0123456789abcdef') for _ in range(16)])
 | 
			
		||||
            message = bytes_to_intlist(json.dumps({
 | 
			
		||||
                'k': self._K,
 | 
			
		||||
                'e': 60,
 | 
			
		||||
                't': token,
 | 
			
		||||
            }))
 | 
			
		||||
            padded_message = intlist_to_bytes(pkcs1pad(message, 128))
 | 
			
		||||
            n, e = self._RSA_KEY
 | 
			
		||||
            encrypted_message = long_to_bytes(pow(bytes_to_long(padded_message), e, n))
 | 
			
		||||
            authorization = base64.b64encode(encrypted_message).decode()
 | 
			
		||||
            links_data = self._download_json(
 | 
			
		||||
                urljoin(self._BASE_URL, links_url), video_id, headers={
 | 
			
		||||
                    'Authorization': 'Bearer ' + authorization,
 | 
			
		||||
                })
 | 
			
		||||
            links = links_data.get('links') or {}
 | 
			
		||||
            metas = metas or links_data.get('meta') or {}
 | 
			
		||||
            sub_path = sub_path or links_data.get('subtitles')
 | 
			
		||||
            sub_path = (sub_path or links_data.get('subtitles')) + '&token=' + token
 | 
			
		||||
            error = links_data.get('error')
 | 
			
		||||
        title = metas.get('title') or video_info['title']
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user