WebsiteBypass: Added custom ip/port for flaresolverr (#2680)

* add flaresolverr ip and port to websitebypass_config

add flaresolverr ip and port to websitebypass_config

* fix #2677

fix #2677

* Update cloudflare.lua

edit the script to skip checking flaresolverr if use_webdriver is set to false, and update logging

Author: alzamer2

lua/websitebypass/cloudflare.lua

@@ -166,6 +166,10 @@ function _m.solveWithWebDriver(self, url)
 	local cmd_ = {webdriver_exe}
 	table.insert(cmd_, webdriver_script)
 	table.insert(cmd_, rooturl)
+	table.insert(cmd_, "--flaresolverr-ip")
+	table.insert(cmd_, webdriver_ip)
+	table.insert(cmd_, "--flaresolverr-port")
+	table.insert(cmd_, webdriver_port)
 
 	if webdriver_testing then
 		table.insert(cmd_, "--testing")
@@ -270,7 +274,9 @@ function load_config()
 		local config_table = {
 		use_webdriver = false,
 		testing = false,
-		debug = false
+		debug = false,
+		flaresolverr_ip = "localhost",
+		flaresolverr_port = 8191
 		}
 
 		local json_string = json.encode(config_table)
@@ -306,6 +312,16 @@ function load_config()
 		use_webdriver = config_table['use_webdriver']
 		webdriver_testing = config_table['testing']
 		webdriver_debug = config_table['debug']
+		if config_table['flaresolverr_ip'] ~= nil then
+			webdriver_ip = config_table['flaresolverr_ip']
+		else
+			webdriver_ip = "localhost"
+		end
+		if config_table['flaresolverr_port'] ~= nil then
+			webdriver_port = config_table['flaresolverr_port']
+		else
+			webdriver_port = 8191
+		end
 	end
 end
 
@@ -327,15 +343,20 @@ function _m.bypass(self, METHOD, URL)
 	webdriver_exe = 'python'
 	webdriver_script = [[lua\websitebypass\cloudflare.py]]
 	flaresolverr = false
-	-- use FlareSolverr url to check if it running
-	HTTP.GET('http://127.0.0.1:8191/')
-	if (HTTP.ResultCode == 200) then
-		local x = CreateTXQuery(HTTP.Document)
-		local requestJSON = x.XPath('json(*)')
-		if (x.XPathString('msg', requestJSON) == "FlareSolverr is ready!") then
-			print('WebsiteBypass[cloudflare]: FlareSolverr is running')
-			flaresolverr = true
+	if use_webdriver then
+		-- use FlareSolverr url to check if it running
+		local flareSolverr_url = 'http://' .. webdriver_ip .. ':' .. webdriver_port .. '/'
+		HTTP.GET(flareSolverr_url)
+		if (HTTP.ResultCode == 200) then
+			local x = CreateTXQuery(HTTP.Document)
+			local requestJSON = x.XPath('json(*)')
+			if (x.XPathString('msg', requestJSON) == "FlareSolverr is ready!") then
+				print('WebsiteBypass[cloudflare]: FlareSolverr is running')
+				flaresolverr = true
+			end
 		end
+	else
+		print("WebsiteBypass[cloudflare]: Webdriver isn't enabled")
 	end
 
 	if HTTP.RetryCount > maxretry then 

lua/websitebypass/cloudflare.py

@@ -6,7 +6,7 @@
 import base64
 from pathlib import Path
 from datetime import datetime, timedelta
-from urllib.parse import urlparse
+from urllib.parse import urlparse, urlunparse
 
 try:
     import rookiepy
@@ -22,7 +22,8 @@
 debug_path = (websitebypass_path / 'debug').resolve()
 
 class CloudSolver:
-    def __init__(self, debug=False, testing_result=False):
+    def __init__(self, debug=False, testing_result=False,
+                 flare_ip= "localhost", flare_port= 8191):
         if not (debug or testing_result):
             logging.disable()
         else:
@@ -32,6 +33,8 @@ def __init__(self, debug=False, testing_result=False):
                     level=logging.INFO)
         self.debug = debug
         self.testing_result = testing_result
+        flare_api_parsed = urlparse('http://localhost:8191/v1')
+        self.flare_api_parsed = flare_api_parsed._replace(netloc=f"{flare_ip}:{flare_port}" if flare_port else flare_ip)
         # just random UUID
         self.session_id = 'e69e9ce7-8118-470c-a069-13af7bee6e8b'
         self.post_body = {"cmd": "request.get",
@@ -55,14 +58,14 @@ def try_to_clear_sessions(self):
 
         if cloudflare_json.get('next_run') < datetime.now().timestamp():
             sessions_list = requests.post(
-                'http://localhost:8191/v1',
+                self.flare_api_parsed.geturl(),
                 headers= {'Content-Type': 'application/json'},
                 json= {"cmd": "sessions.list",}
                 ).json()['sessions']
             logging.info(f'flaresolverr sessions list: {sessions_list}')
             if self.session_id in sessions_list:
                 requests.post(
-                    'http://localhost:8191/v1',
+                    self.flare_api_parsed.geturl(),
                     headers= {'Content-Type': 'application/json'},
                     json= {"cmd": "sessions.destroy",
                            "session": self.session_id}
@@ -75,7 +78,7 @@ def try_to_clear_sessions(self):
 
     def solve_flare(self, url_):
         try:
-            test_flaresolver = requests.get('http://127.0.0.1:8191/')
+            test_flaresolver = requests.get(self.flare_api_parsed._replace(path='').geturl())
             if test_flaresolver.status_code == 200:
                 if test_flaresolver.json()['msg'] != 'FlareSolverr is ready!':
                     logging.info('FlareSolverr is not running!')
@@ -87,7 +90,7 @@ def solve_flare(self, url_):
         post_body = self.post_body
         post_body['url'] = url_
         response = requests.post(
-            'http://localhost:8191/v1',
+            self.flare_api_parsed.geturl(),
             headers={'Content-Type': 'application/json'},
             json=post_body)
         logging.info(response.status_code)
@@ -238,11 +241,26 @@ def parse_arguments():
         action="store_true",
         help="Enable testing restult mode."
     )
+
+    # Use custom Flaresolverr ip
+    parser.add_argument(
+        "-Fip", "--flaresolverr-ip",
+        default= "localhost",
+        help="Use custom Flaresolverr ip.(default: %(default)s)"
+    )
+
+    # Use custom Flaresolverr port
+    parser.add_argument(
+        "-Fp", "--flaresolverr-port",
+        default= 8191,
+        help="Use custom Flaresolverr port.(default: %(default)s)"
+    )
 
     return parser.parse_args()
 
 
 if __name__ == "__main__":
     args = parse_arguments()
-    cloudsolver = CloudSolver(debug= args.debug,testing_result=args.testing)
+    cloudsolver = CloudSolver(debug=args.debug, testing_result=args.testing,
+                              flare_ip= args.flaresolverr_ip, flare_port= args.flaresolverr_port)
     cloudsolver.solve(args.Url)

lua/websitebypass/websitebypass_config.json

@@ -1,5 +1,7 @@
 {
-  "use_webdriver": false,
-  "testing": false,
-  "debug": false
+	"use_webdriver": false,
+	"debug": false,
+	"flaresolverr_port": 8191,
+	"testing": false,
+	"flaresolverr_ip": "localhost"
 }