codfrm/MoviePilot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1482 from WangEdward/main

Browse Source
This commit is contained in:
jxxghp 2024-02-17 00:45:54 +08:00 committed by GitHub
commit 2e6c1bef63
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app/helper/cookie.py
View File

@ -52,7 +52,8 @@ class CookieHelper:
], ],
"twostep": [ "twostep": [
'//input[@name="two_step_code"]', '//input[@name="two_step_code"]',
'//input[@name="2fa_secret"]' '//input[@name="2fa_secret"]',
'//input[@name="otp"]'
] ]
} }
@ -111,10 +112,10 @@ class CookieHelper:
if not password_xpath: if not password_xpath:
return None, None, "未找到密码输入框" return None, None, "未找到密码输入框"
# 处理二步验证码 # 处理二步验证码
two_step_code = TwoFactorAuth(two_step_code).get_code() otp_code = TwoFactorAuth(two_step_code).get_code()
# 查找二步验证码输入框 # 查找二步验证码输入框
twostep_xpath = None twostep_xpath = None
if two_step_code: if otp_code:
for xpath in self._SITE_LOGIN_XPATH.get("twostep"): for xpath in self._SITE_LOGIN_XPATH.get("twostep"):
if html.xpath(xpath): if html.xpath(xpath):
twostep_xpath = xpath twostep_xpath = xpath
@ -152,7 +153,7 @@ class CookieHelper:
page.fill(password_xpath, password) page.fill(password_xpath, password)
# 输入二步验证码 # 输入二步验证码
if twostep_xpath: if twostep_xpath:
page.fill(twostep_xpath, two_step_code) page.fill(twostep_xpath, otp_code)
# 识别验证码 # 识别验证码
if captcha_xpath and captcha_img_url: if captcha_xpath and captcha_img_url:
captcha_element = page.query_selector(captcha_xpath) captcha_element = page.query_selector(captcha_xpath)
@ -179,6 +180,24 @@ class CookieHelper:
except Exception as e: except Exception as e:
logger.error(f"仿真登录失败：{str(e)}") logger.error(f"仿真登录失败：{str(e)}")
return None, None, f"仿真登录失败：{str(e)}" return None, None, f"仿真登录失败：{str(e)}"
# 对于某二次验证码为单页面的站点，输入二次验证码
if "verify" in page.url:
if not otp_code:
return None, None, "需要二次验证码"
html = etree.HTML(page.content())
for xpath in self._SITE_LOGIN_XPATH.get("twostep"):
if html.xpath(xpath):
try:
# 刷新一下 2fa code
otp_code = TwoFactorAuth(two_step_code).get_code()
page.fill(xpath, otp_code)
# 登录按钮 xpath 理论上相同，不再重复查找
page.click(submit_xpath)
page.wait_for_load_state("networkidle", timeout=30 * 1000)
except Exception as e:
logger.error(f"二次验证码输入失败：{str(e)}")
return None, None, f"二次验证码输入失败：{str(e)}"
break
# 登录后的源码 # 登录后的源码
html_text = page.content() html_text = page.content()
if not html_text: if not html_text: