lune-org/lune
1
1
Fork 0
mirror of https://github.com/lune-org/lune.git synced 2025-04-15 09:23:49 +01:00
Code Issues Projects Releases Packages Wiki Activity

refactor: simplify code by removing traits n stuff

Browse source
This commit is contained in:
Erica Marigold 2023-10-13 09:55:40 -07:00
parent 9a1fe037c1
commit 4db53ea5aa
No known key found for this signature in database
GPG key ID: 2768CC0C23D245D1
1 changed files with 38 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
src/lune/builtins/serde/crypto.rs
View file

@ -12,20 +12,19 @@ use std::sync::Mutex;
// TODO: Proper error handling, remove unwraps // TODO: Proper error handling, remove unwraps
// #[derive(Debug, Clone, Copy)] // Code compiles but trait object returns an incorrect hash! Love my life :3
// pub struct Crypto;
#[derive(Clone)] #[derive(Clone)]
pub struct Crypto { pub struct Crypto {
algo: Arc<Mutex<CryptoAlgo<(dyn digest::DynDigest + 'static)>>>, algo: Arc<Mutex<CryptoAlgo>>,
} }
#[derive(Clone)] #[derive(Clone)]
pub enum CryptoAlgo<T: ?Sized> { pub enum CryptoAlgo {
Sha1(Box<T>), Sha1(Box<sha1::Sha1>),
Sha256(Box<T>), Sha256(Box<sha2::Sha256>),
Sha512(Box<T>), Sha512(Box<sha2::Sha512>),
Blake2(Box<T>), // Blake2(Box<T>),
Md5(Box<T>), // Md5(Box<T>),
} }
#[derive(PartialOrd, PartialEq, Ord, Eq)] #[derive(PartialOrd, PartialEq, Ord, Eq)]
@ -73,48 +72,53 @@ impl FromLua<'_> for EncodingKind {
} }
} }
impl CryptoAlgo<dyn DynDigest> { impl CryptoAlgo {
pub fn get_hasher(self) -> &'static dyn DynDigest { pub fn get_hasher(&self) -> &dyn DynDigest {
// TODO: Replace boilerplate using a macro // TODO: Replace boilerplate using a macro
match self { match self {
CryptoAlgo::Sha1(hasher) => &*hasher, CryptoAlgo::Sha1(hasher) => &**hasher,
CryptoAlgo::Sha256(hasher) => &*hasher, CryptoAlgo::Sha256(hasher) => &**hasher,
CryptoAlgo::Sha512(hasher) => &*hasher, CryptoAlgo::Sha512(hasher) => &**hasher,
CryptoAlgo::Blake2(hasher) => &*hasher,
CryptoAlgo::Md5(hasher) => &*hasher,
} }
} }
} }
impl Crypto { impl Crypto {
pub fn sha1<T: ToString>(content: Option<T>) -> Crypto { pub fn sha1<T: ToString>(content: Option<T>) -> Crypto {
let content = content.map(|data| data.to_string()); let constructed = Self {
algo: Arc::new(Mutex::new(CryptoAlgo::Sha1(Box::new(sha1::Sha1::new())))),
};
Self { match content {
algo: Arc::new(Mutex::new(CryptoAlgo::Sha1(DynDigest::box_clone( Some(inner) => constructed.update(inner.to_string()).clone(),
&sha1::Sha1::new(), None => constructed,
)))),
} }
} }
pub fn sha256<T: ToString>(content: Option<T>) -> Crypto { pub fn sha256<T: ToString>(content: Option<T>) -> Crypto {
let content = content.map(|data| data.to_string()); let constructed = Self {
algo: Arc::new(Mutex::new(CryptoAlgo::Sha256(
Box::new(sha2::Sha256::new()),
))),
};
Self { match content {
algo: Arc::new(Mutex::new(CryptoAlgo::Sha256(DynDigest::box_clone( Some(inner) => constructed.update(inner.to_string()).clone(),
&sha2::Sha256::new(), None => constructed,
)))),
} }
} }
pub fn sha512<T: ToString>(content: Option<T>) -> Crypto { pub fn sha512<T: ToString>(content: Option<T>) -> Crypto {
let content = content.map(|data| data.to_string()); let constructed = Self {
algo: Arc::new(Mutex::new(CryptoAlgo::Sha512(
Box::new(sha2::Sha512::new()),
))),
};
Self { match content {
algo: Arc::new(Mutex::new(CryptoAlgo::Sha512(DynDigest::box_clone( Some(inner) => constructed.update(inner.to_string()).clone(),
&sha2::Sha512::new(), None => constructed,
)))),
} }
} }
@ -128,15 +132,15 @@ impl Crypto {
} }
pub fn digest(&self, encoding: EncodingKind) -> Result<String> { pub fn digest(&self, encoding: EncodingKind) -> Result<String> {
let algo = *self.algo.lock().unwrap(); let algo = self.algo.lock().unwrap();
let hasher = algo.get_hasher(); let hasher = algo.get_hasher();
let computed = &*hasher.finalize_reset(); let computed = &*(*hasher).box_clone().finalize_reset();
match encoding { match encoding {
EncodingKind::Utf8 => String::from_utf8(computed.to_vec()).map_err(anyhow::Error::from), EncodingKind::Utf8 => String::from_utf8(computed.to_vec()).map_err(anyhow::Error::from),
EncodingKind::Base64 => Ok(Base64::STANDARD.encode(computed)), EncodingKind::Base64 => Ok(Base64::STANDARD.encode(computed)),
EncodingKind::Hex => Ok(hex::encode::<&[u8]>(computed.as_ref())), EncodingKind::Hex => Ok(hex::encode::<&[u8]>(computed)),
} }
} }
} }