mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-17 08:40:52 +00:00
fix(vault): storage for totp and passwords derive pddb key from their
unique content Instead of generating a unique GUID every time a new record gets created, hash known unique content for every entry and use that as key. The StorageContent trait now has a hash() method that returns a Vec containing the SHA-256 hash of the object's unique content. Hashing is done by re-using the same calls that ctap uses. This allows dupes detection when restoring a backup, allowing us to employ a "never overwrite" policy: Precursor is the main source of truth for such data.
This commit is contained in:
parent
cdfae27afc
commit
cd42cf6395
1 changed files with 30 additions and 4 deletions
|
|
@ -6,6 +6,8 @@ use std::{
|
||||||
time::{SystemTime, UNIX_EPOCH},
|
time::{SystemTime, UNIX_EPOCH},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
use ctap_crypto::Hash256;
|
||||||
|
|
||||||
const VAULT_PASSWORD_DICT: &'static str = "vault.passwords";
|
const VAULT_PASSWORD_DICT: &'static str = "vault.passwords";
|
||||||
const VAULT_TOTP_DICT: &'static str = "vault.totp";
|
const VAULT_TOTP_DICT: &'static str = "vault.totp";
|
||||||
const VAULT_TOTP_ALLOC_HINT: usize = 128;
|
const VAULT_TOTP_ALLOC_HINT: usize = 128;
|
||||||
|
|
@ -51,6 +53,8 @@ pub trait StorageContent {
|
||||||
|
|
||||||
fn from_vec(&mut self, data: Vec<u8>) -> Result<(), Error>;
|
fn from_vec(&mut self, data: Vec<u8>) -> Result<(), Error>;
|
||||||
fn to_vec(&self) -> Vec<u8>;
|
fn to_vec(&self) -> Vec<u8>;
|
||||||
|
|
||||||
|
fn hash(&self) -> Vec<u8>;
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Clone)]
|
#[derive(Clone)]
|
||||||
|
|
@ -188,12 +192,11 @@ impl Manager {
|
||||||
let settings = record.settings();
|
let settings = record.settings();
|
||||||
record.set_ctime(utc_now().timestamp() as u64);
|
record.set_ctime(utc_now().timestamp() as u64);
|
||||||
let serialized_record: Vec<u8> = record.to_vec();
|
let serialized_record: Vec<u8> = record.to_vec();
|
||||||
let guid = self.gen_guid();
|
|
||||||
|
|
||||||
self.pddb_store(
|
self.pddb_store(
|
||||||
&serialized_record,
|
&serialized_record,
|
||||||
&settings.dict,
|
&settings.dict,
|
||||||
&guid,
|
&hex(record.hash()),
|
||||||
settings.alloc_hint,
|
settings.alloc_hint,
|
||||||
basis.clone(),
|
basis.clone(),
|
||||||
true,
|
true,
|
||||||
|
|
@ -215,7 +218,6 @@ impl Manager {
|
||||||
let settings = record.settings();
|
let settings = record.settings();
|
||||||
record.set_ctime(utc_now().timestamp() as u64);
|
record.set_ctime(utc_now().timestamp() as u64);
|
||||||
let serialized_record: Vec<u8> = record.to_vec();
|
let serialized_record: Vec<u8> = record.to_vec();
|
||||||
let guid = self.gen_guid();
|
|
||||||
let should_sync = precords.peek().is_none() || current_idx % 10 == 0;
|
let should_sync = precords.peek().is_none() || current_idx % 10 == 0;
|
||||||
|
|
||||||
log::debug!(
|
log::debug!(
|
||||||
|
|
@ -228,7 +230,7 @@ impl Manager {
|
||||||
match self.pddb_store(
|
match self.pddb_store(
|
||||||
&serialized_record,
|
&serialized_record,
|
||||||
&settings.dict,
|
&settings.dict,
|
||||||
&guid,
|
&hex(record.hash()),
|
||||||
settings.alloc_hint,
|
settings.alloc_hint,
|
||||||
basis.clone(),
|
basis.clone(),
|
||||||
should_sync,
|
should_sync,
|
||||||
|
|
@ -434,6 +436,13 @@ impl StorageContent for TotpRecord {
|
||||||
)
|
)
|
||||||
.into_bytes()
|
.into_bytes()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn hash(&self) -> Vec<u8> {
|
||||||
|
let mut h = ctap_crypto::sha256::Sha256::new();
|
||||||
|
h.update(self.secret.as_bytes());
|
||||||
|
h.update(self.name.as_bytes());
|
||||||
|
h.finalize().to_vec()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl TryFrom<Vec<u8>> for TotpRecord {
|
impl TryFrom<Vec<u8>> for TotpRecord {
|
||||||
|
|
@ -655,6 +664,13 @@ impl StorageContent for PasswordRecord {
|
||||||
)
|
)
|
||||||
.into_bytes()
|
.into_bytes()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn hash(&self) -> Vec<u8> {
|
||||||
|
let mut h = ctap_crypto::sha256::Sha256::new();
|
||||||
|
h.update(self.password.as_bytes());
|
||||||
|
h.update(self.username.as_bytes());
|
||||||
|
h.finalize().to_vec()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl TryFrom<Vec<u8>> for PasswordRecord {
|
impl TryFrom<Vec<u8>> for PasswordRecord {
|
||||||
|
|
@ -763,3 +779,13 @@ fn utc_now() -> DateTime<Utc> {
|
||||||
let naive = NaiveDateTime::from_timestamp(now.as_secs() as i64, now.subsec_nanos() as u32);
|
let naive = NaiveDateTime::from_timestamp(now.as_secs() as i64, now.subsec_nanos() as u32);
|
||||||
DateTime::from_utc(naive, Utc)
|
DateTime::from_utc(naive, Utc)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn hex(data: Vec<u8>) -> String {
|
||||||
|
use std::fmt::Write;
|
||||||
|
let mut s = String::with_capacity(2 * data.len());
|
||||||
|
for byte in data {
|
||||||
|
write!(s, "{:02X}", byte).unwrap();
|
||||||
|
}
|
||||||
|
|
||||||
|
s
|
||||||
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue