github/FlareSolverr
1
1
Fork 0
mirror of https://github.com/FlareSolverr/FlareSolverr.git synced 2025-06-08 20:45:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 7034e0f619d1bbae26bf78530819ad98ec4a8458 into ce5369dd413cd71a81ce38a5ccd379f6c9352e23

Browse Source
This commit is contained in:
undefined 2025-03-05 01:42:17 +07:00 committed by GitHub
commit 65dffb5807
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 50 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/dtos.py
View File

@ -41,6 +41,7 @@ class V1RequestBase(object):
url: str = None url: str = None
postData: str = None postData: str = None
returnOnlyCookies: bool = None returnOnlyCookies: bool = None
referer: str = None
download: bool = None # deprecated v2.0.0, not used download: bool = None # deprecated v2.0.0, not used
returnRawHtml: bool = None # deprecated v2.0.0, not used returnRawHtml: bool = None # deprecated v2.0.0, not used

67
src/flaresolverr_service.py
View File

@ -2,8 +2,9 @@ import logging
import platform import platform
import sys import sys
import time import time
import json
import base64
from datetime import timedelta from datetime import timedelta
from html import escape
from urllib.parse import unquote, quote from urllib.parse import unquote, quote
from func_timeout import FunctionTimedOut, func_timeout from func_timeout import FunctionTimedOut, func_timeout
@ -423,33 +424,53 @@ def _evil_logic(req: V1RequestBase, driver: WebDriver, method: str) -> Challenge
def _post_request(req: V1RequestBase, driver: WebDriver): def _post_request(req: V1RequestBase, driver: WebDriver):
post_form = f'<form id="hackForm" action="{req.url}" method="POST">' payload = dict()
query_string = req.postData if req.postData[0] != '?' else req.postData[1:] try:
pairs = query_string.split('&') payload = json.loads(req.postData)
for pair in pairs: except json.JSONDecodeError:
parts = pair.split('=') query_string = req.postData if req.postData[0] != '?' else req.postData[1:]
# noinspection PyBroadException pairs = query_string.split('&')
try: for pair in pairs:
name = unquote(parts[0]) parts = pair.split('=')
except Exception: # noinspection PyBroadException
name = parts[0] try:
if name == 'submit': name = unquote(parts[0])
continue except Exception:
# noinspection PyBroadException name = parts[0]
try: if name == 'submit':
value = unquote(parts[1]) continue
except Exception: # noinspection PyBroadException
value = parts[1] try:
post_form += f'<input type="text" name="{escape(quote(name))}" value="{escape(quote(value))}"><br>' value = unquote(parts[1])
post_form += '</form>' except Exception:
value = parts[1]
payload[name] = value
data = json.dumps({ "payload": payload, "referer": req.referer or '', "url": req.url }).replace('<', '\\<').replace('>', '\\>')
html_content = f""" html_content = f"""
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<body> <body>
{post_form} <form id="hackForm" method="POST"></form>
<script>document.getElementById('hackForm').submit();</script> <script>
const data = {data};
try {{
if (data.referer) window.history.replaceState('', null, data.referer);
}} catch (e) {{
// this requires --disable-web-security flag
}}
const form = document.getElementById('hackForm');
form.action = data.url;
for (const key in data.payload) {{
const input = document.createElement('textarea');
input.name = key;
input.value = data.payload[key];
form.appendChild(input);
}}
form.submit();
</script>
</body> </body>
</html>""" </html>"""
driver.get("data:text/html;charset=utf-8,{html_content}".format(html_content=html_content)) b64_content = base64.b64encode(html_content.encode('utf-8')).decode('ascii')
driver.get("data:text/html;base64,{b64_content}".format(b64_content=b64_content))
driver.start_session() driver.start_session()
driver.start_session() # required to bypass Cloudflare driver.start_session() # required to bypass Cloudflare

5
src/utils.py
View File

@ -149,6 +149,9 @@ def get_webdriver(proxy: dict = None) -> WebDriver:
# https://peter.sh/experiments/chromium-command-line-switches/#use-gl # https://peter.sh/experiments/chromium-command-line-switches/#use-gl
options.add_argument('--use-gl=swiftshader') options.add_argument('--use-gl=swiftshader')
if (os.environ.get('DISABLE_WEB_SECURITY', None) is not None):
options.add_argument('--disable-web-security')
language = os.environ.get('LANG', None) language = os.environ.get('LANG', None)
if language is not None: if language is not None:
options.add_argument('--accept-lang=%s' % language) options.add_argument('--accept-lang=%s' % language)
@ -172,7 +175,7 @@ def get_webdriver(proxy: dict = None) -> WebDriver:
if get_config_headless(): if get_config_headless():
if os.name == 'nt': if os.name == 'nt':
windows_headless = True windows_headless = True
else: elif not os.environ.get('DISPLAY', '') and not os.environ.get('WAYLAND_DISPLAY', ''):
start_xvfb_display() start_xvfb_display()
# For normal headless mode: # For normal headless mode:
# options.add_argument('--headless') # options.add_argument('--headless')