Merge pull request #1736 from seleniumbase/uc-mode-and-window-switching-updates

Update UC Mode and window-switching code

Author: mdmintz

examples/verify_undetected.py

@@ -5,7 +5,7 @@
 
 if __name__ == "__main__":
     from pytest import main
-    main([__file__, "--uc", "--incognito", "-s"])
+    main([__file__, "--uc", "--incognito", "-s", "--uc-cdp-events"])
 
 
 class UndetectedTest(BaseCase):

mkdocs_build/requirements.txt

@@ -11,7 +11,6 @@ Markdown==3.3.7
 MarkupSafe==2.1.2
 Jinja2==3.1.2
 click==8.1.3
-zipp==3.12.0
 ghp-import==2.1.0
 readme-renderer==37.3
 pymdown-extensions==9.9.2
@@ -29,6 +28,6 @@ tinycss2==1.2.1
 defusedxml==0.7.1
 mkdocs==1.4.2
 mkdocs-material==9.0.11
-mkdocs-exclude-search==0.6.4
+mkdocs-exclude-search==0.6.5
 mkdocs-simple-hooks==0.1.5
 mkdocs-material-extensions==1.1.1

requirements.txt

@@ -20,6 +20,8 @@ filelock>=3.9.0;python_version>="3.7"
 platformdirs>=2.4.0;python_version<"3.7"
 platformdirs>=2.6.2;python_version>="3.7"
 pyparsing>=3.0.7;python_version<"3.7"
+zipp==3.6.0;python_version<"3.7"
+zipp>=3.12.1;python_version>="3.7"
 six==1.16.0
 idna==3.4
 chardet==4.0.0;python_version<"3.7"
@@ -67,7 +69,7 @@ pytest-rerunfailures==11.0;python_version>="3.7"
 pytest-xdist==2.5.0;python_version<"3.7"
 pytest-xdist==3.1.0;python_version>="3.7"
 parameterized==0.8.1
-sbvirtualdisplay==1.1.1
+sbvirtualdisplay==1.2.0
 behave==1.2.6
 parse==1.19.0
 parse-type==0.6.0

seleniumbase/__version__.py

@@ -1,2 +1,2 @@
 # seleniumbase package
-__version__ = "4.12.5"
+__version__ = "4.12.6"

seleniumbase/core/browser_launcher.py

@@ -734,6 +734,7 @@ def _set_chrome_options(
             or IS_LINUX  # switches to Xvfb (non-headless)
         )
     ):
+        chrome_options.add_argument("--disable-popup-blocking")
         # Skip remaining options that trigger anti-bot services
         return chrome_options
     chrome_options.add_argument("--test-type")

seleniumbase/fixtures/base_case.py

@@ -2634,7 +2634,19 @@ def __element_click(self, element):
         ):
             element.click()
         else:
-            element.uc_click()
+            try:
+                href = element.get_attribute("href")
+                target = element.get_attribute("target")
+                if len(href) > 0 and target == "_blank":
+                    self.driver.tab_new(href)
+                    self.switch_to_window(-1)
+                    time.sleep(0.01)
+                elif len(href) > 0:
+                    element.uc_click()
+                else:
+                    element.click()
+            except Exception:
+                element.click()
 
     def __select_option(
         self,
@@ -3344,7 +3356,7 @@ def open_new_window(self, switch_to=True):
         if hasattr(self.driver, "tab_new"):
             self.driver.tab_new("about:blank")
             if switch_to:
-                self.switch_to_newest_window()
+                self.switch_to_window(-1)
             time.sleep(0.01)
             return
         if selenium4_or_newer and switch_to:
@@ -3375,7 +3387,7 @@ def switch_to_default_window(self):
         self.switch_to_window(0)
 
     def switch_to_newest_window(self):
-        self.switch_to_window(len(self.driver.window_handles) - 1)
+        self.switch_to_window(-1)
 
     def get_new_driver(
         self,
@@ -12471,7 +12483,7 @@ def __make_css_match_first_element_only(self, selector):
     def __switch_to_newest_window_if_not_blank(self):
         current_window = self.driver.current_window_handle
         try:
-            self.switch_to_window(len(self.driver.window_handles) - 1)
+            self.switch_to_window(-1)
             if self.get_current_url() == "about:blank":
                 self.switch_to_window(current_window)
         except Exception:
@@ -13603,9 +13615,7 @@ def setUp(self, masterqa_mode=False):
                         has_url = True
                     if len(self.driver.window_handles) > 1:
                         while len(self.driver.window_handles) > 1:
-                            self.switch_to_window(
-                                len(self.driver.window_handles) - 1
-                            )
+                            self.switch_to_window(-1)
                             self.driver.close()
                         self.switch_to_window(0)
                     if self._crumbs:

seleniumbase/fixtures/page_actions.py

@@ -1328,16 +1328,17 @@ def switch_to_window(driver, window, timeout=settings.SMALL_TIMEOUT):
     window - the window index or window handle
     timeout - the time to wait for the window in seconds
     """
+    if window == -1:
+        window = len(driver.window_handles) - 1
     start_ms = time.time() * 1000.0
     stop_ms = start_ms + (timeout * 1000.0)
     if isinstance(window, int):
         caps = driver.capabilities
         if (
             caps["browserName"].lower() == "safari"
             and "safari:platformVersion" in caps
-            and caps["safari:platformVersion"].split(".") < ["10", "15"]
         ):
-            # Fix reversed window_handles on Safari 10.14 or lower
+            # Reversed window_handles on Safari
             window = len(driver.window_handles) - 1 - window
             if window < 0:
                 window = 0

seleniumbase/undetected/__init__.py

@@ -9,6 +9,8 @@
 import selenium.webdriver.chrome.webdriver
 import selenium.webdriver.common.service
 import selenium.webdriver.remote.command
+from .cdp import CDP
+from .cdp import PageElement
 from .dprocess import start_detached
 from .options import ChromeOptions
 from .patcher import IS_POSIX
@@ -133,13 +135,12 @@ def __init__(
                 constants.MultiBrowser.DRIVER_FIXING_LOCK
             )
             with uc_lock:
-                patcher = Patcher(
+                self.patcher = Patcher(
                     executable_path=driver_executable_path,
                     force=patcher_force_close,
                     version_main=version_main,
                 )
-                patcher.auto()
-                self.patcher = patcher
+                self.patcher.auto()
         if not options:
             options = ChromeOptions()
         try:
@@ -280,7 +281,7 @@ def __init__(
         service_ = None
         if patch_driver:
             service_ = selenium.webdriver.chrome.service.Service(
-                executable_path=patcher.executable_path,
+                executable_path=self.patcher.executable_path,
                 log_path=os.devnull,
             )
         else:
@@ -380,19 +381,28 @@ def clear_cdp_listeners(self):
         if self.reactor and isinstance(self.reactor, Reactor):
             self.reactor.handlers.clear()
 
-    def window_new(self):
+    def window_new(self, url=None):
         self.execute(
             selenium.webdriver.remote.command.Command.NEW_WINDOW,
             {"type": "window"},
         )
+        if url:
+            self.remove_cdc_props_as_needed()
+            return super().get(url)
+        return None
 
     def tab_new(self, url):
         """This opens a url in a new tab."""
         if not hasattr(self, "cdp"):
-            from .cdp import CDP
+            self.cdp = CDP(self.options)
+        self.cdp.tab_new(str(url))
 
-            cdp = CDP(self.options)
-            cdp.tab_new(str(url))
+    def tab_list(self):
+        if not hasattr(self, "cdp"):
+            self.cdp = CDP(self.options)
+
+        retval = self.get(self.cdp.endpoints["list"])
+        return [PageElement(o) for o in retval]
 
     def reconnect(self, timeout=0.1):
         try:

seleniumbase/undetected/cdp.py

@@ -89,6 +89,9 @@ async def send(self, method, params):  # noqa
             self.log.info(self._last_json)
 
     def get(self, uri):
+        from urllib.parse import unquote
+
+        uri = unquote(uri, errors="strict")
         resp = self._session.get(self.server_addr + uri)
         try:
             self._last_resp = resp
@@ -99,6 +102,9 @@ def get(self, uri):
             return self._last_json
 
     def post(self, uri, data=None):
+        from urllib.parse import unquote
+
+        uri = unquote(uri, errors="strict")
         if not data:
             data = {}
         resp = self._session.post(self.server_addr + uri, json=data)

seleniumbase/undetected/patcher.py

@@ -47,11 +47,9 @@ def __init__(self, executable_path=None, force=False, version_main=0):
             version_main: 0 = auto
                 Specify main chrome version (rounded, ex: 82)
         """
-        import secrets
-
         self.force = force
         self.executable_path = None
-        prefix = secrets.token_hex(8)
+        prefix = "undetected"
         if not os.path.exists(self.data_path):
             os.makedirs(self.data_path, exist_ok=True)
         if not executable_path:
@@ -222,6 +220,33 @@ def gen_call_function_js_cache_name(match):
             fh.write(file_bin)
         return True
 
+    def is_binary_patched_new(self, executable_path=None):
+        executable_path = executable_path or self.executable_path
+        with io.open(executable_path, "rb") as fh:
+            return fh.read().find(b"undetected chromedriver") != -1
+
+    def patch_exe_new(self):
+        logger.info("patching driver executable %s" % self.executable_path)
+        with io.open(self.executable_path, "r+b") as fh:
+            content = fh.read()
+            match_injected_codeblock = re.search(rb"{window.*;}", content)
+            if match_injected_codeblock:
+                target_bytes = match_injected_codeblock[0]
+                new_target_bytes = (
+                    b'{console.log("undetected chromedriver 1337!")}'.ljust(
+                        len(target_bytes), b" "
+                    )
+                )
+                new_content = content.replace(target_bytes, new_target_bytes)
+                if new_content == content:
+                    pass  # Failure to patch driver
+                else:
+                    # Patch now
+                    fh.seek(0)
+                    fh.write(new_content)
+            else:
+                pass  # Already patched
+
     def __repr__(self):
         return "{0:s}({1:s})".format(
             self.__class__.__name__,