Compare commits

...

20 Commits

Author SHA1 Message Date
ilike2burnthing
ff65b7cc68 Bump version 3.4.6 (#1633) 2025-11-29 02:42:42 +00:00
Azizul Haque Ananto
409e0844a7 Add disable image, css, fonts option with CDP (#1626)
Co-authored-by: ilike2burnthing <59480337+ilike2burnthing@users.noreply.github.com>
2025-11-29 02:27:05 +00:00
ilike2burnthing
368d5d4e05 Update README.md 2025-11-26 00:15:20 +00:00
ilike2burnthing
c7505e3cbf Revert to Python v3.13 and bump FlareSolverr to 3.4.5 (#1617) 2025-11-11 01:58:14 +00:00
ilike2burnthing
5a27090abe Fix Dockerfile casing 2025-11-06 02:11:28 +00:00
flower
e505ea4fe4 Fix changelog building (#1611) 2025-11-06 00:52:46 +00:00
ilike2burnthing
63b6fc53e3 Bump version 3.4.4 (#1609) 2025-11-04 23:04:55 +00:00
flower
8d72617219 Bump dependencies, Chrome, and some other general fixes (#1607)
Co-authored-by: ilike2burnthing <59480337+ilike2burnthing@users.noreply.github.com>
2025-11-04 22:49:32 +00:00
ilike2burnthing
8a8b9415c3 Bump version 3.4.3 (#1601) 2025-10-28 10:21:38 +00:00
ilike2burnthing
16722ef963 Update proxy extension. Fixes #1534 2025-10-28 00:01:30 +00:00
ilike2burnthing
bbc24e9d86 Bump version 3.4.2 (#1590) 2025-10-09 20:05:32 +01:00
acg5159
7dfdfc5e33 Add log file support (#1480)
Co-authored-by: ilike2burnthing <59480337+ilike2burnthing@users.noreply.github.com>
2025-10-09 19:55:32 +01:00
Esteban Thilliez
136422c85c Add returnScreenshot parameter to screenshot the final web page (#1439) 2025-10-08 10:59:39 +01:00
flower
05a72f2709 bump: dependencies (#1585) 2025-10-05 16:25:13 +01:00
flower
da810830da Bump prometheus-client to 0.23.1 (#1583) 2025-10-02 12:32:01 +01:00
Warrenberberd
d27f57c27c Add quote protection for password containing it (#858)
Co-authored-by: ilike2burnthing <59480337+ilike2burnthing@users.noreply.github.com>
2025-10-01 06:46:08 +01:00
eZ4RK0
a916d93779 Handle empty string and keys without value in postData. resolves #1548 (#1550) 2025-10-01 04:56:57 +01:00
Kishan Joshi
0d889cb0b2 Add proxy envs (#1499)
Co-authored-by: ilike2burnthing <59480337+ilike2burnthing@users.noreply.github.com>
2025-09-20 13:43:58 +01:00
Kennedy Oliveira
d430404de8 Add optional wait time after resolving the challenge before returning (#1046)
Co-authored-by: ilike2burnthing <59480337+ilike2burnthing@users.noreply.github.com>
2025-09-20 04:59:16 +01:00
flower
d3b1ba6e88 Bump dependencies & CI actions (#1578) 2025-09-18 21:20:15 +01:00
19 changed files with 203 additions and 107 deletions

View File

@@ -1,4 +1,4 @@
name: autotag name: Autotag
on: on:
push: push:
@@ -9,11 +9,10 @@ jobs:
tag-release: tag-release:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- - name: Checkout repository
name: Checkout uses: actions/checkout@v5
uses: actions/checkout@v4
- - name: Auto Tag
name: Auto Tag
uses: Klemensas/action-autotag@stable uses: Klemensas/action-autotag@stable
with: with:
GITHUB_TOKEN: "${{ secrets.GH_PAT }}" GITHUB_TOKEN: "${{ secrets.GH_PAT }}"

View File

@@ -1,4 +1,4 @@
name: release-docker name: Docker release
on: on:
push: push:
@@ -15,10 +15,10 @@ concurrency:
jobs: jobs:
build-docker-images: build-docker-images:
if: ${{ !github.event.pull_request.head.repo.fork }} if: ${{ !github.event.pull_request.head.repo.fork }}
runs-on: ubuntu-24.04 runs-on: ubuntu-latest
steps: steps:
- name: Checkout - name: Checkout repository
uses: actions/checkout@v4 uses: actions/checkout@v5
- name: Downcase repo - name: Downcase repo
run: echo REPOSITORY=$(echo ${{ github.repository }} | tr '[:upper:]' '[:lower:]') >> $GITHUB_ENV run: echo REPOSITORY=$(echo ${{ github.repository }} | tr '[:upper:]' '[:lower:]') >> $GITHUB_ENV
@@ -43,8 +43,8 @@ jobs:
uses: docker/setup-buildx-action@v3 uses: docker/setup-buildx-action@v3
- name: Login to DockerHub - name: Login to DockerHub
uses: docker/login-action@v3
if: github.event_name != 'pull_request' if: github.event_name != 'pull_request'
uses: docker/login-action@v3
with: with:
username: ${{ secrets.DOCKERHUB_USERNAME }} username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }} password: ${{ secrets.DOCKERHUB_TOKEN }}

View File

@@ -1,4 +1,4 @@
name: release name: Release
on: on:
push: push:
@@ -8,88 +8,56 @@ on:
jobs: jobs:
create-release: create-release:
name: Create release name: Create release
runs-on: ubuntu-24.04 runs-on: ubuntu-latest
steps: steps:
- name: Checkout code - name: Checkout repository
uses: actions/checkout@v4 uses: actions/checkout@v5
with: with:
fetch-depth: 0 # get all commits, branches and tags (required for the changelog) fetch-depth: 0
- name: Build changelog - name: Build changelog
id: github_changelog id: github_changelog
run: | run: |
changelog=$(git log $(git tag | tail -2 | head -1)..HEAD --no-merges --oneline) changelog=$(git log $(git tag | tail -2 | head -1)..HEAD --no-merges --oneline)
changelog="${changelog//'%'/'%25'}" echo "changelog<<EOF" >> $GITHUB_OUTPUT
changelog="${changelog//$'\n'/'%0A'}" echo "$changelog" >> $GITHUB_OUTPUT
changelog="${changelog//$'\r'/'%0D'}" echo "EOF" >> $GITHUB_OUTPUT
echo "##[set-output name=changelog;]${changelog}"
- name: Create release - name: Create release
id: create_release uses: softprops/action-gh-release@v2
uses: actions/create-release@v1
env:
GITHUB_TOKEN: ${{ secrets.GH_PAT }}
with: with:
tag_name: ${{ github.ref }}
release_name: ${{ github.ref }}
body: ${{ steps.github_changelog.outputs.changelog }} body: ${{ steps.github_changelog.outputs.changelog }}
draft: false env:
prerelease: false GITHUB_TOKEN: ${{ secrets.GH_PAT }}
build-linux-package: build-package:
name: Build Linux binary name: Build binaries
needs: create-release needs: create-release
runs-on: ubuntu-24.04 runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, windows-latest]
steps: steps:
- name: Checkout code - name: Checkout repository
uses: actions/checkout@v4 uses: actions/checkout@v5
with: with:
fetch-depth: 0 # get all commits, branches and tags (required for the changelog) fetch-depth: 0
- name: Setup Python - name: Setup Python
uses: actions/setup-python@v5 uses: actions/setup-python@v6
with: with:
python-version: "3.13" python-version: "3.13"
- name: Build artifacts - name: Build artifacts
run: | run: |
python -m pip install -r requirements.txt python -m pip install -r requirements.txt
python -m pip install pyinstaller==6.14.2 python -m pip install pyinstaller==6.16.0
cd src cd src
python build_package.py python build_package.py
- name: Upload release artifacts - name: Upload release artifacts
uses: alexellis/upload-assets@0.4.1 uses: softprops/action-gh-release@v2
with:
files: ./dist/flaresolverr_*
env: env:
GITHUB_TOKEN: ${{ secrets.GH_PAT }} GITHUB_TOKEN: ${{ secrets.GH_PAT }}
with:
asset_paths: '["./dist/flaresolverr_*"]'
build-windows-package:
name: Build Windows binary
needs: create-release
runs-on: windows-2022
steps:
- name: Checkout code
uses: actions/checkout@v4
with:
fetch-depth: 0 # get all commits, branches and tags (required for the changelog)
- name: Setup Python
uses: actions/setup-python@v5
with:
python-version: "3.13"
- name: Build artifacts
run: |
python -m pip install -r requirements.txt
python -m pip install pyinstaller==6.14.2
cd src
python build_package.py
- name: Upload release artifacts
uses: alexellis/upload-assets@0.4.1
env:
GITHUB_TOKEN: ${{ secrets.GH_PAT }}
with:
asset_paths: '["./dist/flaresolverr_*"]'

View File

@@ -1,5 +1,26 @@
# Changelog # Changelog
## v3.4.6 (2025/11/29)
* Add disable image, css, fonts option with CDP. Thanks @Ananto30
## v3.4.5 (2025/11/11)
* Revert to Python v3.13
## v3.4.4 (2025/11/04)
* Bump dependencies, Chromium, and some other general fixes. Thanks @flowerey
## v3.4.3 (2025/10/28)
* Update proxy extension
## v3.4.2 (2025/10/09)
* Bump dependencies & CI actions. Thanks @flowerey
* Add optional wait time after resolving the challenge before returning. Thanks @kennedyoliveira
* Add proxy ENVs. Thanks @Robokishan
* Handle empty string and keys without value in postData. Thanks @eZ4RK0
* Add quote protection for password containing it. Thanks @warrenberberd
* Add returnScreenshot parameter to screenshot the final web page. Thanks @estebanthi
* Add log file support. Thanks @acg5159
## v3.4.1 (2025/09/15) ## v3.4.1 (2025/09/15)
* Fix regex pattern syntax in utils.py * Fix regex pattern syntax in utils.py
* Change access denied title check to use startswith * Change access denied title check to use startswith

View File

@@ -1,4 +1,4 @@
FROM python:3.13-slim-bookworm as builder FROM python:3.13-slim-bookworm AS builder
# Build dummy packages to skip installing them and their dependencies # Build dummy packages to skip installing them and their dependencies
RUN apt-get update \ RUN apt-get update \
@@ -38,7 +38,12 @@ RUN dpkg -i /libgl1-mesa-dri.deb \
# Create flaresolverr user # Create flaresolverr user
&& useradd --home-dir /app --shell /bin/sh flaresolverr \ && useradd --home-dir /app --shell /bin/sh flaresolverr \
&& mv /usr/bin/chromedriver chromedriver \ && mv /usr/bin/chromedriver chromedriver \
&& chown -R flaresolverr:flaresolverr . && chown -R flaresolverr:flaresolverr . \
# Create config dir
&& mkdir /config \
&& chown flaresolverr:flaresolverr /config
VOLUME /config
# Install Python dependencies # Install Python dependencies
COPY requirements.txt . COPY requirements.txt .
@@ -62,17 +67,17 @@ ENTRYPOINT ["/usr/bin/dumb-init", "--"]
CMD ["/usr/local/bin/python", "-u", "/app/flaresolverr.py"] CMD ["/usr/local/bin/python", "-u", "/app/flaresolverr.py"]
# Local build # Local build
# docker build -t ngosang/flaresolverr:3.4.1 . # docker build -t ngosang/flaresolverr:3.4.6 .
# docker run -p 8191:8191 ngosang/flaresolverr:3.4.1 # docker run -p 8191:8191 ngosang/flaresolverr:3.4.6
# Multi-arch build # Multi-arch build
# docker run --rm --privileged multiarch/qemu-user-static --reset -p yes # docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
# docker buildx create --use # docker buildx create --use
# docker buildx build -t ngosang/flaresolverr:3.4.1 --platform linux/386,linux/amd64,linux/arm/v7,linux/arm64/v8 . # docker buildx build -t ngosang/flaresolverr:3.4.6 --platform linux/386,linux/amd64,linux/arm/v7,linux/arm64/v8 .
# add --push to publish in DockerHub # add --push to publish in DockerHub
# Test multi-arch build # Test multi-arch build
# docker run --rm --privileged multiarch/qemu-user-static --reset -p yes # docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
# docker buildx create --use # docker buildx create --use
# docker buildx build -t ngosang/flaresolverr:3.4.1 --platform linux/arm/v7 --load . # docker buildx build -t ngosang/flaresolverr:3.4.6 --platform linux/arm/v7 --load .
# docker run -p 8191:8191 --platform linux/arm/v7 ngosang/flaresolverr:3.4.1 # docker run -p 8191:8191 --platform linux/arm/v7 ngosang/flaresolverr:3.4.6

View File

@@ -1,6 +1,6 @@
MIT License MIT License
Copyright (c) 2023 Diego Heras (ngosang / ngosang@hotmail.es) Copyright (c) 2025 Diego Heras (ngosang / ngosang@hotmail.es)
Permission is hereby granted, free of charge, to any person obtaining a copy Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal of this software and associated documentation files (the "Software"), to deal

View File

@@ -187,7 +187,10 @@ session. When you no longer need to use a session you should make sure to close
| maxTimeout | Optional, default value 60000. Max timeout to solve the challenge in milliseconds. | | maxTimeout | Optional, default value 60000. Max timeout to solve the challenge in milliseconds. |
| cookies | Optional. Will be used by the headless browser. Eg: `"cookies": [{"name": "cookie1", "value": "value1"}, {"name": "cookie2", "value": "value2"}]`. | | cookies | Optional. Will be used by the headless browser. Eg: `"cookies": [{"name": "cookie1", "value": "value1"}, {"name": "cookie2", "value": "value2"}]`. |
| returnOnlyCookies | Optional, default false. Only returns the cookies. Response data, headers and other parts of the response are removed. | | returnOnlyCookies | Optional, default false. Only returns the cookies. Response data, headers and other parts of the response are removed. |
| returnScreenshot | Optional, default false. Captures a screenshot of the final rendered page after all challenges and waits are completed. The screenshot is returned as a Base64-encoded PNG string in the `screenshot` field of the response. |
| proxy | Optional, default disabled. Eg: `"proxy": {"url": "http://127.0.0.1:8888"}`. You must include the proxy schema in the URL: `http://`, `socks4://` or `socks5://`. Authorization (username/password) is not supported. (When the `session` parameter is set, the proxy is ignored; a session specific proxy can be set in `sessions.create`.) | | proxy | Optional, default disabled. Eg: `"proxy": {"url": "http://127.0.0.1:8888"}`. You must include the proxy schema in the URL: `http://`, `socks4://` or `socks5://`. Authorization (username/password) is not supported. (When the `session` parameter is set, the proxy is ignored; a session specific proxy can be set in `sessions.create`.) |
| waitInSeconds | Optional, default none. Length to wait in seconds after solving the challenge, and before returning the results. Useful to allow it to load dynamic content. |
| disableMedia | Optional, default false. When true FlareSolverr will prevent media resources (images, CSS, and fonts) from being loaded to speed up navigation. |
> **Warning** > **Warning**
> If you want to use Cloudflare clearance cookie in your scripts, make sure you use the FlareSolverr User-Agent too. If they don't match you will see the challenge. > If you want to use Cloudflare clearance cookie in your scripts, make sure you use the FlareSolverr User-Agent too. If they don't match you will see the challenge.
@@ -264,11 +267,16 @@ This is the same as `request.get` but it takes one more param:
| Name | Default | Notes | | Name | Default | Notes |
|--------------------|------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------| |--------------------|------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------|
| LOG_LEVEL | info | Verbosity of the logging. Use `LOG_LEVEL=debug` for more information. | | LOG_LEVEL | info | Verbosity of the logging. Use `LOG_LEVEL=debug` for more information. |
| LOG_FILE | none | Path to capture log to file. Example: `/config/flaresolver.log`. |
| LOG_HTML | false | Only for debugging. If `true` all HTML that passes through the proxy will be logged to the console in `debug` level. | | LOG_HTML | false | Only for debugging. If `true` all HTML that passes through the proxy will be logged to the console in `debug` level. |
| PROXY_URL | none | URL for proxy. Will be overwritten by `request` or `sessions` proxy, if used. Example: `http://127.0.0.1:8080`. |
| PROXY_USERNAME | none | Username for proxy. Will be overwritten by `request` or `sessions` proxy, if used. Example: `testuser`. |
| PROXY_PASSWORD | none | Password for proxy. Will be overwritten by `request` or `sessions` proxy, if used. Example: `testpass`. |
| CAPTCHA_SOLVER | none | Captcha solving method. It is used when a captcha is encountered. See the Captcha Solvers section. | | CAPTCHA_SOLVER | none | Captcha solving method. It is used when a captcha is encountered. See the Captcha Solvers section. |
| TZ | UTC | Timezone used in the logs and the web browser. Example: `TZ=Europe/London`. | | TZ | UTC | Timezone used in the logs and the web browser. Example: `TZ=Europe/London`. |
| LANG | none | Language used in the web browser. Example: `LANG=en_GB`. | | LANG | none | Language used in the web browser. Example: `LANG=en_GB`. |
| HEADLESS | true | Only for debugging. To run the web browser in headless mode or visible. | | HEADLESS | true | Only for debugging. To run the web browser in headless mode or visible. |
| DISABLE_MEDIA | false | To disable loading images, CSS, and other media in the web browser to save network bandwidth. |
| TEST_URL | https://www.google.com | FlareSolverr makes a request on start to make sure the web browser is working. You can change that URL if it is blocked in your country. | | TEST_URL | https://www.google.com | FlareSolverr makes a request on start to make sure the web browser is working. You can change that URL if it is blocked in your country. |
| PORT | 8191 | Listening port. You don't need to change this if you are running on Docker. | | PORT | 8191 | Listening port. You don't need to change this if you are running on Docker. |
| HOST | 0.0.0.0 | Listening interface. You don't need to change this if you are running on Docker. | | HOST | 0.0.0.0 | Listening interface. You don't need to change this if you are running on Docker. |
@@ -321,3 +329,4 @@ to the file name of one of the adapters inside the `/captcha` directory.
## Related projects ## Related projects
* C# implementation => https://github.com/FlareSolverr/FlareSolverrSharp * C# implementation => https://github.com/FlareSolverr/FlareSolverrSharp

View File

@@ -7,9 +7,12 @@ services:
container_name: flaresolverr container_name: flaresolverr
environment: environment:
- LOG_LEVEL=${LOG_LEVEL:-info} - LOG_LEVEL=${LOG_LEVEL:-info}
- LOG_FILE=${LOG_FILE:-none}
- LOG_HTML=${LOG_HTML:-false} - LOG_HTML=${LOG_HTML:-false}
- CAPTCHA_SOLVER=${CAPTCHA_SOLVER:-none} - CAPTCHA_SOLVER=${CAPTCHA_SOLVER:-none}
- TZ=Europe/London - TZ=Europe/London
ports: ports:
- "${PORT:-8191}:8191" - "${PORT:-8191}:8191"
volumes:
- /var/lib/flaresolver:/config
restart: unless-stopped restart: unless-stopped

View File

@@ -1,6 +1,6 @@
{ {
"name": "flaresolverr", "name": "flaresolverr",
"version": "3.4.1", "version": "3.4.6",
"description": "Proxy server to bypass Cloudflare protection", "description": "Proxy server to bypass Cloudflare protection",
"author": "Diego Heras (ngosang / ngosang@hotmail.es)", "author": "Diego Heras (ngosang / ngosang@hotmail.es)",
"license": "MIT" "license": "MIT"

View File

@@ -1,14 +1,14 @@
bottle==0.13.4 bottle==0.13.4
waitress==3.0.2 waitress==3.0.2
selenium==4.34.2 selenium==4.38.0
func-timeout==4.3.5 func-timeout==4.3.5
prometheus-client==0.22.1 prometheus-client==0.23.1
# required by undetected_chromedriver # Required by undetected_chromedriver
requests==2.32.4 requests==2.32.5
certifi==2025.7.9 certifi==2025.10.5
websockets==15.0.1 websockets==15.0.1
packaging==25.0 packaging==25.0
# only required for linux and macos # Only required for Linux and macOS
xvfbwrapper==0.2.13; platform_system != "Windows" xvfbwrapper==0.2.15; platform_system != "Windows"
# only required for windows # Only required for Windows
pefile==2024.8.26; platform_system == "Windows" pefile==2024.8.26; platform_system == "Windows"

View File

@@ -5,7 +5,7 @@ import logging
def logger_plugin(callback): def logger_plugin(callback):
""" """
Bottle plugin to use logging module Bottle plugin to use logging module
http://bottlepy.org/docs/dev/plugindev.html https://bottlepy.org/docs/dev/plugindev.html
Wrap a Bottle request so that a log line is emitted after it's handled. Wrap a Bottle request so that a log line is emitted after it's handled.
(This decorator can be extended to take the desired logger as a param.) (This decorator can be extended to take the desired logger as a param.)

View File

@@ -18,7 +18,7 @@ def setup():
def prometheus_plugin(callback): def prometheus_plugin(callback):
""" """
Bottle plugin to expose Prometheus metrics Bottle plugin to expose Prometheus metrics
http://bottlepy.org/docs/dev/plugindev.html https://bottlepy.org/docs/dev/plugindev.html
""" """
def wrapper(*args, **kwargs): def wrapper(*args, **kwargs):
actual_response = callback(*args, **kwargs) actual_response = callback(*args, **kwargs)

View File

@@ -25,7 +25,7 @@ def clean_files():
def download_chromium(): def download_chromium():
# https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html?prefix=Linux_x64/ # https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html?prefix=Linux_x64/
revision = "1465706" if os.name == 'nt' else '1465706' revision = "1522586" if os.name == 'nt' else '1522586'
arch = 'Win_x64' if os.name == 'nt' else 'Linux_x64' arch = 'Win_x64' if os.name == 'nt' else 'Linux_x64'
dl_file = 'chrome-win' if os.name == 'nt' else 'chrome-linux' dl_file = 'chrome-win' if os.name == 'nt' else 'chrome-linux'
dl_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), os.pardir, 'dist_chrome') dl_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), os.pardir, 'dist_chrome')

View File

@@ -10,6 +10,7 @@ class ChallengeResolutionResultT:
response: str = None response: str = None
cookies: list = None cookies: list = None
userAgent: str = None userAgent: str = None
screenshot: str | None = None
def __init__(self, _dict): def __init__(self, _dict):
self.__dict__.update(_dict) self.__dict__.update(_dict)
@@ -41,8 +42,12 @@ class V1RequestBase(object):
url: str = None url: str = None
postData: str = None postData: str = None
returnOnlyCookies: bool = None returnOnlyCookies: bool = None
returnScreenshot: bool = 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
waitInSeconds: int = None
# Optional resource blocking flag (blocks images, CSS, and fonts)
disableMedia: bool = None
def __init__(self, _dict): def __init__(self, _dict):
self.__dict__.update(_dict) self.__dict__.update(_dict)

View File

@@ -13,6 +13,10 @@ from dtos import V1RequestBase
import flaresolverr_service import flaresolverr_service
import utils import utils
env_proxy_url = os.environ.get('PROXY_URL', None)
env_proxy_username = os.environ.get('PROXY_USERNAME', None)
env_proxy_password = os.environ.get('PROXY_PASSWORD', None)
class JSONErrorBottle(Bottle): class JSONErrorBottle(Bottle):
""" """
@@ -50,7 +54,14 @@ def controller_v1():
""" """
Controller v1 Controller v1
""" """
req = V1RequestBase(request.json) data = request.json or {}
if (('proxy' not in data or not data.get('proxy')) and env_proxy_url is not None and (env_proxy_username is None and env_proxy_password is None)):
logging.info('Using proxy URL ENV')
data['proxy'] = {"url": env_proxy_url}
if (('proxy' not in data or not data.get('proxy')) and env_proxy_url is not None and (env_proxy_username is not None or env_proxy_password is not None)):
logging.info('Using proxy URL, username & password ENVs')
data['proxy'] = {"url": env_proxy_url, "username": env_proxy_username, "password": env_proxy_password}
req = V1RequestBase(data)
res = flaresolverr_service.controller_v1_endpoint(req) res = flaresolverr_service.controller_v1_endpoint(req)
if res.__error_500__: if res.__error_500__:
response.status = 500 response.status = 500
@@ -70,12 +81,13 @@ if __name__ == "__main__":
# fix ssl certificates for compiled binaries # fix ssl certificates for compiled binaries
# https://github.com/pyinstaller/pyinstaller/issues/7229 # https://github.com/pyinstaller/pyinstaller/issues/7229
# https://stackoverflow.com/questions/55736855/how-to-change-the-cafile-argument-in-the-ssl-module-in-python3 # https://stackoverflow.com/q/55736855
os.environ["REQUESTS_CA_BUNDLE"] = certifi.where() os.environ["REQUESTS_CA_BUNDLE"] = certifi.where()
os.environ["SSL_CERT_FILE"] = certifi.where() os.environ["SSL_CERT_FILE"] = certifi.where()
# validate configuration # validate configuration
log_level = os.environ.get('LOG_LEVEL', 'info').upper() log_level = os.environ.get('LOG_LEVEL', 'info').upper()
log_file = os.environ.get('LOG_FILE', None)
log_html = utils.get_config_log_html() log_html = utils.get_config_log_html()
headless = utils.get_config_headless() headless = utils.get_config_headless()
server_host = os.environ.get('HOST', '0.0.0.0') server_host = os.environ.get('HOST', '0.0.0.0')
@@ -93,6 +105,13 @@ if __name__ == "__main__":
logging.StreamHandler(sys.stdout) logging.StreamHandler(sys.stdout)
] ]
) )
if log_file:
log_file = os.path.realpath(log_file)
log_path = os.path.dirname(log_file)
os.makedirs(log_path, exist_ok=True)
logging.getLogger().addHandler(logging.FileHandler(log_file))
# disable warning traces from urllib3 # disable warning traces from urllib3
logging.getLogger('urllib3').setLevel(logging.ERROR) logging.getLogger('urllib3').setLevel(logging.ERROR)
logging.getLogger('selenium.webdriver.remote.remote_connection').setLevel(logging.WARNING) logging.getLogger('selenium.webdriver.remote.remote_connection').setLevel(logging.WARNING)

View File

@@ -287,10 +287,36 @@ def _evil_logic(req: V1RequestBase, driver: WebDriver, method: str) -> Challenge
res.status = STATUS_OK res.status = STATUS_OK
res.message = "" res.message = ""
# optionally block resources like images/css/fonts using CDP
disable_media = utils.get_config_disable_media()
if req.disableMedia is not None:
disable_media = req.disableMedia
if disable_media:
block_urls = [
# Images
"*.png", "*.jpg", "*.jpeg", "*.gif", "*.webp", "*.bmp", "*.svg", "*.ico",
"*.PNG", "*.JPG", "*.JPEG", "*.GIF", "*.WEBP", "*.BMP", "*.SVG", "*.ICO",
"*.tiff", "*.tif", "*.jpe", "*.apng", "*.avif", "*.heic", "*.heif",
"*.TIFF", "*.TIF", "*.JPE", "*.APNG", "*.AVIF", "*.HEIC", "*.HEIF",
# Stylesheets
"*.css",
"*.CSS",
# Fonts
"*.woff", "*.woff2", "*.ttf", "*.otf", "*.eot",
"*.WOFF", "*.WOFF2", "*.TTF", "*.OTF", "*.EOT"
]
try:
logging.debug("Network.setBlockedURLs: %s", block_urls)
driver.execute_cdp_cmd("Network.enable", {})
driver.execute_cdp_cmd("Network.setBlockedURLs", {"urls": block_urls})
except Exception:
# if CDP commands are not available or fail, ignore and continue
logging.debug("Network.setBlockedURLs failed or unsupported on this webdriver")
# navigate to the page # navigate to the page
logging.debug(f'Navigating to... {req.url}') logging.debug(f"Navigating to... {req.url}")
if method == 'POST':
if method == "POST":
_post_request(req, driver) _post_request(req, driver)
else: else:
driver.get(req.url) driver.get(req.url)
@@ -390,18 +416,26 @@ def _evil_logic(req: V1RequestBase, driver: WebDriver, method: str) -> Challenge
if not req.returnOnlyCookies: if not req.returnOnlyCookies:
challenge_res.headers = {} # todo: fix, selenium not provides this info challenge_res.headers = {} # todo: fix, selenium not provides this info
if req.waitInSeconds and req.waitInSeconds > 0:
logging.info("Waiting " + str(req.waitInSeconds) + " seconds before returning the response...")
time.sleep(req.waitInSeconds)
challenge_res.response = driver.page_source challenge_res.response = driver.page_source
if req.returnScreenshot:
challenge_res.screenshot = driver.get_screenshot_as_base64()
res.result = challenge_res res.result = challenge_res
return res return res
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">' post_form = f'<form id="hackForm" action="{req.url}" method="POST">'
query_string = req.postData if req.postData[0] != '?' else req.postData[1:] query_string = req.postData if req.postData and req.postData[0] != '?' else req.postData[1:] if req.postData else ''
pairs = query_string.split('&') pairs = query_string.split('&')
for pair in pairs: for pair in pairs:
parts = pair.split('=') parts = pair.split('=', 1)
# noinspection PyBroadException # noinspection PyBroadException
try: try:
name = unquote(parts[0]) name = unquote(parts[0])
@@ -411,9 +445,11 @@ def _post_request(req: V1RequestBase, driver: WebDriver):
continue continue
# noinspection PyBroadException # noinspection PyBroadException
try: try:
value = unquote(parts[1]) value = unquote(parts[1]) if len(parts) > 1 else ''
except Exception: except Exception:
value = parts[1] value = parts[1] if len(parts) > 1 else ''
# Protection of " character, for syntax
value=value.replace('"','&quot;')
post_form += f'<input type="text" name="{escape(quote(name))}" value="{escape(quote(value))}"><br>' post_form += f'<input type="text" name="{escape(quote(name))}" value="{escape(quote(value))}"><br>'
post_form += '</form>' post_form += '</form>'
html_content = f""" html_content = f"""

View File

@@ -21,11 +21,11 @@ class TestFlareSolverr(unittest.TestCase):
proxy_socks_url = "socks5://127.0.0.1:1080" proxy_socks_url = "socks5://127.0.0.1:1080"
google_url = "https://www.google.com" google_url = "https://www.google.com"
post_url = "https://httpbin.org/post" post_url = "https://httpbin.org/post"
cloudflare_url = "https://nowsecure.nl" cloudflare_url = "https://nowsecure.nl/"
cloudflare_url_2 = "https://idope.se/torrent-list/harry/" cloudflare_url_2 = "https://idope.se/torrent-list/harry/"
ddos_guard_url = "https://anidex.info/" ddos_guard_url = "https://www.litres.ru/"
fairlane_url = "https://www.pararius.com/apartments/amsterdam" fairlane_url = "https://www.pararius.com/apartments/amsterdam"
custom_cloudflare_url = "https://www.muziekfabriek.org" custom_cloudflare_url = "https://www.muziekfabriek.org/"
cloudflare_blocked_url = "https://cpasbiens3.fr/index.php?do=search&subaction=search" cloudflare_blocked_url = "https://cpasbiens3.fr/index.php?do=search&subaction=search"
app = TestApp(flaresolverr.app) app = TestApp(flaresolverr.app)
@@ -92,6 +92,29 @@ class TestFlareSolverr(unittest.TestCase):
self.assertGreater(len(solution.cookies), 0) self.assertGreater(len(solution.cookies), 0)
self.assertIn("Chrome/", solution.userAgent) self.assertIn("Chrome/", solution.userAgent)
def test_v1_endpoint_request_get_disable_resources(self):
res = self.app.post_json("/v1", {
"cmd": "request.get",
"url": self.google_url,
"disableMedia": True
})
self.assertEqual(res.status_code, 200)
body = V1ResponseBase(res.json)
self.assertEqual(STATUS_OK, body.status)
self.assertEqual("Challenge not detected!", body.message)
self.assertGreater(body.startTimestamp, 10000)
self.assertGreaterEqual(body.endTimestamp, body.startTimestamp)
self.assertEqual(utils.get_flaresolverr_version(), body.version)
solution = body.solution
self.assertIn(self.google_url, solution.url)
self.assertEqual(solution.status, 200)
self.assertIs(len(solution.headers), 0)
self.assertIn("<title>Google</title>", solution.response)
self.assertGreater(len(solution.cookies), 0)
self.assertIn("Chrome/", solution.userAgent)
def test_v1_endpoint_request_get_cloudflare_js_1(self): def test_v1_endpoint_request_get_cloudflare_js_1(self):
res = self.app.post_json('/v1', { res = self.app.post_json('/v1', {
"cmd": "request.get", "cmd": "request.get",
@@ -162,7 +185,7 @@ class TestFlareSolverr(unittest.TestCase):
self.assertIn(self.ddos_guard_url, solution.url) self.assertIn(self.ddos_guard_url, solution.url)
self.assertEqual(solution.status, 200) self.assertEqual(solution.status, 200)
self.assertIs(len(solution.headers), 0) self.assertIs(len(solution.headers), 0)
self.assertIn("<title>AniDex</title>", solution.response) self.assertIn("<title>Литрес", solution.response)
self.assertGreater(len(solution.cookies), 0) self.assertGreater(len(solution.cookies), 0)
self.assertIn("Chrome/", solution.userAgent) self.assertIn("Chrome/", solution.userAgent)

View File

@@ -28,6 +28,10 @@ def get_config_headless() -> bool:
return os.environ.get('HEADLESS', 'true').lower() == 'true' return os.environ.get('HEADLESS', 'true').lower() == 'true'
def get_config_disable_media() -> bool:
return os.environ.get('DISABLE_MEDIA', 'false').lower() == 'true'
def get_flaresolverr_version() -> str: def get_flaresolverr_version() -> str:
global FLARESOLVERR_VERSION global FLARESOLVERR_VERSION
if FLARESOLVERR_VERSION is not None: if FLARESOLVERR_VERSION is not None:
@@ -58,18 +62,21 @@ def create_proxy_extension(proxy: dict) -> str:
manifest_json = """ manifest_json = """
{ {
"version": "1.0.0", "version": "1.0.0",
"manifest_version": 2, "manifest_version": 3,
"name": "Chrome Proxy", "name": "Chrome Proxy",
"permissions": [ "permissions": [
"proxy", "proxy",
"tabs", "tabs",
"unlimitedStorage",
"storage", "storage",
"<all_urls>",
"webRequest", "webRequest",
"webRequestBlocking" "webRequestAuthProvider"
], ],
"background": {"scripts": ["background.js"]}, "host_permissions": [
"<all_urls>"
],
"background": {
"service_worker": "background.js"
},
"minimum_chrome_version": "76.0.0" "minimum_chrome_version": "76.0.0"
} }
""" """
@@ -154,6 +161,7 @@ def get_webdriver(proxy: dict = None) -> WebDriver:
proxy_extension_dir = None proxy_extension_dir = None
if proxy and all(key in proxy for key in ['url', 'username', 'password']): if proxy and all(key in proxy for key in ['url', 'username', 'password']):
proxy_extension_dir = create_proxy_extension(proxy) proxy_extension_dir = create_proxy_extension(proxy)
options.add_argument("--disable-features=DisableLoadExtensionCommandLineSwitch")
options.add_argument("--load-extension=%s" % os.path.abspath(proxy_extension_dir)) options.add_argument("--load-extension=%s" % os.path.abspath(proxy_extension_dir))
elif proxy and 'url' in proxy: elif proxy and 'url' in proxy:
proxy_url = proxy['url'] proxy_url = proxy['url']

View File

@@ -1 +1 @@
WebTest==3.0.6 WebTest==3.0.7