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

Enhanced file permission checks and added logging for FreeBSD

Browse Source
This commit is contained in:
Asthowen 2024-07-16 15:14:05 +02:00
parent dd7eaee2e3
commit 009e38185f
No known key found for this signature in database
GPG Key ID: CE65EDE6BA443255
1 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/undetected_chromedriver/patcher.py
View File

@ -180,22 +180,44 @@ class Patcher(object):
if self.platform_name == "freebsd": if self.platform_name == "freebsd":
chromedriver_path = shutil.which("chromedriver") chromedriver_path = shutil.which("chromedriver")
if not os.path.isfile(chromedriver_path) or not os.access(chromedriver_path, os.X_OK): if not chromedriver_path or not os.path.isfile(chromedriver_path):
logging.error("Chromedriver not installed!") logging.error("Chromedriver not installed!")
return return
if not os.access(chromedriver_path, os.X_OK):
logging.error(
f"Execution permissions are not granted for the file {chromedriver_path}.",
)
return
version_path = os.path.join(os.path.dirname(self.executable_path), "version.txt") destination_path = os.path.dirname(self.executable_path)
if not os.access(destination_path, os.R_OK | os.W_OK | os.X_OK):
logging.error(
f"Read/write/execution permissions are not granted for the folder {destination_path}.",
)
return
try:
process = os.popen(f'"{chromedriver_path}" --version') process = os.popen(f'"{chromedriver_path}" --version')
chromedriver_version = process.read().split(' ')[1].split(' ')[0] chromedriver_version = process.read().split(' ')[1].split(' ')[0]
process.close() process.close()
except Exception as e:
logging.error(f"Failed to retrieve chromedriver version: {str(e)}")
return
version_path = os.path.join(destination_path, "version.txt")
current_version = None current_version = None
if os.path.isfile(version_path) or os.access(version_path, os.X_OK): if os.path.isfile(version_path):
if not os.access(version_path, os.W_OK):
logging.error(f"Write permissions are not granted for the file {version_path}.")
return
with open(version_path, 'r') as f: with open(version_path, 'r') as f:
current_version = f.read() current_version = f.read()
if current_version != chromedriver_version: if current_version == chromedriver_version:
logging.info(f"The patched version of chromedriver in {destination_path} is the latest version on the system ({current_version}).")
if self.is_binary_patched():
return True
else:
logging.info("Copying chromedriver executable...") logging.info("Copying chromedriver executable...")
shutil.copy(chromedriver_path, self.executable_path) shutil.copy(chromedriver_path, self.executable_path)
os.chmod(self.executable_path, 0o755) os.chmod(self.executable_path, 0o755)