beenull/himalaya
1
0
Fork 0
mirror of https://github.com/soywod/himalaya.git synced 2024-07-05 17:15:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(config/imap): get first line for password (#374)

Browse source 
* fix(config/imap): get first line for password

Fixes #373

* fix(config/smtp): get first line password

Co-authored-by: Clément DOUIN <soywod@users.noreply.github.com>
This commit is contained in:
Dmitriy Pleshevskiy 2022-05-23 22:41:29 +00:00 committed by GitHub
parent 5a2d7fa6b5
commit ba8ef9adf6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
cli/src/config/account_config.rs
View file

@ -238,11 +238,12 @@ impl<'a> AccountConfig {
/// Builds the user account SMTP credentials.
pub fn smtp_creds(&self) -> Result<SmtpCredentials> {
let passwd = run_cmd(&self.smtp_passwd_cmd).context("cannot run SMTP passwd cmd")?;
let passwd = passwd
.trim_end_matches(|c| c == '\r' || c == '\n')
.to_owned();
let passwd = passwd.lines().next().context("cannot find password")?;
Ok(SmtpCredentials::new(self.smtp_login.to_owned(), passwd))
Ok(SmtpCredentials::new(
self.smtp_login.to_owned(),
passwd.to_owned(),
))
}
/// Encrypts a file.
@ -374,10 +375,8 @@ impl ImapBackendConfig {
/// Gets the IMAP password of the user account.
pub fn imap_passwd(&self) -> Result<String> {
let passwd = run_cmd(&self.imap_passwd_cmd).context("cannot run IMAP passwd cmd")?;
let passwd = passwd
.trim_end_matches(|c| c == '\r' || c == '\n')
.to_owned();
Ok(passwd)
let passwd = passwd.lines().next().context("cannot find password")?;
Ok(passwd.to_string())
}
}