1
0
mirror of https://codeberg.org/polarisfm/youtube-dl synced 2024-11-26 18:34:32 +01:00

auth fix.

This commit is contained in:
Unknown 2020-08-07 01:28:23 +02:00
parent a58f3e7777
commit c68a4ae679

View File

@ -4,6 +4,7 @@ from __future__ import unicode_literals
import itertools import itertools
import re import re
import json import json
import random
from .common import ( from .common import (
InfoExtractor, InfoExtractor,
@ -312,9 +313,9 @@ class SoundcloudIE(InfoExtractor):
def _real_initialize(self): def _real_initialize(self):
self._CLIENT_ID = self._downloader.cache.load('soundcloud', 'client_id') or "T5R4kgWS2PRf6lzLyIravUMnKlbIxQag" # 'EXLwg5lHTO2dslU5EePe3xkw0m1h86Cd' # 'YUKXoArFcqrlQn9tfNHvvyfnDISj04zk' self._CLIENT_ID = self._downloader.cache.load('soundcloud', 'client_id') or "T5R4kgWS2PRf6lzLyIravUMnKlbIxQag" # 'EXLwg5lHTO2dslU5EePe3xkw0m1h86Cd' # 'YUKXoArFcqrlQn9tfNHvvyfnDISj04zk'
self._USER_AGENT = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/84.0.4147.105 Safari/537.36"
self._login() self._login()
_USER_AGENT = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/84.0.4147.105 Safari/537.36"
_API_AUTH_QUERY_TEMPLATE = '?client_id=%s' _API_AUTH_QUERY_TEMPLATE = '?client_id=%s'
_API_AUTH_URL_PW = 'https://api-auth.soundcloud.com/web-auth/sign-in/password%s' _API_AUTH_URL_PW = 'https://api-auth.soundcloud.com/web-auth/sign-in/password%s'
_access_token = None _access_token = None
@ -326,6 +327,11 @@ class SoundcloudIE(InfoExtractor):
if username is None: if username is None:
return return
def genDevId():
def genNumBlock():
return ''.join([str(random.randrange(10)) for i in range(6)])
return '-'.join([genNumBlock() for i in range(4)])
payload = { payload = {
'client_id': self._CLIENT_ID, 'client_id': self._CLIENT_ID,
'recaptcha_pubkey': 'null', 'recaptcha_pubkey': 'null',
@ -335,7 +341,7 @@ class SoundcloudIE(InfoExtractor):
'password': password 'password': password
}, },
'signature': self.sign(username, password, self._CLIENT_ID), 'signature': self.sign(username, password, self._CLIENT_ID),
'device_id': '00000-000000-000000-000000', 'device_id': genDevId(),
'user_agent': self._USER_AGENT 'user_agent': self._USER_AGENT
} }
@ -349,7 +355,7 @@ class SoundcloudIE(InfoExtractor):
self._HEADERS = {'Authorization': 'OAuth ' + self._access_token} self._HEADERS = {'Authorization': 'OAuth ' + self._access_token}
# signature generation # signature generation
def sign(self, user, pw, clid="T5R4kgWS2PRf6lzLyIravUMnKlbIxQag"): def sign(self, user, pw, clid):
a = 33 a = 33
i = 1 i = 1
s = 440123 s = 440123