vividboarder/bitwarden_rs
1
0
Fork 0
mirror of https://github.com/ViViDboarder/bitwarden_rs.git synced 2024-11-22 21:26:38 +00:00
Code Issues Releases Wiki Activity

Special messages when user has no password hint

Browse Source
This commit is contained in:
Jean-Christophe BEGUE 2018-09-11 13:04:34 +02:00
parent e2ab2f7306
commit 1c641d7635
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/api/core/accounts.rs
View File

@ -273,17 +273,16 @@ fn password_hint(data: JsonUpcase<PasswordHintData>, conn: DbConn) -> EmptyResul
} }
let user = user.unwrap(); let user = user.unwrap();
let hint = match user.password_hint {
Some(hint) => hint,
None => return Ok(()),
};
if let Some(ref mail_config) = CONFIG.mail { if let Some(ref mail_config) = CONFIG.mail {
if let Err(e) = mail::send_password_hint(&user.email, &hint, mail_config) { if let Err(e) = mail::send_password_hint(&user.email, user.password_hint, mail_config) {
err!(format!("There have been a problem sending the email: {}", e)); err!(format!("There have been a problem sending the email: {}", e));
} }
} else if CONFIG.show_password_hint { } else if CONFIG.show_password_hint {
if let Some(hint) = user.password_hint {
err!(format!("Your password hint is: {}", &hint)); err!(format!("Your password hint is: {}", &hint));
} else {
err!(format!("Sorry, you have no password hint..."));
}
} }
Ok(()) Ok(())

15
src/mail.rs
View File

@ -36,17 +36,23 @@ fn mailer(config: &MailConfig) -> SmtpTransport {
.build() .build()
} }
pub fn send_password_hint(address: &str, hint: &str, config: &MailConfig) -> Result<(), String> { pub fn send_password_hint(address: &str, hint: Option<String>, config: &MailConfig) -> Result<(), String> {
let body = format!( let (subject, body) = if let Some(hint) = hint {
("Your master password hint",
format!(
"You (or someone) recently requested your master password hint.\n\n\ "You (or someone) recently requested your master password hint.\n\n\
Your hint is: \"{}\"\n\n\ Your hint is: \"{}\"\n\n\
If you did not request your master password hint you can safely ignore this email.\n", If you did not request your master password hint you can safely ignore this email.\n",
hint); hint))
} else {
("Sorry, you have no password hint...",
"Sorry, you have not specified any password hint...\n".to_string())
};
let email = EmailBuilder::new() let email = EmailBuilder::new()
.to(address) .to(address)
.from((config.smtp_from.to_owned(), "Bitwarden-rs")) .from((config.smtp_from.to_owned(), "Bitwarden-rs"))
.subject("Your Master Password Hint") .subject(subject)
.body(body) .body(body)
.build().unwrap(); .build().unwrap();
@ -55,4 +61,3 @@ pub fn send_password_hint(address: &str, hint: &str, config: &MailConfig) -> Res
Err(e) => Err(e.description().to_string()), Err(e) => Err(e.description().to_string()),
} }
} }