Remove plain-text credential store

librespot stores a more secure token that is valid for a while, rely on this
instead.

On the flip side this requires users to re-enter their login data when their
token has expired.

If the token validity is too short we will have to come up with another
approach, e.g. OS keyrings.

fixes #447
This commit is contained in:
Henrik Friedrichsen
2021-03-05 23:47:12 +01:00
parent f2bcfcaa60
commit d6db7a54d6
2 changed files with 6 additions and 36 deletions

View File

@@ -1,5 +1,3 @@
use std::path::Path;
use cursive::traits::Boxable;
use cursive::view::Identifiable;
use cursive::views::*;
@@ -8,13 +6,9 @@ use cursive::{CbSink, Cursive, CursiveExt};
use librespot_core::authentication::Credentials as RespotCredentials;
use librespot_protocol::authentication::AuthenticationType;
pub fn create_credentials(path: &Path) -> Result<RespotCredentials, String> {
pub fn create_credentials() -> Result<RespotCredentials, String> {
let mut login_cursive = Cursive::default();
let info_buf = TextContent::new("Failed to authenticate\n");
info_buf.append(format!(
"Cannot read config file from {}\n",
path.to_str().unwrap()
));
let info_buf = TextContent::new("Please login to Spotify\n");
let info_view = Dialog::around(TextView::new_with_content(info_buf))
.button("Login", move |s| {
let login_view = Dialog::new()

View File

@@ -37,7 +37,6 @@ extern crate regex;
use std::fs;
use std::path::PathBuf;
use std::process;
use std::str::FromStr;
use std::sync::Arc;
@@ -104,12 +103,7 @@ fn setup_logging(filename: &str) -> Result<(), fern::InitError> {
Ok(())
}
fn credentials_prompt(reset: bool, error_message: Option<String>) -> Credentials {
let path = config::config_path("credentials.toml");
if reset && fs::remove_file(&path).is_err() {
error!("could not delete credential file");
}
fn credentials_prompt(error_message: Option<String>) -> Credentials {
if let Some(message) = error_message {
let mut siv = cursive::default();
let dialog = cursive::views::Dialog::around(cursive::views::TextView::new(format!(
@@ -121,21 +115,7 @@ fn credentials_prompt(reset: bool, error_message: Option<String>) -> Credentials
siv.run();
}
let creds =
crate::config::load_or_generate_default(&path, authentication::create_credentials, true)
.unwrap_or_else(|e| {
eprintln!("{}", e);
process::exit(1);
});
#[cfg(target_family = "unix")]
std::fs::set_permissions(path, std::os::unix::fs::PermissionsExt::from_mode(0o600))
.unwrap_or_else(|e| {
eprintln!("{}", e);
process::exit(1);
});
creds
authentication::create_credentials().expect("Could not create credentials")
}
type UserData = Arc<UserDataInner>;
@@ -198,20 +178,16 @@ fn main() {
info!("Using cached credentials");
c
}
None => credentials_prompt(false, None),
None => credentials_prompt(None),
}
};
while let Err(error) = spotify::Spotify::test_credentials(credentials.clone()) {
let reset = error
.get_ref()
.map_or(false, |err| err.to_string().contains("BadCredentials"));
debug!("credential reset: {:?}", reset);
let error_msg = match error.get_ref() {
Some(inner) => inner.to_string(),
None => error.to_string(),
};
credentials = credentials_prompt(reset, Some(error_msg));
credentials = credentials_prompt(Some(error_msg));
}
let mut cursive = cursive::default().into_runner();