Optimize proxy mode for undetectable-chromedriver mode

Author: mdmintz

seleniumbase/core/browser_launcher.py

@@ -597,9 +597,13 @@ def _set_chrome_options(
         chrome_options.add_argument("--proxy-pac-url=%s" % proxy_pac_url)
     if browser_name != constants.Browser.OPERA:
         # Opera Chromium doesn't support these switches
-        if not is_using_uc(undetectable, browser_name) or not enable_ws:
+        if (
+            not is_using_uc(undetectable, browser_name)
+            or not enable_ws
+            or proxy_string
+        ):
             chrome_options.add_argument("--ignore-certificate-errors")
-        if not enable_ws:
+        if not enable_ws or not is_using_uc(undetectable, browser_name):
             chrome_options.add_argument("--disable-web-security")
         if "linux" in PLATFORM or not is_using_uc(undetectable, browser_name):
             chrome_options.add_argument("--no-sandbox")

seleniumbase/plugins/driver_manager.py

@@ -46,6 +46,7 @@ def Driver(
     disable_js=None,  # Disable JavaScript on websites. Pages might break!
     disable_csp=None,  # Disable the Content Security Policy of websites.
     enable_ws=None,  # Enable Web Security on Chromium-based browsers.
+    disable_ws=None,  # Reverse of "enable_ws". (None and False are different)
     enable_sync=None,  # Enable "Chrome Sync" on websites.
     use_auto_ext=None,  # Use Chrome's automation extension.
     undetectable=None,  # Use undetected-chromedriver to evade bot-detection.
@@ -243,12 +244,9 @@ def Driver(
         headless2 = False  # Only for Chromium browsers
     if disable_csp is None:
         disable_csp = False
-    if enable_ws is None:
-        enable_ws = False
-    if enable_sync is None:
-        enable_sync = False
     if (
-        enable_ws is None
+        (enable_ws is None and disable_ws is None)
+        or (disable_ws is not None and not disable_ws)
         or (enable_ws is not None and enable_ws)
     ):
         enable_ws = True

seleniumbase/plugins/sb_manager.py

@@ -383,10 +383,6 @@ def SB(
         variables = {}
     if disable_csp is None:
         disable_csp = False
-    if enable_ws is None:
-        enable_ws = False
-    if enable_sync is None:
-        enable_sync = False
     if (
         (enable_ws is None and disable_ws is None)
         or (disable_ws is not None and not disable_ws)

seleniumbase/undetected/__init__.py

@@ -213,7 +213,12 @@ def __init__(
         self.keep_user_data_dir = keep_user_data_dir
         if suppress_welcome:
             options.arguments.extend(
-                ["--no-default-browser-check", "--no-first-run"]
+                [
+                    "--no-default-browser-check",
+                    "--no-first-run",
+                    "--no-service-autorun",
+                    "--password-store=basic",
+                ]
             )
         if headless or options.headless:
             options.headless = True