realaravinth/argon2-creds
1
0
Fork 0
Code Issues 1 Pull requests 3 Projects Releases Packages Wiki Activity

got rid of rust_argon2 config lifetimes

Browse source
This commit is contained in:
Aravinth Manivannan 2021-03-04 16:35:40 +05:30
parent 21b4693581
commit f73175a730
Signed by: realaravinth
GPG key ID: AD9F0F08E855ED88
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/config.rs
View file

@ -6,12 +6,12 @@ use crate::errors::*;
use crate::filters::{beep, filter, forbidden}; use crate::filters::{beep, filter, forbidden};
#[derive(Clone, Builder)] #[derive(Clone, Builder)]
pub struct Config<'a> { pub struct Config {
profanity: bool, profanity: bool,
blacklist: bool, blacklist: bool,
username_case_mapped: bool, username_case_mapped: bool,
salt_length: usize, salt_length: usize,
argon2: argon2::Config<'a>, argon2: argon2::Config<'static>,
} }
#[derive(Validate)] #[derive(Validate)]
@ -20,7 +20,7 @@ struct Email {
pub email: String, pub email: String,
} }
impl<'a> Default for Config<'a> { impl Default for Config {
fn default() -> Self { fn default() -> Self {
Config { Config {
/// profanity filter /// profanity filter
@ -37,9 +37,9 @@ impl<'a> Default for Config<'a> {
} }
} }
impl<'a> Config<'a> { impl Config {
/// process username /// process username
pub fn username(&'a self, username: &str) -> CredsResult<String> { pub fn username(&self, username: &str) -> CredsResult<String> {
use ammonia::clean; use ammonia::clean;
use unicode_normalization::UnicodeNormalization; use unicode_normalization::UnicodeNormalization;
@ -54,7 +54,7 @@ impl<'a> Config<'a> {
} }
/// process email /// process email
pub fn email(&self, email: Option<&'a str>) -> CredsResult<()> { pub fn email(&self, email: Option<&str>) -> CredsResult<()> {
if let Some(email) = email { if let Some(email) = email {
let email = Email { let email = Email {
email: email.trim().to_owned(), email: email.trim().to_owned(),
@ -64,7 +64,7 @@ impl<'a> Config<'a> {
Ok(()) Ok(())
} }
fn validate_username(&self, username: &'a str) -> CredsResult<()> { fn validate_username(&self, username: &str) -> CredsResult<()> {
if self.username_case_mapped { if self.username_case_mapped {
filter(&username)?; filter(&username)?;
} }
@ -78,7 +78,7 @@ impl<'a> Config<'a> {
} }
/// generate hash for password /// generate hash for password
pub fn password(&'a self, password: &str) -> CredsResult<String> { pub fn password(&self, password: &str) -> CredsResult<String> {
use argon2::hash_encoded; use argon2::hash_encoded;
use rand::distributions::Alphanumeric; use rand::distributions::Alphanumeric;
use rand::{thread_rng, Rng}; use rand::{thread_rng, Rng};