Update UC Mode
This commit is contained in:
Michael Mintz
parent
db012234fc
commit
8621dfeef6
|
|
@ -975,9 +975,24 @@ def uc_gui_click_cf(driver, frame="iframe", retry=False, blind=False):
|
|||
)
|
||||
|
||||
|
||||
def uc_gui_handle_cf(driver, frame="iframe"):
|
||||
def _uc_gui_handle_captcha(
|
||||
driver,
|
||||
frame="iframe",
|
||||
ctype=None,
|
||||
):
|
||||
if ctype == "cf_t":
|
||||
if not _on_a_cf_turnstile_page(driver):
|
||||
return
|
||||
elif ctype == "g_rc":
|
||||
if not _on_a_g_recaptcha_page(driver):
|
||||
return
|
||||
else:
|
||||
if _on_a_g_recaptcha_page(driver):
|
||||
ctype = "g_rc"
|
||||
elif _on_a_cf_turnstile_page(driver):
|
||||
ctype = "cf_t"
|
||||
else:
|
||||
return
|
||||
install_pyautogui_if_missing(driver)
|
||||
import pyautogui
|
||||
pyautogui = get_configured_pyautogui(pyautogui)
|
||||
|
|
@ -988,7 +1003,10 @@ def uc_gui_handle_cf(driver, frame="iframe"):
|
|||
with gui_lock: # Prevent issues with multiple processes
|
||||
needs_switch = False
|
||||
is_in_frame = js_utils.is_in_frame(driver)
|
||||
if is_in_frame and driver.is_element_present("#challenge-stage"):
|
||||
selector = "#challenge-stage"
|
||||
if ctype == "g_rc":
|
||||
selector = "#recaptcha-token"
|
||||
if is_in_frame and driver.is_element_present(selector):
|
||||
driver.switch_to.parent_frame()
|
||||
needs_switch = True
|
||||
is_in_frame = js_utils.is_in_frame(driver)
|
||||
|
|
@ -997,6 +1015,7 @@ def uc_gui_handle_cf(driver, frame="iframe"):
|
|||
page_actions.switch_to_window(
|
||||
driver, driver.current_window_handle, 2, uc_lock=False
|
||||
)
|
||||
if ctype == "cf_t":
|
||||
if (
|
||||
driver.is_element_present(".cf-turnstile-wrapper iframe")
|
||||
or driver.is_element_present(
|
||||
|
|
@ -1039,25 +1058,34 @@ def uc_gui_handle_cf(driver, frame="iframe"):
|
|||
frame = 'div > div > [style*="margin"][style*="padding"]'
|
||||
else:
|
||||
return
|
||||
else:
|
||||
if (
|
||||
driver.is_element_present('iframe[title="reCAPTCHA"]')
|
||||
and frame == "iframe"
|
||||
):
|
||||
frame = 'iframe[title="reCAPTCHA"]'
|
||||
if not is_in_frame or needs_switch:
|
||||
# Currently not in frame (or nested frame outside CF one)
|
||||
try:
|
||||
if visible_iframe:
|
||||
if visible_iframe or ctype == "g_rc":
|
||||
driver.switch_to_frame(frame)
|
||||
except Exception:
|
||||
if visible_iframe:
|
||||
if visible_iframe or ctype == "g_rc":
|
||||
if driver.is_element_present("iframe"):
|
||||
driver.switch_to_frame("iframe")
|
||||
else:
|
||||
return
|
||||
try:
|
||||
selector = "div.cf-turnstile"
|
||||
if ctype == "g_rc":
|
||||
selector = "span#recaptcha-anchor"
|
||||
found_checkbox = False
|
||||
for i in range(24):
|
||||
pyautogui.press("\t")
|
||||
time.sleep(0.02)
|
||||
active_element_css = js_utils.get_active_element_css(driver)
|
||||
if (
|
||||
active_element_css.startswith("div.cf-turnstile")
|
||||
active_element_css.startswith(selector)
|
||||
or active_element_css.endswith(" > div" * 2)
|
||||
):
|
||||
found_checkbox = True
|
||||
|
|
@ -1081,6 +1109,18 @@ def uc_gui_handle_cf(driver, frame="iframe"):
|
|||
driver.reconnect(reconnect_time)
|
||||
|
||||
|
||||
def uc_gui_handle_captcha(driver, frame="iframe"):
|
||||
_uc_gui_handle_captcha(driver, frame=frame, ctype=None)
|
||||
|
||||
|
||||
def uc_gui_handle_cf(driver, frame="iframe"):
|
||||
_uc_gui_handle_captcha(driver, frame=frame, ctype="cf_t")
|
||||
|
||||
|
||||
def uc_gui_handle_rc(driver, frame="iframe"):
|
||||
_uc_gui_handle_captcha(driver, frame=frame, ctype="g_rc")
|
||||
|
||||
|
||||
def uc_switch_to_frame(driver, frame="iframe", reconnect_time=None):
|
||||
from selenium.webdriver.remote.webelement import WebElement
|
||||
if isinstance(frame, WebElement):
|
||||
|
|
@ -4421,21 +4461,31 @@ def get_local_driver(
|
|||
driver, *args, **kwargs
|
||||
)
|
||||
)
|
||||
driver.uc_gui_click_rc = (
|
||||
lambda *args, **kwargs: uc_gui_click_rc(
|
||||
driver, *args, **kwargs
|
||||
)
|
||||
)
|
||||
driver.uc_gui_click_cf = (
|
||||
lambda *args, **kwargs: uc_gui_click_cf(
|
||||
driver, *args, **kwargs
|
||||
)
|
||||
)
|
||||
driver.uc_gui_click_rc = (
|
||||
lambda *args, **kwargs: uc_gui_click_rc(
|
||||
driver, *args, **kwargs
|
||||
)
|
||||
)
|
||||
driver.uc_gui_handle_captcha = (
|
||||
lambda *args, **kwargs: uc_gui_handle_captcha(
|
||||
driver, *args, **kwargs
|
||||
)
|
||||
)
|
||||
driver.uc_gui_handle_cf = (
|
||||
lambda *args, **kwargs: uc_gui_handle_cf(
|
||||
driver, *args, **kwargs
|
||||
)
|
||||
)
|
||||
driver.uc_gui_handle_rc = (
|
||||
lambda *args, **kwargs: uc_gui_handle_rc(
|
||||
driver, *args, **kwargs
|
||||
)
|
||||
)
|
||||
driver.uc_switch_to_frame = (
|
||||
lambda *args, **kwargs: uc_switch_to_frame(
|
||||
driver, *args, **kwargs
|
||||
|
|
|
|||
|
|
@ -4246,12 +4246,16 @@ class BaseCase(unittest.TestCase):
|
|||
self.uc_gui_click_x_y = new_driver.uc_gui_click_x_y
|
||||
if hasattr(new_driver, "uc_gui_click_captcha"):
|
||||
self.uc_gui_click_captcha = new_driver.uc_gui_click_captcha
|
||||
if hasattr(new_driver, "uc_gui_click_rc"):
|
||||
self.uc_gui_click_rc = new_driver.uc_gui_click_rc
|
||||
if hasattr(new_driver, "uc_gui_click_cf"):
|
||||
self.uc_gui_click_cf = new_driver.uc_gui_click_cf
|
||||
if hasattr(new_driver, "uc_gui_click_rc"):
|
||||
self.uc_gui_click_rc = new_driver.uc_gui_click_rc
|
||||
if hasattr(new_driver, "uc_gui_handle_captcha"):
|
||||
self.uc_gui_handle_captcha = new_driver.uc_gui_handle_captcha
|
||||
if hasattr(new_driver, "uc_gui_handle_cf"):
|
||||
self.uc_gui_handle_cf = new_driver.uc_gui_handle_cf
|
||||
if hasattr(new_driver, "uc_gui_handle_rc"):
|
||||
self.uc_gui_handle_rc = new_driver.uc_gui_handle_rc
|
||||
if hasattr(new_driver, "uc_switch_to_frame"):
|
||||
self.uc_switch_to_frame = new_driver.uc_switch_to_frame
|
||||
return new_driver
|
||||
|
|
|
|||
Loading…
Reference in New Issue