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

refactor: refactor some more stuff and finalize, hash still inaccurate

Browse source
This commit is contained in:
Erica Marigold 2023-10-14 23:16:27 -07:00
parent 4db53ea5aa
commit 3dda0889f2
No known key found for this signature in database
GPG key ID: 2768CC0C23D245D1
1 changed files with 32 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5,14 +5,11 @@ use crate::lune::builtins::{
};
use anyhow::Result;
use base64::{engine::general_purpose as Base64, Engine as _};
use digest::DynDigest;
use sha1::Digest as _;
// use ring::digest::{self, digest, Digest as RingDigest};
use std::sync::Mutex;
// TODO: Proper error handling, remove unwraps
// Code compiles but trait object returns an incorrect hash! Love my life :3
#[derive(Clone)]
pub struct Crypto {
algo: Arc<Mutex<CryptoAlgo>>,
@ -73,13 +70,39 @@ impl FromLua<'_> for EncodingKind {
}
impl CryptoAlgo {
pub fn get_hasher(&self) -> &dyn DynDigest {
pub fn update(&self, content: impl AsRef<[u8]>) {
// TODO: Replace boilerplate using a macro
match self {
CryptoAlgo::Sha1(hasher) => &**hasher,
CryptoAlgo::Sha256(hasher) => &**hasher,
CryptoAlgo::Sha512(hasher) => &**hasher,
CryptoAlgo::Sha1(hasher) => sha1::Digest::update(&mut (**hasher).clone(), content),
CryptoAlgo::Sha256(hasher) => sha2::Digest::update(&mut (**hasher).clone(), content),
CryptoAlgo::Sha512(hasher) => sha2::Digest::update(&mut (**hasher).clone(), content),
};
}
pub fn digest(&self, encoding: EncodingKind) -> Result<String> {
let computed: Vec<u8> = match self {
CryptoAlgo::Sha1(hasher) => {
let hash = sha1::Digest::finalize((**hasher).clone());
hash.to_vec()
}
CryptoAlgo::Sha256(hasher) => {
let hash = sha2::Digest::finalize((**hasher).clone());
hash.to_vec()
}
CryptoAlgo::Sha512(hasher) => {
let hash = sha2::Digest::finalize((**hasher).clone());
hash.to_vec()
}
};
match encoding {
EncodingKind::Utf8 => String::from_utf8(computed).map_err(anyhow::Error::from),
EncodingKind::Base64 => Ok(Base64::STANDARD.encode(computed)),
EncodingKind::Hex => Ok(hex::encode::<&[u8]>(&computed)),
}
}
}
@ -123,25 +146,13 @@ impl Crypto {
}
pub fn update(&self, content: impl AsRef<[u8]>) -> &Crypto {
let mut binding = (*self.algo.lock().unwrap()).get_hasher().box_clone();
let hasher = binding.as_mut();
hasher.update(content.as_ref());
(*self.algo.lock().unwrap()).update(content);
self
}
pub fn digest(&self, encoding: EncodingKind) -> Result<String> {
let algo = self.algo.lock().unwrap();
let hasher = algo.get_hasher();
let computed = &*(*hasher).box_clone().finalize_reset();
match encoding {
EncodingKind::Utf8 => String::from_utf8(computed.to_vec()).map_err(anyhow::Error::from),
EncodingKind::Base64 => Ok(Base64::STANDARD.encode(computed)),
EncodingKind::Hex => Ok(hex::encode::<&[u8]>(computed)),
}
(*self.algo.lock().unwrap()).digest(encoding)
}
}