Revert "Preserve local captcha mode after login errors"
This reverts commit 89d105cd87.
This commit is contained in:
1 parent
89d105cd87
commit
5025c0cd91
1 file changed
+2
-10
+2
-10
@@ -14097,7 +14097,6 @@ a{{display:inline-flex;margin-top:18px;color:#93c5fd}}
|
|||||||
username = payload.get("username", "")
|
username = payload.get("username", "")
|
||||||
password = payload.get("password", "")
|
password = payload.get("password", "")
|
||||||
otp = payload.get("otp", "")
|
otp = payload.get("otp", "")
|
||||||
force_local_captcha = sanitize_captcha_mode(payload.get("captcha_mode_override")) == CAPTCHA_MODE_DIGITS
|
|
||||||
captcha_ok, captcha_error = self.verify_login_captcha(payload)
|
captcha_ok, captcha_error = self.verify_login_captcha(payload)
|
||||||
if not captcha_ok:
|
if not captcha_ok:
|
||||||
fallback_message = recaptcha_fallback_message(captcha_error)
|
fallback_message = recaptcha_fallback_message(captcha_error)
|
||||||
@@ -14105,7 +14104,7 @@ a{{display:inline-flex;margin-top:18px;color:#93c5fd}}
|
|||||||
401,
|
401,
|
||||||
login_html(
|
login_html(
|
||||||
fallback_message or captcha_error or "Неверная капча",
|
fallback_message or captcha_error or "Неверная капча",
|
||||||
force_local_captcha=bool(fallback_message) or force_local_captcha,
|
force_local_captcha=bool(fallback_message),
|
||||||
).encode("utf-8"),
|
).encode("utf-8"),
|
||||||
"text/html; charset=utf-8",
|
"text/html; charset=utf-8",
|
||||||
)
|
)
|
||||||
@@ -14115,14 +14114,7 @@ a{{display:inline-flex;margin-top:18px;color:#93c5fd}}
|
|||||||
token, _ = self.create_login_session((auth or {}).get("username", username), auth_method)
|
token, _ = self.create_login_session((auth or {}).get("username", username), auth_method)
|
||||||
self.redirect("/", [("Set-Cookie", self.session_cookie(token))])
|
self.redirect("/", [("Set-Cookie", self.session_cookie(token))])
|
||||||
return
|
return
|
||||||
self.send_bytes(
|
self.send_bytes(401, login_html(error_text or "Неверный логин или пароль").encode("utf-8"), "text/html; charset=utf-8")
|
||||||
401,
|
|
||||||
login_html(
|
|
||||||
error_text or "Неверный логин или пароль",
|
|
||||||
force_local_captcha=force_local_captcha,
|
|
||||||
).encode("utf-8"),
|
|
||||||
"text/html; charset=utf-8",
|
|
||||||
)
|
|
||||||
|
|
||||||
def update_auth(self):
|
def update_auth(self):
|
||||||
payload = self.read_payload()
|
payload = self.read_payload()
|
||||||
|
|||||||
Reference in new issue
Block a user