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

feat: 12 character code

Browse source
This commit is contained in:
Sebastian Pravda 2022-12-16 17:42:50 +01:00
parent 570dcfb9e5
commit db0d72a4f2
No known key found for this signature in database
GPG key ID: F3BC84F08EFA3F57
3 changed files with 24 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
api/src/routes/admin.rs
View file

@ -1,7 +1,7 @@
use std::net::{SocketAddr, IpAddr, Ipv4Addr}; use std::net::{SocketAddr, IpAddr, Ipv4Addr};
use portfolio_core::{ use portfolio_core::{
crypto::random_8_char_string, crypto::random_12_char_string,
services::{admin_service::AdminService, candidate_service::CandidateService, application_service::ApplicationService, portfolio_service::PortfolioService}, models::candidate::{BaseCandidateResponse, CreateCandidateResponse, ApplicationDetails}, sea_orm::prelude::Uuid, Query, error::ServiceError, utils::csv, services::{admin_service::AdminService, candidate_service::CandidateService, application_service::ApplicationService, portfolio_service::PortfolioService}, models::candidate::{BaseCandidateResponse, CreateCandidateResponse, ApplicationDetails}, sea_orm::prelude::Uuid, Query, error::ServiceError, utils::csv,
}; };
use requests::{AdminLoginRequest, RegisterRequest}; use requests::{AdminLoginRequest, RegisterRequest};
@ -90,7 +90,7 @@ pub async fn create_candidate(
let db = conn.into_inner(); let db = conn.into_inner();
let form = request.into_inner(); let form = request.into_inner();
let plain_text_password = random_8_char_string(); let plain_text_password = random_12_char_string();
ApplicationService::create_candidate_with_parent( ApplicationService::create_candidate_with_parent(
db, db,

37
core/src/crypto.rs
View file

@ -15,22 +15,27 @@ use crate::error::ServiceError;
/// Foolproof random 8 char string /// Foolproof random 8 char string
/// only uppercase letters (except for 0 and O) and numbers /// only uppercase letters (except for 0 and O) and numbers
pub fn random_8_char_string() -> String { pub fn random_12_char_string() -> String {
let iterator = rand::thread_rng() let random_chars_12: Vec<char> = rand::thread_rng()
.sample_iter(&rand::distributions::Alphanumeric) .sample_iter(&rand::distributions::Alphanumeric)
.map(char::from); .map(char::from)
.filter(is_usable_char)
.take(12)
.collect();
let mut s = String::new(); random_chars_12
for c in iterator { .iter()
// add all characters except for: lowercase chars, 0 and O .map(|c| c.to_string())
if ('1'..='9').contains(&c) || ('A'..='N').contains(&c) || ('P'..'Z').contains(&c) { .collect::<Vec<String>>()
s.push(c); .join("")
if s.len() == 8 { }
break;
} /// Exclude O and 0, lowercase letters
} fn is_usable_char(c: &char) -> bool {
} ('1'..='9').contains(&c) ||
s ('A'..='N').contains(&c) ||
('P'..'Z').contains(&c) ||
['@', '#', '$', '%'].contains(&c)
} }
pub async fn hash_password(password_plain_text: String) -> Result<String, ServiceError> { pub async fn hash_password(password_plain_text: String) -> Result<String, ServiceError> {
@ -336,7 +341,7 @@ mod tests {
#[test] #[test]
fn test_random_8_char_string() { fn test_random_8_char_string() {
for _ in 0..1000 { for _ in 0..1000 {
let s = super::random_8_char_string(); let s = super::random_12_char_string();
// Is 8 chars long // Is 8 chars long
assert_eq!(s.len(), 8); assert_eq!(s.len(), 8);
// Does not contain possibly confusing characters // Does not contain possibly confusing characters
@ -388,7 +393,7 @@ mod tests {
); );
assert!(key_2.len() >= 32); assert!(key_2.len() >= 32);
let key_3 = super::convert_key_aes256(&super::random_8_char_string()); let key_3 = super::convert_key_aes256(&super::random_12_char_string());
assert!(key_3.len() >= 32); assert!(key_3.len() >= 32);
} }

2
core/src/services/candidate_service.rs
View file

@ -105,7 +105,7 @@ impl CandidateService {
let parents = Query::find_candidate_parents(db, &candidate).await?; let parents = Query::find_candidate_parents(db, &candidate).await?;
let new_password_plain = crypto::random_8_char_string(); let new_password_plain = crypto::random_12_char_string();
let new_password_hash = crypto::hash_password(new_password_plain.clone()).await?; let new_password_hash = crypto::hash_password(new_password_plain.clone()).await?;
let (pubkey, priv_key_plain_text) = crypto::create_identity(); let (pubkey, priv_key_plain_text) = crypto::create_identity();