simono41/steamguard-cli
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix manifest migration flow not prompting for passkey if not provided in args (#240)

Browse source
This commit is contained in:
Carson McManus 2023-06-26 20:15:22 -04:00 committed by GitHub
parent ad5a9b3131
commit 79c01833e8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/main.rs
View file

@ -15,7 +15,7 @@ use steamguard::{
use steamguard::{steamapi, DeviceDetails, LoginError, SteamGuardAccount, UserLogin}; use steamguard::{steamapi, DeviceDetails, LoginError, SteamGuardAccount, UserLogin};
use steamguard::{steamapi::AuthenticationClient, token::Tokens}; use steamguard::{steamapi::AuthenticationClient, token::Tokens};
use crate::accountmanager::migrate::load_and_migrate; use crate::accountmanager::migrate::{load_and_migrate, MigrationError};
pub use crate::accountmanager::{AccountManager, ManifestAccountLoadError, ManifestLoadError}; pub use crate::accountmanager::{AccountManager, ManifestAccountLoadError, ManifestLoadError};
use crate::commands::{CommandType, Subcommands}; use crate::commands::{CommandType, Subcommands};
@ -109,6 +109,8 @@ fn run(args: commands::Args) -> anyhow::Result<()> {
}; };
info!("reading manifest from {}", mafiles_dir); info!("reading manifest from {}", mafiles_dir);
let path = Path::new(&mafiles_dir).join("manifest.json"); let path = Path::new(&mafiles_dir).join("manifest.json");
let mut passkey = globalargs.passkey.clone();
let mut manager: accountmanager::AccountManager; let mut manager: accountmanager::AccountManager;
if !path.exists() { if !path.exists() {
error!("Did not find manifest in {}", mafiles_dir); error!("Did not find manifest in {}", mafiles_dir);
@ -129,8 +131,29 @@ fn run(args: commands::Args) -> anyhow::Result<()> {
Ok(m) => m, Ok(m) => m,
Err(ManifestLoadError::MigrationNeeded) => { Err(ManifestLoadError::MigrationNeeded) => {
info!("Migrating manifest"); info!("Migrating manifest");
let (manifest, accounts) = let manifest;
load_and_migrate(path.as_path(), globalargs.passkey.as_ref())?; let accounts;
loop {
match load_and_migrate(path.as_path(), passkey.as_ref()) {
Ok((m, a)) => {
manifest = m;
accounts = a;
break;
}
Err(MigrationError::MissingPasskey) => {
if passkey.is_some() {
error!("Incorrect passkey");
}
let raw =
rpassword::prompt_password_stdout("Enter encryption passkey: ")?;
passkey = Some(SecretString::new(raw));
}
Err(e) => {
error!("Failed to migrate manifest: {}", e);
return Err(e.into());
}
}
}
let mut manager = AccountManager::from_manifest(manifest, mafiles_dir); let mut manager = AccountManager::from_manifest(manifest, mafiles_dir);
manager.register_accounts(accounts); manager.register_accounts(accounts);
manager.submit_passkey(globalargs.passkey.clone()); manager.submit_passkey(globalargs.passkey.clone());
@ -144,7 +167,6 @@ fn run(args: commands::Args) -> anyhow::Result<()> {
} }
} }
let mut passkey = globalargs.passkey.clone();
manager.submit_passkey(passkey); manager.submit_passkey(passkey);
loop { loop {