2023-06-22 22:20:15 +02:00
|
|
|
use crate::accountmanager::legacy::SdaManifest;
|
2021-08-19 22:54:18 +02:00
|
|
|
pub use crate::encryption::EntryEncryptionParams;
|
|
|
|
use crate::encryption::EntryEncryptor;
|
2021-08-01 14:43:18 +02:00
|
|
|
use log::*;
|
2022-02-18 20:55:10 +01:00
|
|
|
use std::collections::HashMap;
|
2021-08-15 17:52:54 +02:00
|
|
|
use std::fs::File;
|
|
|
|
use std::io::{BufReader, Read, Write};
|
2021-03-26 00:47:44 +01:00
|
|
|
use std::path::Path;
|
2021-08-01 18:34:13 +02:00
|
|
|
use std::sync::{Arc, Mutex};
|
2022-06-19 20:44:18 +02:00
|
|
|
use steamguard::{ExposeSecret, SteamGuardAccount};
|
2021-08-17 03:13:58 +02:00
|
|
|
use thiserror::Error;
|
2021-03-25 22:45:41 +01:00
|
|
|
|
2023-06-22 22:20:15 +02:00
|
|
|
mod legacy;
|
|
|
|
pub mod manifest;
|
|
|
|
pub mod migrate;
|
2021-03-25 22:45:41 +01:00
|
|
|
|
2023-06-22 22:20:15 +02:00
|
|
|
pub use manifest::*;
|
2021-08-15 02:47:29 +02:00
|
|
|
|
2023-06-22 22:20:15 +02:00
|
|
|
#[derive(Debug, Default)]
|
|
|
|
pub struct AccountManager {
|
|
|
|
manifest: Manifest,
|
|
|
|
accounts: HashMap<String, Arc<Mutex<SteamGuardAccount>>>,
|
|
|
|
folder: String,
|
|
|
|
passkey: Option<String>,
|
2021-08-13 00:06:18 +02:00
|
|
|
}
|
|
|
|
|
2023-06-22 22:20:15 +02:00
|
|
|
impl AccountManager {
|
2021-08-13 00:06:18 +02:00
|
|
|
/// `path` should be the path to manifest.json
|
|
|
|
pub fn new(path: &Path) -> Self {
|
2023-06-22 22:20:15 +02:00
|
|
|
Self {
|
2021-08-13 00:06:18 +02:00
|
|
|
folder: String::from(path.parent().unwrap().to_str().unwrap()),
|
|
|
|
..Default::default()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2023-06-22 22:20:15 +02:00
|
|
|
pub fn from_manifest(manifest: Manifest, folder: String) -> Self {
|
|
|
|
Self {
|
|
|
|
manifest,
|
|
|
|
folder,
|
|
|
|
..Default::default()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn register_accounts(&mut self, accounts: Vec<SteamGuardAccount>) {
|
|
|
|
for account in accounts {
|
|
|
|
self.register_loaded_account(Arc::new(Mutex::new(account)));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn load(path: &Path) -> anyhow::Result<Self, ManifestLoadError> {
|
2021-08-08 18:54:46 +02:00
|
|
|
debug!("loading manifest: {:?}", &path);
|
|
|
|
let file = File::open(path)?;
|
2023-06-22 22:20:15 +02:00
|
|
|
let mut reader = BufReader::new(file);
|
|
|
|
let mut buffer = String::new();
|
|
|
|
reader.read_to_string(&mut buffer)?;
|
|
|
|
let manifest: Manifest = match serde_json::from_str(&buffer) {
|
|
|
|
Ok(m) => m,
|
|
|
|
Err(orig_err) => match serde_json::from_str::<SdaManifest>(&buffer) {
|
|
|
|
Ok(_) => return Err(ManifestLoadError::MigrationNeeded)?,
|
|
|
|
Err(_) => return Err(orig_err)?,
|
|
|
|
},
|
|
|
|
};
|
|
|
|
if manifest.version != CURRENT_MANIFEST_VERSION {
|
|
|
|
return Err(ManifestLoadError::MigrationNeeded)?;
|
|
|
|
}
|
|
|
|
let accountmanager = Self {
|
|
|
|
manifest,
|
|
|
|
folder: String::from(path.parent().unwrap().to_str().unwrap()),
|
|
|
|
..Default::default()
|
|
|
|
};
|
|
|
|
Ok(accountmanager)
|
2021-08-08 18:54:46 +02:00
|
|
|
}
|
2021-03-26 19:05:54 +01:00
|
|
|
|
2023-06-22 22:20:15 +02:00
|
|
|
/// Tells the manager to keep track of the encryption passkey, and use it for encryption when loading or saving accounts.
|
2022-02-18 20:55:10 +01:00
|
|
|
pub fn submit_passkey(&mut self, passkey: Option<String>) {
|
2023-03-18 15:08:57 +01:00
|
|
|
if let Some(p) = passkey.as_ref() {
|
|
|
|
if p.is_empty() {
|
|
|
|
panic!("Encryption passkey cannot be empty");
|
|
|
|
}
|
|
|
|
}
|
2022-02-18 20:55:10 +01:00
|
|
|
if passkey.is_some() {
|
|
|
|
debug!("passkey was submitted to manifest");
|
|
|
|
} else {
|
|
|
|
debug!("passkey was revoked from manifest");
|
|
|
|
}
|
|
|
|
self.passkey = passkey;
|
|
|
|
}
|
|
|
|
|
2023-06-22 22:20:15 +02:00
|
|
|
/// Loads all accounts, and registers them.
|
2022-02-18 20:55:10 +01:00
|
|
|
pub fn load_accounts(&mut self) -> anyhow::Result<(), ManifestAccountLoadError> {
|
2022-02-22 15:03:40 +01:00
|
|
|
let mut accounts = vec![];
|
2023-06-22 22:20:15 +02:00
|
|
|
for entry in &self.manifest.entries {
|
|
|
|
let account = self.load_account_by_entry(entry)?;
|
2022-02-22 15:03:40 +01:00
|
|
|
accounts.push(account);
|
|
|
|
}
|
|
|
|
for account in accounts {
|
|
|
|
self.register_loaded_account(account);
|
2022-02-18 20:55:10 +01:00
|
|
|
}
|
|
|
|
Ok(())
|
|
|
|
}
|
|
|
|
|
2022-02-22 15:03:40 +01:00
|
|
|
/// Loads an account by account name.
|
|
|
|
/// Must call `register_loaded_account` after loading the account.
|
2022-02-18 20:55:10 +01:00
|
|
|
fn load_account(
|
2022-02-22 15:03:40 +01:00
|
|
|
&self,
|
2022-02-18 20:55:10 +01:00
|
|
|
account_name: &String,
|
2022-02-22 15:03:40 +01:00
|
|
|
) -> anyhow::Result<Arc<Mutex<SteamGuardAccount>>, ManifestAccountLoadError> {
|
|
|
|
let entry = self.get_entry(account_name)?;
|
2023-06-22 22:20:15 +02:00
|
|
|
self.load_account_by_entry(entry)
|
2022-02-22 15:03:40 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/// Loads an account from a manifest entry.
|
|
|
|
/// Must call `register_loaded_account` after loading the account.
|
|
|
|
fn load_account_by_entry(
|
|
|
|
&self,
|
|
|
|
entry: &ManifestEntry,
|
|
|
|
) -> anyhow::Result<Arc<Mutex<SteamGuardAccount>>, ManifestAccountLoadError> {
|
2022-02-18 20:55:10 +01:00
|
|
|
let path = Path::new(&self.folder).join(&entry.filename);
|
2023-06-22 22:20:15 +02:00
|
|
|
let account = entry.load(
|
|
|
|
path.as_path(),
|
|
|
|
self.passkey.as_ref(),
|
|
|
|
entry.encryption.as_ref(),
|
|
|
|
)?;
|
2022-02-22 15:03:40 +01:00
|
|
|
let account = Arc::new(Mutex::new(account));
|
|
|
|
Ok(account)
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Register an account as loaded, so it can be operated on.
|
|
|
|
fn register_loaded_account(&mut self, account: Arc<Mutex<SteamGuardAccount>>) {
|
|
|
|
let account_name = account.lock().unwrap().account_name.clone();
|
|
|
|
self.accounts.insert(account_name, account);
|
2021-08-08 18:54:46 +02:00
|
|
|
}
|
2021-08-01 17:20:57 +02:00
|
|
|
|
2021-09-06 22:51:44 +02:00
|
|
|
pub fn account_exists(&self, account_name: &String) -> bool {
|
2023-06-22 22:20:15 +02:00
|
|
|
for entry in &self.manifest.entries {
|
2021-09-06 22:51:44 +02:00
|
|
|
if &entry.account_name == account_name {
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
2023-06-22 22:20:15 +02:00
|
|
|
false
|
2021-09-06 22:51:44 +02:00
|
|
|
}
|
|
|
|
|
2021-08-08 18:54:46 +02:00
|
|
|
pub fn add_account(&mut self, account: SteamGuardAccount) {
|
|
|
|
debug!("adding account to manifest: {}", account.account_name);
|
2023-06-22 22:20:15 +02:00
|
|
|
self.manifest.entries.push(ManifestEntry {
|
2021-08-08 18:54:46 +02:00
|
|
|
filename: format!("{}.maFile", &account.account_name),
|
2023-06-22 22:20:15 +02:00
|
|
|
steam_id: account.steam_id,
|
2021-08-14 19:39:01 +02:00
|
|
|
account_name: account.account_name.clone(),
|
2021-08-15 02:47:29 +02:00
|
|
|
encryption: None,
|
2021-08-08 18:54:46 +02:00
|
|
|
});
|
2022-02-18 20:55:10 +01:00
|
|
|
self.accounts
|
|
|
|
.insert(account.account_name.clone(), Arc::new(Mutex::new(account)));
|
2021-08-08 18:54:46 +02:00
|
|
|
}
|
2021-08-01 17:20:57 +02:00
|
|
|
|
2022-06-19 17:43:37 +02:00
|
|
|
pub fn import_account(&mut self, import_path: &String) -> anyhow::Result<()> {
|
|
|
|
let path = Path::new(import_path);
|
2021-08-14 01:04:03 +02:00
|
|
|
ensure!(path.exists(), "{} does not exist.", import_path);
|
|
|
|
ensure!(path.is_file(), "{} is not a file.", import_path);
|
|
|
|
|
|
|
|
let file = File::open(path)?;
|
|
|
|
let reader = BufReader::new(file);
|
|
|
|
let account: SteamGuardAccount = serde_json::from_reader(reader)?;
|
2021-09-06 22:57:36 +02:00
|
|
|
ensure!(
|
|
|
|
!self.account_exists(&account.account_name),
|
|
|
|
"Account already exists in manifest, please remove it first."
|
|
|
|
);
|
2021-08-14 01:04:03 +02:00
|
|
|
self.add_account(account);
|
|
|
|
|
2023-06-22 22:20:15 +02:00
|
|
|
Ok(())
|
2021-08-14 01:04:03 +02:00
|
|
|
}
|
|
|
|
|
2021-08-12 01:39:29 +02:00
|
|
|
pub fn remove_account(&mut self, account_name: String) {
|
|
|
|
let index = self
|
2023-06-22 22:20:15 +02:00
|
|
|
.manifest
|
2022-02-18 20:55:10 +01:00
|
|
|
.entries
|
2021-08-12 01:39:29 +02:00
|
|
|
.iter()
|
2022-02-18 20:55:10 +01:00
|
|
|
.position(|a| a.account_name == account_name)
|
2021-08-12 01:39:29 +02:00
|
|
|
.unwrap();
|
2022-02-18 20:55:10 +01:00
|
|
|
self.accounts.remove(&account_name);
|
2023-06-22 22:20:15 +02:00
|
|
|
self.manifest.entries.remove(index);
|
2021-08-12 01:39:29 +02:00
|
|
|
}
|
|
|
|
|
2022-02-18 20:55:10 +01:00
|
|
|
/// Saves the manifest and all loaded accounts.
|
|
|
|
pub fn save(&self) -> anyhow::Result<()> {
|
2021-09-01 14:52:23 +02:00
|
|
|
info!("Saving manifest and accounts...");
|
2022-02-18 20:55:10 +01:00
|
|
|
for account in self
|
|
|
|
.accounts
|
|
|
|
.values()
|
|
|
|
.map(|a| a.clone().lock().unwrap().clone())
|
|
|
|
{
|
|
|
|
let entry = self.get_entry(&account.account_name)?.clone();
|
2021-08-08 18:54:46 +02:00
|
|
|
debug!("saving {}", entry.filename);
|
2022-02-18 20:55:10 +01:00
|
|
|
let serialized = serde_json::to_vec(&account)?;
|
2021-08-08 18:54:46 +02:00
|
|
|
ensure!(
|
|
|
|
serialized.len() > 2,
|
|
|
|
"Something extra weird happened and the account was serialized into nothing."
|
|
|
|
);
|
2021-08-16 05:20:49 +02:00
|
|
|
|
2023-06-22 22:20:15 +02:00
|
|
|
let final_buffer: Vec<u8> = match (&self.passkey, entry.encryption.as_ref()) {
|
2021-08-16 05:20:49 +02:00
|
|
|
(Some(passkey), Some(params)) => {
|
2023-06-22 22:20:15 +02:00
|
|
|
crate::encryption::LegacySdaCompatible::encrypt(passkey, params, serialized)?
|
2021-08-16 05:20:49 +02:00
|
|
|
}
|
|
|
|
(None, Some(_)) => {
|
|
|
|
bail!("maFiles are encrypted, but no passkey was provided.");
|
|
|
|
}
|
2023-06-22 22:20:15 +02:00
|
|
|
(_, None) => serialized,
|
2021-08-16 05:20:49 +02:00
|
|
|
};
|
|
|
|
|
2021-08-08 18:54:46 +02:00
|
|
|
let path = Path::new(&self.folder).join(&entry.filename);
|
|
|
|
let mut file = File::create(path)?;
|
2021-08-16 05:20:49 +02:00
|
|
|
file.write_all(final_buffer.as_slice())?;
|
2021-08-08 18:54:46 +02:00
|
|
|
file.sync_data()?;
|
|
|
|
}
|
|
|
|
debug!("saving manifest");
|
2023-06-22 22:20:15 +02:00
|
|
|
let manifest_serialized = serde_json::to_string(&self.manifest)?;
|
2021-08-08 18:54:46 +02:00
|
|
|
let path = Path::new(&self.folder).join("manifest.json");
|
|
|
|
let mut file = File::create(path)?;
|
|
|
|
file.write_all(manifest_serialized.as_bytes())?;
|
|
|
|
file.sync_data()?;
|
|
|
|
Ok(())
|
|
|
|
}
|
2022-02-18 20:55:10 +01:00
|
|
|
|
|
|
|
/// Return all loaded accounts. Order is not guarenteed.
|
2022-12-06 16:07:25 +01:00
|
|
|
#[allow(dead_code)]
|
2022-02-18 20:55:10 +01:00
|
|
|
pub fn get_all_loaded(&self) -> Vec<Arc<Mutex<SteamGuardAccount>>> {
|
2023-06-22 22:20:15 +02:00
|
|
|
return self.accounts.values().cloned().collect();
|
2022-02-18 20:55:10 +01:00
|
|
|
}
|
|
|
|
|
2022-12-06 16:07:25 +01:00
|
|
|
#[allow(dead_code)]
|
2022-02-18 20:55:10 +01:00
|
|
|
pub fn get_entry(
|
|
|
|
&self,
|
|
|
|
account_name: &String,
|
|
|
|
) -> anyhow::Result<&ManifestEntry, ManifestAccountLoadError> {
|
2023-06-22 22:20:15 +02:00
|
|
|
self.manifest
|
|
|
|
.entries
|
2022-02-18 20:55:10 +01:00
|
|
|
.iter()
|
|
|
|
.find(|e| &e.account_name == account_name)
|
|
|
|
.ok_or(ManifestAccountLoadError::MissingManifestEntry)
|
|
|
|
}
|
|
|
|
|
2022-12-06 16:07:25 +01:00
|
|
|
#[allow(dead_code)]
|
2022-02-18 20:55:10 +01:00
|
|
|
pub fn get_entry_mut(
|
|
|
|
&mut self,
|
|
|
|
account_name: &String,
|
|
|
|
) -> anyhow::Result<&mut ManifestEntry, ManifestAccountLoadError> {
|
2023-06-22 22:20:15 +02:00
|
|
|
self.manifest
|
|
|
|
.entries
|
2022-02-18 20:55:10 +01:00
|
|
|
.iter_mut()
|
|
|
|
.find(|e| &e.account_name == account_name)
|
|
|
|
.ok_or(ManifestAccountLoadError::MissingManifestEntry)
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn has_passkey(&self) -> bool {
|
|
|
|
self.passkey.is_some()
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Gets the specified account by name.
|
|
|
|
/// Fails if the account does not exist in the manifest entries.
|
|
|
|
pub fn get_account(
|
|
|
|
&self,
|
|
|
|
account_name: &String,
|
|
|
|
) -> anyhow::Result<Arc<Mutex<SteamGuardAccount>>> {
|
|
|
|
let account = self
|
|
|
|
.accounts
|
|
|
|
.get(account_name)
|
2023-06-22 22:20:15 +02:00
|
|
|
.cloned()
|
2022-02-18 20:55:10 +01:00
|
|
|
.ok_or(anyhow!("Account not loaded"));
|
2023-06-22 22:20:15 +02:00
|
|
|
account
|
2022-02-18 20:55:10 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/// Get or load the spcified account.
|
|
|
|
pub fn get_or_load_account(
|
|
|
|
&mut self,
|
|
|
|
account_name: &String,
|
|
|
|
) -> anyhow::Result<Arc<Mutex<SteamGuardAccount>>, ManifestAccountLoadError> {
|
|
|
|
let account = self.get_account(account_name);
|
2023-06-22 22:20:15 +02:00
|
|
|
if let Ok(account) = account {
|
|
|
|
return Ok(account);
|
2022-02-18 20:55:10 +01:00
|
|
|
}
|
2023-06-22 22:20:15 +02:00
|
|
|
let account = self.load_account(account_name)?;
|
2022-02-22 15:03:40 +01:00
|
|
|
self.register_loaded_account(account.clone());
|
2023-06-22 22:20:15 +02:00
|
|
|
Ok(account)
|
2022-02-22 15:03:40 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/// Determine if any manifest entries are missing `account_name`.
|
|
|
|
fn is_missing_account_name(&self) -> bool {
|
2023-06-22 22:20:15 +02:00
|
|
|
self.manifest
|
|
|
|
.entries
|
|
|
|
.iter()
|
|
|
|
.any(|e| e.account_name.is_empty())
|
2022-02-22 15:03:40 +01:00
|
|
|
}
|
|
|
|
|
2022-12-05 16:55:45 +01:00
|
|
|
fn has_any_uppercase_in_account_names(&self) -> bool {
|
2023-06-22 22:20:15 +02:00
|
|
|
self.manifest
|
|
|
|
.entries
|
2022-12-05 16:55:45 +01:00
|
|
|
.iter()
|
|
|
|
.any(|e| e.account_name != e.account_name.to_lowercase())
|
|
|
|
}
|
|
|
|
|
2022-02-22 15:19:56 +01:00
|
|
|
/// Performs auto-upgrades on the manifest. Returns true if any upgrades were performed.
|
|
|
|
pub fn auto_upgrade(&mut self) -> anyhow::Result<bool, ManifestAccountLoadError> {
|
2022-02-22 15:03:40 +01:00
|
|
|
debug!("Performing auto-upgrade...");
|
2022-02-22 15:19:56 +01:00
|
|
|
let mut upgraded = false;
|
2022-02-22 15:03:40 +01:00
|
|
|
if self.is_missing_account_name() {
|
|
|
|
debug!("Adding missing account names");
|
2023-06-22 22:20:15 +02:00
|
|
|
for i in 0..self.manifest.entries.len() {
|
|
|
|
let account = self.load_account_by_entry(&self.manifest.entries[i].clone())?;
|
|
|
|
self.manifest.entries[i].account_name =
|
|
|
|
account.lock().unwrap().account_name.clone();
|
2022-02-22 15:03:40 +01:00
|
|
|
}
|
2022-02-22 15:19:56 +01:00
|
|
|
upgraded = true;
|
2022-02-22 15:03:40 +01:00
|
|
|
}
|
|
|
|
|
2022-12-05 16:55:45 +01:00
|
|
|
if self.has_any_uppercase_in_account_names() {
|
|
|
|
debug!("Lowercasing account names");
|
2023-06-22 22:20:15 +02:00
|
|
|
for i in 0..self.manifest.entries.len() {
|
|
|
|
self.manifest.entries[i].account_name =
|
|
|
|
self.manifest.entries[i].account_name.to_lowercase();
|
2022-12-05 16:55:45 +01:00
|
|
|
}
|
|
|
|
upgraded = true;
|
|
|
|
}
|
|
|
|
|
2022-02-22 15:19:56 +01:00
|
|
|
Ok(upgraded)
|
2022-02-18 20:55:10 +01:00
|
|
|
}
|
2023-06-22 22:20:15 +02:00
|
|
|
|
|
|
|
pub fn iter(&self) -> impl Iterator<Item = &ManifestEntry> {
|
|
|
|
self.manifest.entries.iter()
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn iter_mut(&mut self) -> impl Iterator<Item = &mut ManifestEntry> {
|
|
|
|
self.manifest.entries.iter_mut()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
trait EntryLoader<T> {
|
|
|
|
fn load(
|
|
|
|
&self,
|
|
|
|
path: &Path,
|
|
|
|
passkey: Option<&String>,
|
|
|
|
encryption_params: Option<&EntryEncryptionParams>,
|
|
|
|
) -> anyhow::Result<T, ManifestAccountLoadError>;
|
|
|
|
}
|
|
|
|
|
|
|
|
impl EntryLoader<SteamGuardAccount> for ManifestEntry {
|
|
|
|
fn load(
|
|
|
|
&self,
|
|
|
|
path: &Path,
|
|
|
|
passkey: Option<&String>,
|
|
|
|
encryption_params: Option<&EntryEncryptionParams>,
|
|
|
|
) -> anyhow::Result<SteamGuardAccount, ManifestAccountLoadError> {
|
|
|
|
debug!("loading entry: {:?}", path);
|
|
|
|
let file = File::open(path)?;
|
|
|
|
let mut reader = BufReader::new(file);
|
|
|
|
let account: SteamGuardAccount = match (&passkey, encryption_params.as_ref()) {
|
|
|
|
(Some(passkey), Some(params)) => {
|
|
|
|
let mut ciphertext: Vec<u8> = vec![];
|
|
|
|
reader.read_to_end(&mut ciphertext)?;
|
|
|
|
let plaintext =
|
|
|
|
crate::encryption::LegacySdaCompatible::decrypt(passkey, params, ciphertext)?;
|
|
|
|
if plaintext[0] != b'{' && plaintext[plaintext.len() - 1] != b'}' {
|
|
|
|
return Err(ManifestAccountLoadError::IncorrectPasskey);
|
|
|
|
}
|
|
|
|
let s = std::str::from_utf8(&plaintext).unwrap();
|
|
|
|
serde_json::from_str(s)?
|
|
|
|
}
|
|
|
|
(None, Some(_)) => {
|
|
|
|
return Err(ManifestAccountLoadError::MissingPasskey);
|
|
|
|
}
|
|
|
|
(_, None) => serde_json::from_reader(reader)?,
|
|
|
|
};
|
|
|
|
Ok(account)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#[derive(Debug, Error)]
|
|
|
|
pub enum ManifestLoadError {
|
|
|
|
#[error("Could not find manifest.json in the specified directory.")]
|
|
|
|
Missing(#[from] std::io::Error),
|
|
|
|
#[error("Manifest needs to be migrated to the latest format.")]
|
|
|
|
MigrationNeeded,
|
|
|
|
#[error("Failed to deserialize the manifest.")]
|
|
|
|
DeserializationFailed(#[from] serde_json::Error),
|
|
|
|
#[error(transparent)]
|
|
|
|
Unknown(#[from] anyhow::Error),
|
2021-03-26 00:47:44 +01:00
|
|
|
}
|
2021-08-14 19:39:01 +02:00
|
|
|
|
2021-08-17 03:13:58 +02:00
|
|
|
#[derive(Debug, Error)]
|
|
|
|
pub enum ManifestAccountLoadError {
|
2022-02-18 20:55:10 +01:00
|
|
|
#[error("Could not find an entry in the manifest for this account. Check your spelling.")]
|
|
|
|
MissingManifestEntry,
|
2021-08-17 03:13:58 +02:00
|
|
|
#[error("Manifest accounts are encrypted, but no passkey was provided.")]
|
|
|
|
MissingPasskey,
|
2021-08-20 16:01:23 +02:00
|
|
|
#[error("Incorrect passkey provided.")]
|
|
|
|
IncorrectPasskey,
|
2021-08-19 22:54:18 +02:00
|
|
|
#[error("Failed to decrypt account. {self:?}")]
|
|
|
|
DecryptionFailed(#[from] crate::encryption::EntryEncryptionError),
|
2021-08-17 03:13:58 +02:00
|
|
|
#[error("Failed to deserialize the account.")]
|
|
|
|
DeserializationFailed(#[from] serde_json::Error),
|
|
|
|
#[error(transparent)]
|
|
|
|
Unknown(#[from] anyhow::Error),
|
|
|
|
}
|
|
|
|
|
|
|
|
impl From<block_modes::BlockModeError> for ManifestAccountLoadError {
|
|
|
|
fn from(error: block_modes::BlockModeError) -> Self {
|
2023-06-22 22:20:15 +02:00
|
|
|
Self::Unknown(anyhow::Error::from(error))
|
2021-08-17 03:13:58 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
impl From<base64::DecodeError> for ManifestAccountLoadError {
|
|
|
|
fn from(error: base64::DecodeError) -> Self {
|
2023-06-22 22:20:15 +02:00
|
|
|
Self::Unknown(anyhow::Error::from(error))
|
2021-08-17 03:13:58 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
impl From<block_modes::InvalidKeyIvLength> for ManifestAccountLoadError {
|
|
|
|
fn from(error: block_modes::InvalidKeyIvLength) -> Self {
|
2023-06-22 22:20:15 +02:00
|
|
|
Self::Unknown(anyhow::Error::from(error))
|
2021-08-17 03:13:58 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
impl From<std::io::Error> for ManifestAccountLoadError {
|
|
|
|
fn from(error: std::io::Error) -> Self {
|
2023-06-22 22:20:15 +02:00
|
|
|
Self::Unknown(anyhow::Error::from(error))
|
2021-08-17 03:13:58 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-08-14 19:39:01 +02:00
|
|
|
#[cfg(test)]
|
|
|
|
mod tests {
|
|
|
|
use super::*;
|
2022-06-19 20:09:08 +02:00
|
|
|
use steamguard::ExposeSecret;
|
2022-06-19 20:44:18 +02:00
|
|
|
use tempdir::TempDir;
|
2021-08-14 19:39:01 +02:00
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_should_save_new_manifest() {
|
|
|
|
let tmp_dir = TempDir::new("steamguard-cli-test").unwrap();
|
|
|
|
let manifest_path = tmp_dir.path().join("manifest.json");
|
2023-06-22 22:20:15 +02:00
|
|
|
let manager = AccountManager::new(manifest_path.as_path());
|
|
|
|
assert!(matches!(manager.save(), Ok(_)));
|
2021-08-14 19:39:01 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
2021-08-25 03:13:16 +02:00
|
|
|
fn test_should_save_and_load_manifest() -> anyhow::Result<()> {
|
|
|
|
let tmp_dir = TempDir::new("steamguard-cli-test")?;
|
2021-08-14 19:39:01 +02:00
|
|
|
let manifest_path = tmp_dir.path().join("manifest.json");
|
2021-08-25 03:13:16 +02:00
|
|
|
println!("tempdir: {}", manifest_path.display());
|
2023-06-22 22:20:15 +02:00
|
|
|
let mut manager = AccountManager::new(manifest_path.as_path());
|
2021-08-14 19:39:01 +02:00
|
|
|
let mut account = SteamGuardAccount::new();
|
|
|
|
account.account_name = "asdf1234".into();
|
2022-06-19 20:09:08 +02:00
|
|
|
account.revocation_code = String::from("R12345").into();
|
2021-08-25 03:13:16 +02:00
|
|
|
account.shared_secret = steamguard::token::TwoFactorSecret::parse_shared_secret(
|
|
|
|
"zvIayp3JPvtvX/QGHqsqKBk/44s=".into(),
|
|
|
|
)?;
|
2023-06-22 22:20:15 +02:00
|
|
|
manager.add_account(account);
|
|
|
|
manager.save()?;
|
|
|
|
|
|
|
|
let mut manager = AccountManager::load(manifest_path.as_path())?;
|
|
|
|
assert_eq!(manager.manifest.entries.len(), 1);
|
|
|
|
assert_eq!(manager.manifest.entries[0].filename, "asdf1234.maFile");
|
|
|
|
manager.load_accounts()?;
|
|
|
|
assert_eq!(manager.manifest.entries.len(), manager.accounts.len());
|
2022-02-18 20:55:10 +01:00
|
|
|
let account_name = "asdf1234".into();
|
2021-08-14 19:39:01 +02:00
|
|
|
assert_eq!(
|
2023-06-22 22:20:15 +02:00
|
|
|
manager
|
2022-02-18 20:55:10 +01:00
|
|
|
.get_account(&account_name)?
|
|
|
|
.lock()
|
|
|
|
.unwrap()
|
|
|
|
.account_name,
|
2021-08-14 19:39:01 +02:00
|
|
|
"asdf1234"
|
|
|
|
);
|
|
|
|
assert_eq!(
|
2023-06-22 22:20:15 +02:00
|
|
|
manager
|
2022-02-18 20:55:10 +01:00
|
|
|
.get_account(&account_name)?
|
|
|
|
.lock()
|
|
|
|
.unwrap()
|
2022-06-19 20:44:18 +02:00
|
|
|
.revocation_code
|
|
|
|
.expose_secret(),
|
2021-08-14 19:39:01 +02:00
|
|
|
"R12345"
|
|
|
|
);
|
|
|
|
assert_eq!(
|
2023-06-22 22:20:15 +02:00
|
|
|
manager
|
2022-02-18 20:55:10 +01:00
|
|
|
.get_account(&account_name)?
|
|
|
|
.lock()
|
|
|
|
.unwrap()
|
|
|
|
.shared_secret,
|
2021-08-25 03:13:16 +02:00
|
|
|
steamguard::token::TwoFactorSecret::parse_shared_secret(
|
|
|
|
"zvIayp3JPvtvX/QGHqsqKBk/44s=".into()
|
|
|
|
)?,
|
2021-08-14 19:39:01 +02:00
|
|
|
);
|
2023-06-22 22:20:15 +02:00
|
|
|
Ok(())
|
2021-08-14 19:39:01 +02:00
|
|
|
}
|
|
|
|
|
2021-08-16 05:20:49 +02:00
|
|
|
#[test]
|
2022-02-18 20:55:10 +01:00
|
|
|
fn test_should_save_and_load_manifest_encrypted() -> anyhow::Result<()> {
|
|
|
|
let passkey = Some("password".into());
|
|
|
|
let tmp_dir = TempDir::new("steamguard-cli-test")?;
|
2021-08-16 05:20:49 +02:00
|
|
|
let manifest_path = tmp_dir.path().join("manifest.json");
|
2023-06-22 22:20:15 +02:00
|
|
|
let mut manager = AccountManager::new(manifest_path.as_path());
|
2021-08-16 05:20:49 +02:00
|
|
|
let mut account = SteamGuardAccount::new();
|
|
|
|
account.account_name = "asdf1234".into();
|
2022-06-19 20:09:08 +02:00
|
|
|
account.revocation_code = String::from("R12345").into();
|
2021-08-25 03:13:16 +02:00
|
|
|
account.shared_secret = steamguard::token::TwoFactorSecret::parse_shared_secret(
|
|
|
|
"zvIayp3JPvtvX/QGHqsqKBk/44s=".into(),
|
2022-02-18 20:55:10 +01:00
|
|
|
)?;
|
2023-06-22 22:20:15 +02:00
|
|
|
manager.add_account(account);
|
|
|
|
manager.manifest.entries[0].encryption = Some(EntryEncryptionParams::generate());
|
|
|
|
manager.submit_passkey(passkey.clone());
|
|
|
|
assert!(matches!(manager.save(), Ok(_)));
|
|
|
|
|
|
|
|
let mut loaded_manager = AccountManager::load(manifest_path.as_path()).unwrap();
|
|
|
|
loaded_manager.submit_passkey(passkey);
|
|
|
|
assert_eq!(loaded_manager.manifest.entries.len(), 1);
|
|
|
|
assert_eq!(
|
|
|
|
loaded_manager.manifest.entries[0].filename,
|
|
|
|
"asdf1234.maFile"
|
|
|
|
);
|
|
|
|
let _r = loaded_manager.load_accounts();
|
2022-02-18 20:55:10 +01:00
|
|
|
if _r.is_err() {
|
|
|
|
eprintln!("{:?}", _r);
|
|
|
|
}
|
|
|
|
assert!(matches!(_r, Ok(_)));
|
2021-08-16 05:20:49 +02:00
|
|
|
assert_eq!(
|
2023-06-22 22:20:15 +02:00
|
|
|
loaded_manager.manifest.entries.len(),
|
|
|
|
loaded_manager.accounts.len()
|
2021-08-16 05:20:49 +02:00
|
|
|
);
|
2022-02-18 20:55:10 +01:00
|
|
|
let account_name = "asdf1234".into();
|
2021-08-16 05:20:49 +02:00
|
|
|
assert_eq!(
|
2023-06-22 22:20:15 +02:00
|
|
|
loaded_manager
|
2022-02-18 20:55:10 +01:00
|
|
|
.get_account(&account_name)?
|
|
|
|
.lock()
|
|
|
|
.unwrap()
|
|
|
|
.account_name,
|
2021-08-16 05:20:49 +02:00
|
|
|
"asdf1234"
|
|
|
|
);
|
|
|
|
assert_eq!(
|
2023-06-22 22:20:15 +02:00
|
|
|
loaded_manager
|
2022-02-18 20:55:10 +01:00
|
|
|
.get_account(&account_name)?
|
|
|
|
.lock()
|
|
|
|
.unwrap()
|
2022-06-19 20:44:18 +02:00
|
|
|
.revocation_code
|
|
|
|
.expose_secret(),
|
2021-08-16 05:20:49 +02:00
|
|
|
"R12345"
|
|
|
|
);
|
|
|
|
assert_eq!(
|
2023-06-22 22:20:15 +02:00
|
|
|
loaded_manager
|
2022-02-18 20:55:10 +01:00
|
|
|
.get_account(&account_name)?
|
|
|
|
.lock()
|
|
|
|
.unwrap()
|
|
|
|
.shared_secret,
|
2021-08-25 03:13:16 +02:00
|
|
|
steamguard::token::TwoFactorSecret::parse_shared_secret(
|
|
|
|
"zvIayp3JPvtvX/QGHqsqKBk/44s=".into()
|
|
|
|
)
|
|
|
|
.unwrap(),
|
2021-08-16 05:20:49 +02:00
|
|
|
);
|
2022-02-18 20:55:10 +01:00
|
|
|
Ok(())
|
2021-08-16 05:20:49 +02:00
|
|
|
}
|
|
|
|
|
2021-08-19 15:55:52 +02:00
|
|
|
#[test]
|
|
|
|
fn test_should_save_and_load_manifest_encrypted_longer() -> anyhow::Result<()> {
|
2022-02-18 20:55:10 +01:00
|
|
|
let passkey = Some("password".into());
|
|
|
|
let tmp_dir = TempDir::new("steamguard-cli-test")?;
|
2021-08-19 15:55:52 +02:00
|
|
|
let manifest_path = tmp_dir.path().join("manifest.json");
|
2023-06-22 22:20:15 +02:00
|
|
|
let mut manager = AccountManager::new(manifest_path.as_path());
|
2021-08-19 15:55:52 +02:00
|
|
|
let mut account = SteamGuardAccount::new();
|
|
|
|
account.account_name = "asdf1234".into();
|
2022-06-19 20:09:08 +02:00
|
|
|
account.revocation_code = String::from("R12345").into();
|
2021-08-25 03:13:16 +02:00
|
|
|
account.shared_secret = steamguard::token::TwoFactorSecret::parse_shared_secret(
|
|
|
|
"zvIayp3JPvtvX/QGHqsqKBk/44s=".into(),
|
|
|
|
)
|
|
|
|
.unwrap();
|
2022-06-19 20:09:08 +02:00
|
|
|
account.uri = String::from("otpauth://;laksdjf;lkasdjf;lkasdj;flkasdjlkf;asjdlkfjslk;adjfl;kasdjf;lksdjflk;asjd;lfajs;ldkfjaslk;djf;lsakdjf;lksdj").into();
|
2021-08-19 15:55:52 +02:00
|
|
|
account.token_gid = "asdf1234".into();
|
2023-06-22 22:20:15 +02:00
|
|
|
manager.add_account(account);
|
|
|
|
manager.submit_passkey(passkey.clone());
|
|
|
|
manager.manifest.entries[0].encryption = Some(EntryEncryptionParams::generate());
|
|
|
|
manager.save()?;
|
|
|
|
|
|
|
|
let mut loaded_manager = AccountManager::load(manifest_path.as_path())?;
|
|
|
|
loaded_manager.submit_passkey(passkey);
|
|
|
|
assert_eq!(loaded_manager.manifest.entries.len(), 1);
|
2021-08-19 15:55:52 +02:00
|
|
|
assert_eq!(
|
2023-06-22 22:20:15 +02:00
|
|
|
loaded_manager.manifest.entries[0].filename,
|
|
|
|
"asdf1234.maFile"
|
|
|
|
);
|
|
|
|
loaded_manager.load_accounts()?;
|
|
|
|
assert_eq!(
|
|
|
|
loaded_manager.manifest.entries.len(),
|
|
|
|
loaded_manager.accounts.len()
|
2021-08-19 15:55:52 +02:00
|
|
|
);
|
2022-02-18 20:55:10 +01:00
|
|
|
let account_name = "asdf1234".into();
|
2021-08-19 15:55:52 +02:00
|
|
|
assert_eq!(
|
2023-06-22 22:20:15 +02:00
|
|
|
loaded_manager
|
2022-02-18 20:55:10 +01:00
|
|
|
.get_account(&account_name)?
|
|
|
|
.lock()
|
|
|
|
.unwrap()
|
|
|
|
.account_name,
|
2021-08-19 15:55:52 +02:00
|
|
|
"asdf1234"
|
|
|
|
);
|
|
|
|
assert_eq!(
|
2023-06-22 22:20:15 +02:00
|
|
|
loaded_manager
|
2022-02-18 20:55:10 +01:00
|
|
|
.get_account(&account_name)?
|
|
|
|
.lock()
|
|
|
|
.unwrap()
|
2022-06-19 20:44:18 +02:00
|
|
|
.revocation_code
|
|
|
|
.expose_secret(),
|
2021-08-19 15:55:52 +02:00
|
|
|
"R12345"
|
|
|
|
);
|
|
|
|
assert_eq!(
|
2023-06-22 22:20:15 +02:00
|
|
|
loaded_manager
|
2022-02-18 20:55:10 +01:00
|
|
|
.get_account(&account_name)?
|
|
|
|
.lock()
|
|
|
|
.unwrap()
|
|
|
|
.shared_secret,
|
2021-08-25 03:13:16 +02:00
|
|
|
steamguard::token::TwoFactorSecret::parse_shared_secret(
|
|
|
|
"zvIayp3JPvtvX/QGHqsqKBk/44s=".into()
|
|
|
|
)
|
|
|
|
.unwrap(),
|
2021-08-19 15:55:52 +02:00
|
|
|
);
|
|
|
|
|
2023-06-22 22:20:15 +02:00
|
|
|
Ok(())
|
2021-08-19 15:55:52 +02:00
|
|
|
}
|
|
|
|
|
2021-08-14 19:39:01 +02:00
|
|
|
#[test]
|
2022-02-18 20:55:10 +01:00
|
|
|
fn test_should_import() -> anyhow::Result<()> {
|
|
|
|
let tmp_dir = TempDir::new("steamguard-cli-test")?;
|
2021-08-14 19:39:01 +02:00
|
|
|
let manifest_path = tmp_dir.path().join("manifest.json");
|
2023-06-22 22:20:15 +02:00
|
|
|
let mut manager = AccountManager::new(manifest_path.as_path());
|
2021-08-14 19:39:01 +02:00
|
|
|
let mut account = SteamGuardAccount::new();
|
|
|
|
account.account_name = "asdf1234".into();
|
2022-06-19 20:09:08 +02:00
|
|
|
account.revocation_code = String::from("R12345").into();
|
2021-08-25 03:13:16 +02:00
|
|
|
account.shared_secret = steamguard::token::TwoFactorSecret::parse_shared_secret(
|
|
|
|
"zvIayp3JPvtvX/QGHqsqKBk/44s=".into(),
|
|
|
|
)
|
|
|
|
.unwrap();
|
2023-06-22 22:20:15 +02:00
|
|
|
manager.add_account(account);
|
|
|
|
manager.save()?;
|
2022-02-18 20:55:10 +01:00
|
|
|
std::fs::remove_file(&manifest_path)?;
|
2021-08-14 19:39:01 +02:00
|
|
|
|
2023-06-22 22:20:15 +02:00
|
|
|
let mut loaded_manager = AccountManager::new(manifest_path.as_path());
|
2021-08-14 19:39:01 +02:00
|
|
|
assert!(matches!(
|
2023-06-22 22:20:15 +02:00
|
|
|
loaded_manager.import_account(
|
2022-06-19 17:43:37 +02:00
|
|
|
&tmp_dir
|
2021-08-14 19:39:01 +02:00
|
|
|
.path()
|
|
|
|
.join("asdf1234.maFile")
|
|
|
|
.into_os_string()
|
|
|
|
.into_string()
|
|
|
|
.unwrap()
|
|
|
|
),
|
|
|
|
Ok(_)
|
|
|
|
));
|
|
|
|
assert_eq!(
|
2023-06-22 22:20:15 +02:00
|
|
|
loaded_manager.manifest.entries.len(),
|
|
|
|
loaded_manager.accounts.len()
|
2021-08-14 19:39:01 +02:00
|
|
|
);
|
2022-02-18 20:55:10 +01:00
|
|
|
let account_name = "asdf1234".into();
|
2021-08-14 19:39:01 +02:00
|
|
|
assert_eq!(
|
2023-06-22 22:20:15 +02:00
|
|
|
loaded_manager
|
2022-02-18 20:55:10 +01:00
|
|
|
.get_account(&account_name)?
|
|
|
|
.lock()
|
|
|
|
.unwrap()
|
|
|
|
.account_name,
|
2021-08-14 19:39:01 +02:00
|
|
|
"asdf1234"
|
|
|
|
);
|
|
|
|
assert_eq!(
|
2023-06-22 22:20:15 +02:00
|
|
|
loaded_manager
|
2022-02-18 20:55:10 +01:00
|
|
|
.get_account(&account_name)?
|
|
|
|
.lock()
|
|
|
|
.unwrap()
|
2022-06-19 20:44:18 +02:00
|
|
|
.revocation_code
|
|
|
|
.expose_secret(),
|
2021-08-14 19:39:01 +02:00
|
|
|
"R12345"
|
|
|
|
);
|
|
|
|
assert_eq!(
|
2023-06-22 22:20:15 +02:00
|
|
|
loaded_manager
|
2022-02-18 20:55:10 +01:00
|
|
|
.get_account(&account_name)?
|
|
|
|
.lock()
|
|
|
|
.unwrap()
|
|
|
|
.shared_secret,
|
2021-08-25 03:13:16 +02:00
|
|
|
steamguard::token::TwoFactorSecret::parse_shared_secret(
|
|
|
|
"zvIayp3JPvtvX/QGHqsqKBk/44s=".into()
|
|
|
|
)
|
|
|
|
.unwrap(),
|
2021-08-14 19:39:01 +02:00
|
|
|
);
|
2022-02-18 20:55:10 +01:00
|
|
|
|
|
|
|
Ok(())
|
2021-08-14 19:39:01 +02:00
|
|
|
}
|
2021-08-15 02:47:29 +02:00
|
|
|
|
2023-06-22 22:20:15 +02:00
|
|
|
// #[test]
|
|
|
|
// fn test_sda_compatibility_1() -> anyhow::Result<()> {
|
|
|
|
// let path = Path::new("src/fixtures/maFiles/compat/1-account/manifest.json");
|
|
|
|
// assert!(path.is_file());
|
|
|
|
// let mut manager = AccountManager::load(path)?;
|
|
|
|
// assert!(matches!(manager.entries.last().unwrap().encryption, None));
|
|
|
|
// manager.load_accounts()?;
|
|
|
|
// let account_name = manager.entries.last().unwrap().account_name.clone();
|
|
|
|
// assert_eq!(
|
|
|
|
// account_name,
|
|
|
|
// manager
|
|
|
|
// .get_account(&account_name)?
|
|
|
|
// .lock()
|
|
|
|
// .unwrap()
|
|
|
|
// .account_name
|
|
|
|
// );
|
|
|
|
// Ok(())
|
|
|
|
// }
|
|
|
|
|
|
|
|
// #[test]
|
|
|
|
// fn test_sda_compatibility_1_encrypted() -> anyhow::Result<()> {
|
|
|
|
// let path = Path::new("src/fixtures/maFiles/compat/1-account-encrypted/manifest.json");
|
|
|
|
// assert!(path.is_file());
|
|
|
|
// let mut manifest = Manifest::load(path)?;
|
|
|
|
// assert!(matches!(
|
|
|
|
// manifest.entries.last().unwrap().encryption,
|
|
|
|
// Some(_)
|
|
|
|
// ));
|
|
|
|
// manifest.submit_passkey(Some("password".into()));
|
|
|
|
// manifest.load_accounts()?;
|
|
|
|
// let account_name = manifest.entries.last().unwrap().account_name.clone();
|
|
|
|
// assert_eq!(
|
|
|
|
// account_name,
|
|
|
|
// manifest
|
|
|
|
// .get_account(&account_name)?
|
|
|
|
// .lock()
|
|
|
|
// .unwrap()
|
|
|
|
// .account_name
|
|
|
|
// );
|
|
|
|
// Ok(())
|
|
|
|
// }
|
|
|
|
|
|
|
|
// #[test]
|
|
|
|
// fn test_sda_compatibility_no_webcookie() -> anyhow::Result<()> {
|
|
|
|
// let path = Path::new("src/fixtures/maFiles/compat/no-webcookie/manifest.json");
|
|
|
|
// assert!(path.is_file());
|
|
|
|
// let mut manifest = Manifest::load(path)?;
|
|
|
|
// assert!(matches!(manifest.entries.last().unwrap().encryption, None));
|
|
|
|
// assert!(matches!(manifest.load_accounts(), Ok(_)));
|
|
|
|
// let account_name = manifest.entries.last().unwrap().account_name.clone();
|
|
|
|
// let account = manifest.get_account(&account_name)?;
|
|
|
|
// assert_eq!(account_name, account.lock().unwrap().account_name);
|
|
|
|
// assert_eq!(
|
|
|
|
// account
|
|
|
|
// .lock()
|
|
|
|
// .unwrap()
|
|
|
|
// .session
|
|
|
|
// .as_ref()
|
|
|
|
// .unwrap()
|
|
|
|
// .expose_secret()
|
|
|
|
// .web_cookie,
|
|
|
|
// None
|
|
|
|
// );
|
|
|
|
// Ok(())
|
|
|
|
// }
|
|
|
|
|
|
|
|
// #[test]
|
|
|
|
// fn test_sda_compatibility_2() -> anyhow::Result<()> {
|
|
|
|
// let path = Path::new("src/fixtures/maFiles/compat/2-account/manifest.json");
|
|
|
|
// assert!(path.is_file());
|
|
|
|
// let mut manifest = Manifest::load(path)?;
|
|
|
|
// assert!(matches!(manifest.entries.last().unwrap().encryption, None));
|
|
|
|
// manifest.load_accounts()?;
|
|
|
|
// let account_name = manifest.entries[0].account_name.clone();
|
|
|
|
// let account = manifest.get_account(&account_name)?;
|
|
|
|
// assert_eq!(account_name, account.lock().unwrap().account_name);
|
|
|
|
// assert_eq!(
|
|
|
|
// account.lock().unwrap().revocation_code.expose_secret(),
|
|
|
|
// "R12345"
|
|
|
|
// );
|
|
|
|
// assert_eq!(
|
|
|
|
// account
|
|
|
|
// .lock()
|
|
|
|
// .unwrap()
|
|
|
|
// .session
|
|
|
|
// .as_ref()
|
|
|
|
// .unwrap()
|
|
|
|
// .expose_secret()
|
|
|
|
// .steam_id,
|
|
|
|
// 1234
|
|
|
|
// );
|
|
|
|
|
|
|
|
// let account_name = manifest.entries[1].account_name.clone();
|
|
|
|
// let account = manifest.get_account(&account_name)?;
|
|
|
|
// assert_eq!(account_name, account.lock().unwrap().account_name);
|
|
|
|
// assert_eq!(
|
|
|
|
// account.lock().unwrap().revocation_code.expose_secret(),
|
|
|
|
// "R56789"
|
|
|
|
// );
|
|
|
|
// assert_eq!(
|
|
|
|
// account
|
|
|
|
// .lock()
|
|
|
|
// .unwrap()
|
|
|
|
// .session
|
|
|
|
// .as_ref()
|
|
|
|
// .unwrap()
|
|
|
|
// .expose_secret()
|
|
|
|
// .steam_id,
|
|
|
|
// 5678
|
|
|
|
// );
|
|
|
|
// Ok(())
|
|
|
|
// }
|
|
|
|
|
|
|
|
// #[cfg(test)]
|
|
|
|
// mod manifest_upgrades {
|
|
|
|
// use super::*;
|
|
|
|
|
|
|
|
// #[test]
|
|
|
|
// fn test_missing_account_name() {
|
|
|
|
// let path = Path::new("src/fixtures/maFiles/compat/missing-account-name/manifest.json");
|
|
|
|
// assert!(path.is_file());
|
|
|
|
// let mut manager = AccountManager::load(path).unwrap();
|
|
|
|
// assert_eq!(manager.entries.len(), 1);
|
|
|
|
// assert_eq!(manager.entries[0].account_name, "".to_string());
|
|
|
|
// assert!(manager.is_missing_account_name());
|
|
|
|
|
|
|
|
// manager.auto_upgrade().unwrap();
|
|
|
|
// assert_eq!(manager.entries[0].account_name, "example".to_string());
|
|
|
|
// }
|
|
|
|
// }
|
2021-08-14 19:39:01 +02:00
|
|
|
}
|