mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-17 08:40:52 +00:00
chore(vault): try generalizing Manager operation
This commit is contained in:
parent
e3710c3c81
commit
ba2c573ef4
1 changed files with 109 additions and 14 deletions
|
|
@ -14,11 +14,6 @@ const VAULT_TOTP_ALLOC_HINT: usize = 128;
|
||||||
const VAULT_PASSWORD_REC_VERSION: u32 = 1;
|
const VAULT_PASSWORD_REC_VERSION: u32 = 1;
|
||||||
const VAULT_TOTP_REC_VERSION: u32 = 1;
|
const VAULT_TOTP_REC_VERSION: u32 = 1;
|
||||||
|
|
||||||
pub struct Manager {
|
|
||||||
pddb: pddb::Pddb,
|
|
||||||
trng: trng::Trng,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
pub enum Error {
|
pub enum Error {
|
||||||
IoError(std::io::Error),
|
IoError(std::io::Error),
|
||||||
|
|
@ -44,6 +39,37 @@ impl From<PasswordSerializationError> for Error {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub struct Manager {
|
||||||
|
pddb: pddb::Pddb,
|
||||||
|
trng: trng::Trng,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub trait StorageContent: Into<Vec::<u8>> + TryFrom<Vec::<u8>> {
|
||||||
|
fn settings(&self) -> ContentPDDBSettings;
|
||||||
|
|
||||||
|
fn set_ctime(&mut self, value: u64);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Clone)]
|
||||||
|
pub struct ContentPDDBSettings {
|
||||||
|
dict: String,
|
||||||
|
alloc_hint: Option<usize>,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub enum ContentKind {
|
||||||
|
TOTP,
|
||||||
|
Password,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl ContentKind {
|
||||||
|
fn settings(&self) -> ContentPDDBSettings {
|
||||||
|
match self {
|
||||||
|
ContentKind::TOTP => TotpRecord::default().settings(),
|
||||||
|
ContentKind::Password => PasswordRecord::default().settings(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
impl Manager {
|
impl Manager {
|
||||||
pub fn new(xns: &xous_names::XousNames) -> Manager {
|
pub fn new(xns: &xous_names::XousNames) -> Manager {
|
||||||
Manager {
|
Manager {
|
||||||
|
|
@ -59,7 +85,7 @@ impl Manager {
|
||||||
}
|
}
|
||||||
|
|
||||||
fn pddb_store(
|
fn pddb_store(
|
||||||
&mut self,
|
&self,
|
||||||
payload: &[u8],
|
payload: &[u8],
|
||||||
dict: &str,
|
dict: &str,
|
||||||
key_name: &str,
|
key_name: &str,
|
||||||
|
|
@ -83,7 +109,7 @@ impl Manager {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn pddb_get(&mut self, dict: &str, key_name: &str) -> Result<Vec<u8>, Error> {
|
fn pddb_get(&self, dict: &str, key_name: &str) -> Result<Vec<u8>, Error> {
|
||||||
match self.pddb.get(
|
match self.pddb.get(
|
||||||
dict,
|
dict,
|
||||||
key_name,
|
key_name,
|
||||||
|
|
@ -102,7 +128,7 @@ impl Manager {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn basis_for_key(&mut self, dict: &str, key_name: &str) -> Result<String, Error> {
|
fn basis_for_key(&self, dict: &str, key_name: &str) -> Result<String, Error> {
|
||||||
match self.pddb.get(
|
match self.pddb.get(
|
||||||
dict,
|
dict,
|
||||||
key_name,
|
key_name,
|
||||||
|
|
@ -120,6 +146,26 @@ impl Manager {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn new_record<T: StorageContent>(
|
||||||
|
&mut self,
|
||||||
|
record: T,
|
||||||
|
basis: Option<String>,
|
||||||
|
) -> Result<(), Error> {
|
||||||
|
let mut record = record;
|
||||||
|
let settings = record.settings();
|
||||||
|
record.set_ctime(utc_now().timestamp() as u64);
|
||||||
|
let serialized_record: Vec<u8> = record.into();
|
||||||
|
let guid = self.gen_guid();
|
||||||
|
|
||||||
|
self.pddb_store(
|
||||||
|
&serialized_record,
|
||||||
|
&settings.dict,
|
||||||
|
&guid,
|
||||||
|
settings.alloc_hint,
|
||||||
|
basis,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
pub fn new_totp_record(
|
pub fn new_totp_record(
|
||||||
&mut self,
|
&mut self,
|
||||||
record: TotpRecord,
|
record: TotpRecord,
|
||||||
|
|
@ -159,7 +205,28 @@ impl Manager {
|
||||||
.into()
|
.into()
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn all_totp(&mut self) -> Result<Vec<TotpRecord>, Error> {
|
pub fn all<T: StorageContent>(&self, kind: ContentKind) -> Result<Vec<T>, Error> {
|
||||||
|
let settings = kind.settings();
|
||||||
|
|
||||||
|
let keylist = self.pddb.list_keys(&settings.dict, None)?;
|
||||||
|
|
||||||
|
let mut ret = vec![];
|
||||||
|
|
||||||
|
for key in keylist {
|
||||||
|
let record = match T::try_from(self.pddb_get(&settings.dict, &key)?) {
|
||||||
|
Ok(record) => record,
|
||||||
|
Err(error) => match error {
|
||||||
|
_ => todo!(),
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
ret.push(record);
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(ret)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn all_totp(&self) -> Result<Vec<TotpRecord>, Error> {
|
||||||
let keylist = self.pddb.list_keys(VAULT_TOTP_DICT, None)?;
|
let keylist = self.pddb.list_keys(VAULT_TOTP_DICT, None)?;
|
||||||
|
|
||||||
let mut ret = vec![];
|
let mut ret = vec![];
|
||||||
|
|
@ -172,7 +239,7 @@ impl Manager {
|
||||||
Ok(ret)
|
Ok(ret)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn all_passwords(&mut self) -> Result<Vec<PasswordRecord>, Error> {
|
pub fn all_passwords(&self) -> Result<Vec<PasswordRecord>, Error> {
|
||||||
let keylist = self.pddb.list_keys(VAULT_PASSWORD_DICT, None)?;
|
let keylist = self.pddb.list_keys(VAULT_PASSWORD_DICT, None)?;
|
||||||
|
|
||||||
let mut ret = vec![];
|
let mut ret = vec![];
|
||||||
|
|
@ -185,12 +252,12 @@ impl Manager {
|
||||||
Ok(ret)
|
Ok(ret)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn totp(&mut self, key_name: &str) -> Result<TotpRecord, Error> {
|
pub fn totp(&self, key_name: &str) -> Result<TotpRecord, Error> {
|
||||||
TotpRecord::try_from(self.pddb_get(VAULT_TOTP_DICT, key_name)?)
|
TotpRecord::try_from(self.pddb_get(VAULT_TOTP_DICT, key_name)?)
|
||||||
.map_err(|error| Error::TotpSerError(error))
|
.map_err(|error| Error::TotpSerError(error))
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn password(&mut self, key_name: &str) -> Result<PasswordRecord, Error> {
|
pub fn password(&self, key_name: &str) -> Result<PasswordRecord, Error> {
|
||||||
PasswordRecord::try_from(self.pddb_get(VAULT_PASSWORD_DICT, key_name)?)
|
PasswordRecord::try_from(self.pddb_get(VAULT_PASSWORD_DICT, key_name)?)
|
||||||
.map_err(|error| Error::PasswordSerError(error))
|
.map_err(|error| Error::PasswordSerError(error))
|
||||||
}
|
}
|
||||||
|
|
@ -203,14 +270,14 @@ impl Manager {
|
||||||
self.new_totp_record(record, Some(basis))
|
self.new_totp_record(record, Some(basis))
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn delete_totp(&mut self, key_name: &str) -> Result<(), Error> {
|
pub fn delete_totp(&self, key_name: &str) -> Result<(), Error> {
|
||||||
let basis = self.basis_for_key(VAULT_TOTP_DICT, key_name)?;
|
let basis = self.basis_for_key(VAULT_TOTP_DICT, key_name)?;
|
||||||
self.pddb
|
self.pddb
|
||||||
.delete_key(VAULT_TOTP_DICT, key_name, Some(&basis))
|
.delete_key(VAULT_TOTP_DICT, key_name, Some(&basis))
|
||||||
.map_err(|error| Error::IoError(error))
|
.map_err(|error| Error::IoError(error))
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn delete_password(&mut self, key_name: &str) -> Result<(), Error> {
|
pub fn delete_password(&self, key_name: &str) -> Result<(), Error> {
|
||||||
let basis = self.basis_for_key(VAULT_PASSWORD_DICT, key_name)?;
|
let basis = self.basis_for_key(VAULT_PASSWORD_DICT, key_name)?;
|
||||||
self.pddb
|
self.pddb
|
||||||
.delete_key(VAULT_PASSWORD_DICT, key_name, Some(&basis))
|
.delete_key(VAULT_PASSWORD_DICT, key_name, Some(&basis))
|
||||||
|
|
@ -218,6 +285,7 @@ impl Manager {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Default)]
|
||||||
pub struct TotpRecord {
|
pub struct TotpRecord {
|
||||||
pub version: u32,
|
pub version: u32,
|
||||||
// as base32, RFC4648 no padding
|
// as base32, RFC4648 no padding
|
||||||
|
|
@ -240,6 +308,19 @@ pub enum TOTPSerializationError {
|
||||||
MalformedInput,
|
MalformedInput,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl StorageContent for TotpRecord {
|
||||||
|
fn settings(&self) -> ContentPDDBSettings {
|
||||||
|
ContentPDDBSettings {
|
||||||
|
dict: VAULT_TOTP_DICT.to_string(),
|
||||||
|
alloc_hint: Some(VAULT_TOTP_ALLOC_HINT),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn set_ctime(&mut self, value: u64) {
|
||||||
|
self.ctime = value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
impl TryFrom<Vec<u8>> for TotpRecord {
|
impl TryFrom<Vec<u8>> for TotpRecord {
|
||||||
type Error = TOTPSerializationError;
|
type Error = TOTPSerializationError;
|
||||||
|
|
||||||
|
|
@ -352,6 +433,7 @@ pub enum PasswordSerializationError {
|
||||||
BadAtime,
|
BadAtime,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Default)]
|
||||||
pub struct PasswordRecord {
|
pub struct PasswordRecord {
|
||||||
pub version: u32,
|
pub version: u32,
|
||||||
pub description: String,
|
pub description: String,
|
||||||
|
|
@ -363,6 +445,19 @@ pub struct PasswordRecord {
|
||||||
pub count: u64,
|
pub count: u64,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl StorageContent for PasswordRecord {
|
||||||
|
fn settings(&self) -> ContentPDDBSettings {
|
||||||
|
ContentPDDBSettings {
|
||||||
|
dict: VAULT_PASSWORD_DICT.to_string(),
|
||||||
|
alloc_hint: Some(VAULT_TOTP_ALLOC_HINT),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn set_ctime(&mut self, value: u64) {
|
||||||
|
self.ctime = value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
impl TryFrom<Vec<u8>> for PasswordRecord {
|
impl TryFrom<Vec<u8>> for PasswordRecord {
|
||||||
type Error = PasswordSerializationError;
|
type Error = PasswordSerializationError;
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue