dan/Portfolio
1
0
Fork 0
mirror of https://github.com/danbulant/Portfolio synced 2026-05-24 20:42:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: file encryption & formatting

Browse source
This commit is contained in:
EETagent 2022-10-28 14:30:55 +02:00
parent bd72aa1a6f
commit a7251e668e
1 changed files with 77 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

94
core/src/crypto.rs
View file

@ -1,10 +1,10 @@
use std::str::FromStr;
use std::iter;
use argon2::{
Argon2, PasswordHasher as ArgonPasswordHasher, PasswordVerifier as ArgonPasswordVerifier,
};
use futures::io::{AsyncReadExt, AsyncWriteExt};
use rand::Rng;
use std::iter;
use std::str::FromStr;
/// Foolproof random 8 char string
/// only uppercase letters (except for 0 and O) and numbers
@ -158,14 +158,57 @@ pub async fn decrypt_password_with_private_key(
};
let mut decrypt_buffer = Vec::new();
let mut decrypt_writer =
decryptor.decrypt_async(iter::once(&age::x25519::Identity::from_str(key)? as &dyn age::Identity))?;
let mut decrypt_writer = decryptor.decrypt_async(iter::once(
&age::x25519::Identity::from_str(key)? as &dyn age::Identity,
))?;
decrypt_writer.read_to_end(&mut decrypt_buffer).await?;
Ok(String::from_utf8(decrypt_buffer)?)
}
// TODO: Massive refactor of encrypt_file_with_recipients required
pub async fn encrypt_file_with_recipients(
plain_file_path: &str,
cipher_file_path: &str,
recipients: Vec<&str>,
) -> Result<(), age::EncryptError> {
let public_keys = recipients
.into_iter()
.map(|recipient| {
//TODO: No unwrap
Box::new(age::x25519::Recipient::from_str(recipient).unwrap()) as _
})
.collect();
let encryptor_option = age::Encryptor::with_recipients(public_keys);
if let Some(encryptor) = encryptor_option {
let mut cipher_file = tokio::fs::File::create(cipher_file_path).await?;
let mut plain_file = tokio::fs::File::open(plain_file_path).await?;
let mut plain_file_contents = Vec::new();
tokio::io::AsyncReadExt::read_to_end(&mut plain_file, &mut plain_file_contents).await?;
let mut encrypt_buffer = Vec::new();
let mut encrypt_writer = encryptor.wrap_async_output(&mut encrypt_buffer).await?;
encrypt_writer.write_all(&plain_file_contents).await?;
encrypt_writer.flush().await?;
encrypt_writer.close().await?;
tokio::io::AsyncWriteExt::write_all(&mut cipher_file, &encrypt_buffer).await?;
return Ok(());
} else {
// TODO: Error handling
unreachable!("No recipients provided");
}
}
#[cfg(test)]
mod tests {
#[test]
@ -191,7 +234,9 @@ mod tests {
const HASH: &str = "$argon2id$v=19$m=4096,t=3,p=1$c2VjcmV0bHl0ZXN0aW5nZXZlcnl0aGluZw$xEzH8wD/ZjzgZTDTl3YtzMFCfcVa5M5m9y6NfSyB1n4";
const PASSWORD: &str = "test";
let result = super::verify_password(PASSWORD.to_string(), HASH.to_string()).await.unwrap();
let result = super::verify_password(PASSWORD.to_string(), HASH.to_string())
.await
.unwrap();
assert!(result);
}
@ -202,11 +247,13 @@ mod tests {
let hash = super::hash_password(PASSWORD.to_string()).await.unwrap();
let result = super::verify_password(PASSWORD.to_string(), hash).await.unwrap();
let result = super::verify_password(PASSWORD.to_string(), hash)
.await
.unwrap();
assert!(result);
}
#[tokio::test]
async fn test_encrypt_password_is_valid_base64() {
const PASSWORD: &str = "test";
@ -234,7 +281,9 @@ mod tests {
const PASSWORD: &str = "test";
const PUBLIC_KEY: &str = "age1t220v5c8ye0pjx99kw8nr57y7a5qlw4ke0wchjuxnr2gcvfzt3hq7fufz0";
let encrypted = super::encrypt_password_with_recipients(PASSWORD, vec![PUBLIC_KEY]).await.unwrap();
let encrypted = super::encrypt_password_with_recipients(PASSWORD, vec![PUBLIC_KEY])
.await
.unwrap();
eprint!("{}", encrypted);
@ -247,7 +296,10 @@ mod tests {
const PUBLIC_KEY_1: &str = "age1t220v5c8ye0pjx99kw8nr57y7a5qlw4ke0wchjuxnr2gcvfzt3hq7fufz0";
const PUBLIC_KEY_2: &str = "age1ygswsk38cq9r64um5klqxyvzemfdvx6qe5zed99pdexakwwhpatsgatgpw";
let encrypted = super::encrypt_password_with_recipients(PASSWORD, vec![PUBLIC_KEY_1, PUBLIC_KEY_2]).await.unwrap();
let encrypted =
super::encrypt_password_with_recipients(PASSWORD, vec![PUBLIC_KEY_1, PUBLIC_KEY_2])
.await
.unwrap();
println!("{}", encrypted);
assert!(base64::decode(encrypted).is_ok());
@ -257,10 +309,13 @@ mod tests {
async fn test_decrypt_password_with_private_key() {
const PASSWORD: &str = "test";
//const PUBLIC_KEY: &str = "age1t220v5c8ye0pjx99kw8nr57y7a5qlw4ke0wchjuxnr2gcvfzt3hq7fufz0";
const PRIVATE_KEY: &str = "AGE-SECRET-KEY-1WPDHL2FLJ23T6RK5KCX8KS8DNLX0CGXMNZG0XNUAH4QP5C8ZZ46QGD3STV";
const PRIVATE_KEY: &str =
"AGE-SECRET-KEY-1WPDHL2FLJ23T6RK5KCX8KS8DNLX0CGXMNZG0XNUAH4QP5C8ZZ46QGD3STV";
const CIPHER: &str = "YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBVWUNCY0RielVCaThLbGlIR1NZa0p6MlNiS0x5L3B2Y3B2b21XZHNaZUVjClpsVTRvUGVVQVYzS205VTVVMDlXYjFHVE5ZZzJOSEpyN1ZyT0tocFpIbUUKLT4gPy1ncmVhc2UgLltXKT9MJyBLQGouLWcgfCBQSm12JQp3bDhRTDd0ZGZWbU9mQ2FYVU9Cb2FjM3AwR243OGJNCi0tLSBSSzRxV3E2d0VscERvM3VHVUhOL3dPaGVBRHE3WkZrdzYxYUgyQVl6elh3CiFQOr28YvbEAkx0YgFnIxwvPNjjYZV6THArcMPM8i5flnmKPw==";
let decrypted = super::decrypt_password_with_private_key(CIPHER, PRIVATE_KEY).await.unwrap();
let decrypted = super::decrypt_password_with_private_key(CIPHER, PRIVATE_KEY)
.await
.unwrap();
assert_eq!(PASSWORD, decrypted);
}
@ -270,18 +325,23 @@ mod tests {
const PASSWORD: &str = "test";
// const PUBLIC_KEY_1: &str = "age1t220v5c8ye0pjx99kw8nr57y7a5qlw4ke0wchjuxnr2gcvfzt3hq7fufz0";
// const PUBLIC_KEY_2: &str = "age1ygswsk38cq9r64um5klqxyvzemfdvx6qe5zed99pdexakwwhpatsgatgpw";
const PRIVATE_KEY_1: &str = "AGE-SECRET-KEY-1WPDHL2FLJ23T6RK5KCX8KS8DNLX0CGXMNZG0XNUAH4QP5C8ZZ46QGD3STV";
const PRIVATE_KEY_2: &str = "AGE-SECRET-KEY-19RT6Z6TR0TE465EMJFDVXAFZ00YE65THLSS5LAY4W85L587DF95SPPDVND";
const PRIVATE_KEY_1: &str =
"AGE-SECRET-KEY-1WPDHL2FLJ23T6RK5KCX8KS8DNLX0CGXMNZG0XNUAH4QP5C8ZZ46QGD3STV";
const PRIVATE_KEY_2: &str =
"AGE-SECRET-KEY-19RT6Z6TR0TE465EMJFDVXAFZ00YE65THLSS5LAY4W85L587DF95SPPDVND";
const CIPHER: &str = "YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBBQ1BuSi9VMWIzeHg1TjQwMDNSUzlpZ0pGRWMxU2pFenVBekxGQTM0WGkwClkycytsNXNMbmVJTm5GT3VDRFBGQXE1ZFU5MzNzV0NXRWhmV1VGSjVNbU0KLT4gWDI1NTE5IHAvUjRLc3ROd2FkalZWTVIxRnBjaEluMXNtYWVScTVxdWxHY0x6ajZtUmMKYXkyNTExakZ0NWt5Vm85YUJSRlRmZTh4VEEyVEVrOFRyWDMxckNDVGkzOAotPiBbNVhfKS1ncmVhc2UgcysxIChlLTsKYU43T0lXUlUxZDFRVUpacXdJcm02Y3VzSjNMTVBtcy9pNm9yOEdETVplYjJrY1VsemRZU00rZ3NrSFZvUTBoSQovcEVrcmRmYlBPdzN3WWZTR0t1a1VFY0VTWXlIR1VPSUJRCi0tLSBYbmpxUHpVQzl5YnowdktIcTRjTklERXRDYVAxb0FmaWQwazgzRkp0U2pNCiAVlCPJ1+jroWQ7HBqjRUOcCBMyYvi9xIaklX2XDYPB2rd7Fw==";
let decrypted_1 = super::decrypt_password_with_private_key(CIPHER, PRIVATE_KEY_1).await.unwrap();
let decrypted_1 = super::decrypt_password_with_private_key(CIPHER, PRIVATE_KEY_1)
.await
.unwrap();
assert_eq!(PASSWORD, decrypted_1);
let decrypted_2 = super::decrypt_password_with_private_key(CIPHER, PRIVATE_KEY_2).await.unwrap();
let decrypted_2 = super::decrypt_password_with_private_key(CIPHER, PRIVATE_KEY_2)
.await
.unwrap();
assert_eq!(PASSWORD, decrypted_2);
}
}
}