HEL/hei-vpn-for-linux
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

added checks and cleanup of temp profiles

Browse Source
This commit is contained in:
Louis Heredero 2024-03-18 20:27:33 +01:00
parent f36bb0577a
commit a8d0908073
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
main.py
View File

@ -106,8 +106,6 @@ def startBrowser(headless: bool = True) -> tuple[Firefox, FirefoxProfile]:
options = FirefoxOptions() options = FirefoxOptions()
profile = FirefoxProfile(profilePath) profile = FirefoxProfile(profilePath)
options.profile = profile options.profile = profile
#options.set_preference("profile", profilePath)
#options.add_argument(f"-profile {profilePath}")
distinguishkey = "-distinguishkey" + str(random.randint(111111, 999999)) distinguishkey = "-distinguishkey" + str(random.randint(111111, 999999))
options.add_argument(distinguishkey) options.add_argument(distinguishkey)
@ -149,18 +147,31 @@ def closeBrowser(driver: Firefox, distinguishkey: str) -> None:
errorLogger.log(f"Tried: sudo cp -r {realProfilePath} {PERSISTENT_PROFILE_PATH}") errorLogger.log(f"Tried: sudo cp -r {realProfilePath} {PERSISTENT_PROFILE_PATH}")
exit() exit()
# Remove lock # Remove lock (if still present)
subprocess.run(["sudo", "rm", os.path.join(PERSISTENT_PROFILE_PATH, "lock")]) lockPath = os.path.join(PERSISTENT_PROFILE_PATH, "lock")
if os.path.isfile(lockPath):
subprocess.run(["sudo", "rm", lockPath])
# Grant user access to directory # Grant user access to directory
subprocess.run(["sudo", "chown", "-R", f"{os.getuid()}:{os.getgid()}", PERSISTENT_PROFILE_PATH]) subprocess.run(["sudo", "chown", "-R", f"{os.getuid()}:{os.getgid()}", PERSISTENT_PROFILE_PATH])
subprocess.run(["sudo", "chmod", "-R", "0664", PERSISTENT_PROFILE_PATH]) subprocess.run(["sudo", "chmod", "-R", "0644", PERSISTENT_PROFILE_PATH])
subprocess.run(["sudo", "chmod", "-R", "+X", PERSISTENT_PROFILE_PATH]) subprocess.run(["sudo", "chmod", "-R", "+X", PERSISTENT_PROFILE_PATH])
try: try:
driver.quit() driver.quit()
except: except:
pass # error expected because we killed the processed pass # error expected because we killed the processe
# Cleanup
if os.path.isdir(realProfilePath):
# Extra security to avoid deleting / recursively :)
# Costs nothing to be extra safe
if realProfilePath.startswith("/tmp/") and \
realProfilePath.startswith(os.path.abspath(os.path.join(ROOT, "tmp"))) and \
len(realProfilePath.split(os.path.sep)) >= 2 and \
".." not in realProfilePath:
subprocess.run(["sudo", "rm", "-r", realProfilePath])
def doLogin() -> None: def doLogin() -> None:
print("+--------------------------+") print("+--------------------------+")