implement '"user-agent": "browser"' (#2636)
This commit is contained in:
@@ -511,6 +511,9 @@ Default
|
|||||||
Description
|
Description
|
||||||
User-Agent header value to be used for HTTP requests.
|
User-Agent header value to be used for HTTP requests.
|
||||||
|
|
||||||
|
Setting this value to ``"browser"`` will try to automatically detect
|
||||||
|
and use the User-Agent used by the system's default browser.
|
||||||
|
|
||||||
Note: This option has no effect on `pixiv` extractors,
|
Note: This option has no effect on `pixiv` extractors,
|
||||||
as these need specific values to function correctly.
|
as these need specific values to function correctly.
|
||||||
|
|
||||||
@@ -520,7 +523,8 @@ extractor.*.browser
|
|||||||
Type
|
Type
|
||||||
``string``
|
``string``
|
||||||
Default
|
Default
|
||||||
``"firefox"`` for ``patreon``, ``null`` everywhere else
|
* ``"firefox"`` for ``patreon``, ``mangapark``, and ``mangasee``
|
||||||
|
* ``null`` everywhere else
|
||||||
Example
|
Example
|
||||||
* ``"chrome:macos"``
|
* ``"chrome:macos"``
|
||||||
Description
|
Description
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ import requests
|
|||||||
import threading
|
import threading
|
||||||
from requests.adapters import HTTPAdapter
|
from requests.adapters import HTTPAdapter
|
||||||
from .message import Message
|
from .message import Message
|
||||||
from .. import config, text, util, exception
|
from .. import config, text, util, cache, exception
|
||||||
|
|
||||||
|
|
||||||
class Extractor():
|
class Extractor():
|
||||||
@@ -262,9 +262,13 @@ class Extractor():
|
|||||||
ssl.OP_NO_TLSv1 | ssl.OP_NO_TLSv1_1)
|
ssl.OP_NO_TLSv1 | ssl.OP_NO_TLSv1_1)
|
||||||
ssl_ciphers = SSL_CIPHERS[browser]
|
ssl_ciphers = SSL_CIPHERS[browser]
|
||||||
else:
|
else:
|
||||||
headers["User-Agent"] = self.config("user-agent", (
|
useragent = self.config("user-agent")
|
||||||
"Mozilla/5.0 (Windows NT 10.0; Win64; x64; "
|
if useragent is None:
|
||||||
"rv:102.0) Gecko/20100101 Firefox/102.0"))
|
useragent = ("Mozilla/5.0 (Windows NT 10.0; Win64; x64; "
|
||||||
|
"rv:102.0) Gecko/20100101 Firefox/102.0")
|
||||||
|
elif useragent == "browser":
|
||||||
|
useragent = _browser_useragent()
|
||||||
|
headers["User-Agent"] = useragent
|
||||||
headers["Accept"] = "*/*"
|
headers["Accept"] = "*/*"
|
||||||
headers["Accept-Language"] = "en-US,en;q=0.5"
|
headers["Accept-Language"] = "en-US,en;q=0.5"
|
||||||
|
|
||||||
@@ -724,6 +728,36 @@ def _build_requests_adapter(ssl_options, ssl_ciphers, source_address):
|
|||||||
return adapter
|
return adapter
|
||||||
|
|
||||||
|
|
||||||
|
@cache.cache(maxage=86400)
|
||||||
|
def _browser_useragent():
|
||||||
|
"""Get User-Agent header from default browser"""
|
||||||
|
import webbrowser
|
||||||
|
import socket
|
||||||
|
|
||||||
|
server = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
||||||
|
server.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
|
||||||
|
server.bind(("127.0.0.1", 6414))
|
||||||
|
server.listen(1)
|
||||||
|
|
||||||
|
webbrowser.open("http://127.0.0.1:6414/user-agent")
|
||||||
|
|
||||||
|
client = server.accept()[0]
|
||||||
|
server.close()
|
||||||
|
|
||||||
|
for line in client.recv(1024).split(b"\r\n"):
|
||||||
|
key, _, value = line.partition(b":")
|
||||||
|
if key.strip().lower() == b"user-agent":
|
||||||
|
useragent = value.strip()
|
||||||
|
break
|
||||||
|
else:
|
||||||
|
useragent = b""
|
||||||
|
|
||||||
|
client.send(b"HTTP/1.1 200 OK\r\n\r\n" + useragent)
|
||||||
|
client.close()
|
||||||
|
|
||||||
|
return useragent.decode()
|
||||||
|
|
||||||
|
|
||||||
_adapter_cache = {}
|
_adapter_cache = {}
|
||||||
_browser_cookies = {}
|
_browser_cookies = {}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user