skorotkiewicz/rDrama
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Route login pages properly

Browse source
This commit is contained in:
justcool393 2023-07-12 16:51:24 -05:00
parent 710f9f7445
commit e55a159a64
1 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

26
files/routes/login.py
View file

@ -17,7 +17,7 @@ def login_get(v):
if redir.startswith(f'{SITE_FULL}/'): return redirect(redir) if redir.startswith(f'{SITE_FULL}/'): return redirect(redir)
elif redir.startswith('/'): return redirect(f'{SITE_FULL}{redir}') elif redir.startswith('/'): return redirect(f'{SITE_FULL}{redir}')
return render_template("login.html", failed=False, redirect=redir) return render_template("login/login.html", failed=False, redirect=redir)
def check_for_alts(current_id): def check_for_alts(current_id):
@ -95,18 +95,18 @@ def login_post():
if not account: if not account:
time.sleep(random.uniform(0, 2)) time.sleep(random.uniform(0, 2))
return render_template("login.html", failed=True) return render_template("login/login.html", failed=True)
if request.values.get("password"): if request.values.get("password"):
if not account.verifyPass(request.values.get("password")): if not account.verifyPass(request.values.get("password")):
time.sleep(random.uniform(0, 2)) time.sleep(random.uniform(0, 2))
return render_template("login.html", failed=True) return render_template("login/login.html", failed=True)
if account.mfa_secret: if account.mfa_secret:
now = int(time.time()) now = int(time.time())
hash = generate_hash(f"{account.id}+{now}+2fachallenge") hash = generate_hash(f"{account.id}+{now}+2fachallenge")
return render_template("login_2fa.html", return render_template("login/login_2fa.html",
v=account, v=account,
time=now, time=now,
hash=hash, hash=hash,
@ -124,7 +124,7 @@ def login_post():
if not account.validate_2fa(request.values.get("2fa_token", "").strip()): if not account.validate_2fa(request.values.get("2fa_token", "").strip()):
hash = generate_hash(f"{account.id}+{time}+2fachallenge") hash = generate_hash(f"{account.id}+{time}+2fachallenge")
return render_template("login_2fa.html", return render_template("login/login_2fa.html",
v=account, v=account,
time=now, time=now,
hash=hash, hash=hash,
@ -193,7 +193,7 @@ def sign_up_get(v):
ref_user = None ref_user = None
if ref_user and (ref_user.id in session.get("history", [])): if ref_user and (ref_user.id in session.get("history", [])):
return render_template("sign_up_failed_ref.html") return render_template("login/sign_up_failed_ref.html")
now = int(time.time()) now = int(time.time())
token = token_hex(16) token = token_hex(16)
@ -209,7 +209,7 @@ def sign_up_get(v):
error = request.values.get("error") error = request.values.get("error")
return render_template( return render_template(
"sign_up.html", "login/sign_up.html",
formkey=formkey, formkey=formkey,
now=now, now=now,
ref_user=ref_user, ref_user=ref_user,
@ -358,7 +358,7 @@ def sign_up_post(v):
@app.get("/forgot") @app.get("/forgot")
def get_forgot(): def get_forgot():
return render_template("forgot_password.html") return render_template("login/forgot_password.html")
@app.post("/forgot") @app.post("/forgot")
@ -370,7 +370,7 @@ def post_forgot():
email = request.values.get("email",'').strip().lower() email = request.values.get("email",'').strip().lower()
if not email_regex.fullmatch(email): if not email_regex.fullmatch(email):
return render_template("forgot_password.html", error="Invalid email.") return render_template("login/forgot_password.html", error="Invalid email.")
username = username.lstrip('@') username = username.lstrip('@')
@ -390,7 +390,7 @@ def post_forgot():
v=user) v=user)
) )
return render_template("forgot_password.html", return render_template("login/forgot_password.html",
msg="If the username and email matches an account, you will be sent a password reset email. You have ten minutes to complete the password reset process.") msg="If the username and email matches an account, you will be sent a password reset email. You have ten minutes to complete the password reset process.")
@ -420,7 +420,7 @@ def get_reset():
reset_token = generate_hash(f"{user.id}+{timestamp}+reset+{user.login_nonce}") reset_token = generate_hash(f"{user.id}+{timestamp}+reset+{user.login_nonce}")
return render_template("reset_password.html", return render_template("login/reset_password.html",
v=user, v=user,
token=reset_token, token=reset_token,
time=timestamp, time=timestamp,
@ -456,7 +456,7 @@ def post_reset(v):
abort(404) abort(404)
if password != confirm_password: if password != confirm_password:
return render_template("reset_password.html", return render_template("login/reset_password.html",
v=user, v=user,
token=token, token=token,
time=timestamp, time=timestamp,
@ -475,7 +475,7 @@ def post_reset(v):
@auth_desired @auth_desired
def lost_2fa(v): def lost_2fa(v):
return render_template( return render_template(
"lost_2fa.html", "login/lost_2fa.html",
v=v v=v
) )