github/gallery-dl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[pixiv] fix authentication

Browse Source
This commit is contained in:
Mike Fährmann
2019-09-02 22:34:04 +02:00
parent 6f3df3999a
commit f9285f99e6
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
gallery_dl/extractor/pixiv.py
View File

@@ -12,6 +12,7 @@ from .common import Extractor, Message
from .. import text, exception from .. import text, exception
from ..cache import cache from ..cache import cache
from datetime import datetime, timedelta from datetime import datetime, timedelta
import hashlib
class PixivExtractor(Extractor): class PixivExtractor(Extractor):
@@ -395,6 +396,8 @@ class PixivAppAPI():
""" """
CLIENT_ID = "MOBrBDS8blbauoSck0ZfDbtuzpyT" CLIENT_ID = "MOBrBDS8blbauoSck0ZfDbtuzpyT"
CLIENT_SECRET = "lsACyCD94FhDUtGTXi3QzcFE2uU1hqtDaKeqrdwj" CLIENT_SECRET = "lsACyCD94FhDUtGTXi3QzcFE2uU1hqtDaKeqrdwj"
HASH_SECRET = ("28c1fdd170a5204386cb1313c7077b34"
"f83e4aaf4aa829ce78c231e05b0bae2c")
def __init__(self, extractor): def __init__(self, extractor):
self.extractor = extractor self.extractor = extractor
@@ -406,7 +409,6 @@ class PixivAppAPI():
"client-id", self.CLIENT_ID) "client-id", self.CLIENT_ID)
self.client_secret = extractor.config( self.client_secret = extractor.config(
"client-secret", self.CLIENT_SECRET) "client-secret", self.CLIENT_SECRET)
extractor.session.headers.update({ extractor.session.headers.update({
"App-OS": "ios", "App-OS": "ios",
"App-OS-Version": "10.3.1", "App-OS-Version": "10.3.1",
@@ -440,8 +442,15 @@ class PixivAppAPI():
data["username"] = username data["username"] = username
data["password"] = password data["password"] = password
time = datetime.utcnow().strftime("%Y-%m-%dT%H:%M:%S+00:00")
headers = {
"X-Client-Time": time,
"X-Client-Hash": hashlib.md5(
(time + self.HASH_SECRET).encode()).hexdigest(),
}
response = self.extractor.request( response = self.extractor.request(
url, method="POST", data=data, fatal=False) url, method="POST", headers=headers, data=data, fatal=False)
if response.status_code >= 400: if response.status_code >= 400:
raise exception.AuthenticationError() raise exception.AuthenticationError()