mirror of
https://github.com/FlareSolverr/FlareSolverr.git
synced 2025-12-06 17:48:40 +01:00
Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8a8b9415c3 | ||
|
|
16722ef963 |
@@ -1,5 +1,8 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## v3.4.3 (2025/10/28)
|
||||||
|
* Update proxy extension
|
||||||
|
|
||||||
## v3.4.2 (2025/10/09)
|
## v3.4.2 (2025/10/09)
|
||||||
* Bump dependencies & CI actions. Thanks @flowerey
|
* Bump dependencies & CI actions. Thanks @flowerey
|
||||||
* Add optional wait time after resolving the challenge before returning. Thanks @kennedyoliveira
|
* Add optional wait time after resolving the challenge before returning. Thanks @kennedyoliveira
|
||||||
|
|||||||
10
Dockerfile
10
Dockerfile
@@ -67,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.2 .
|
# docker build -t ngosang/flaresolverr:3.4.3 .
|
||||||
# docker run -p 8191:8191 ngosang/flaresolverr:3.4.2
|
# docker run -p 8191:8191 ngosang/flaresolverr:3.4.3
|
||||||
|
|
||||||
# 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.2 --platform linux/386,linux/amd64,linux/arm/v7,linux/arm64/v8 .
|
# docker buildx build -t ngosang/flaresolverr:3.4.3 --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.2 --platform linux/arm/v7 --load .
|
# docker buildx build -t ngosang/flaresolverr:3.4.3 --platform linux/arm/v7 --load .
|
||||||
# docker run -p 8191:8191 --platform linux/arm/v7 ngosang/flaresolverr:3.4.2
|
# docker run -p 8191:8191 --platform linux/arm/v7 ngosang/flaresolverr:3.4.3
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "flaresolverr",
|
"name": "flaresolverr",
|
||||||
"version": "3.4.2",
|
"version": "3.4.3",
|
||||||
"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"
|
||||||
|
|||||||
14
src/utils.py
14
src/utils.py
@@ -58,18 +58,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 +157,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']
|
||||||
|
|||||||
Reference in New Issue
Block a user