StardustShard/dolltags
1
0
Fork 0
Code Issues 13 Pull requests Wiki Activity

now cleanly handling "invalid totp code" errors

Browse source
This commit is contained in:
Artemis 2025-03-19 10:40:44 +01:00
parent 2264d04ded
commit a425780904
2 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/routes/account/otp.rs
View file

@ -16,9 +16,10 @@ use crate::{
routes::{self, error_handlers::PageResult},
};
#[get("/settings/totp")]
#[get("/settings/totp?<invalid_code>")]
pub async fn show_totp_enable_start(
mut db: DollTagsDb,
invalid_code: bool,
user: User,
cookies: &CookieJar<'_>,
meta: CommonTemplateState,
@ -26,8 +27,15 @@ pub async fn show_totp_enable_start(
if db::otp::has_otp(&mut *db, &user.id, METHOD_TOTP).await? {
return Ok(Redirect::to(uri!("/account", routes::account::settings::show_settings)).into());
}
let totp_secret = Secret::generate_secret();
auth::otp::cache_secret(cookies, &totp_secret);
// cookie recovery in case it was a form error and not a new session
let mut totp_secret = auth::otp::get_secret(cookies);
if totp_secret.is_none() {
let new_secret = Secret::generate_secret();
auth::otp::cache_secret(cookies, &new_secret);
totp_secret = Some(new_secret);
}
let totp_secret = totp_secret.unwrap();
let totp = auth::otp::make_totp(&user.id.to_string(), totp_secret.to_bytes()?)?;
let totp_qrcode = totp.get_qr_base64()?;
@ -37,6 +45,7 @@ pub async fn show_totp_enable_start(
context! {
meta,
totp_qrcode,
invalid_code,
secret: totp.get_secret_base32(),
},
)
@ -63,15 +72,13 @@ pub async fn handle_totp_enable_start(
}
let secret = match auth::otp::get_secret(cookies) {
Some(v) => v,
None => return Ok(Redirect::to(uri!("/account", show_totp_enable_start)).into()),
None => return Ok(Redirect::to(uri!("/account", show_totp_enable_start(false))).into()),
};
let totp = auth::otp::make_totp(&user.id.to_string(), secret.to_bytes()?)?;
if !totp.check_current(&form.otp_code)? {
Err(String::from(
"woof TODO need to impl. a user error return w/ the same secret",
))?;
return Ok(Redirect::to(uri!("/account", show_totp_enable_start(true))).into());
}
warn!(

5
templates/account/otp/start.html.tera
View file

@ -18,8 +18,11 @@
<form method="post">
<input type="text" name="otp_code" id="otp_code" minlength="6" maxlength="6" required />
{% if invalid_code %}
<p class="field-error">The OTP code you sent was invalid, please retry.</p>
{% endif %}
<button type="submit">Enable 2FA</button>
<button type="submit" class="submit">Enable 2FA</button>
</form>
</div>
</section>