xiretza/factoriauth
1
0
Fork 0
Code Issues 2 Pull requests Releases Activity

oops forgot to actually check the token

Browse source
This commit is contained in:
deneb 2024-02-10 13:48:00 +01:00
parent 9ee43b85ef
commit 3079bc40a7
2 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/auth.rs
View file

@ -69,11 +69,14 @@ impl UserAuthenticator {
) -> Result<(), AuthenticationError> { ) -> Result<(), AuthenticationError> {
let mut db = self.db.lock().await; let mut db = self.db.lock().await;
match db.get_token(username).await? { if let Some(user_token) = db.get_token(username).await? {
Some(_) => Ok(()), if token == &user_token {
None => Err(AuthenticationError::InvalidToken), return Ok(());
} }
} }
Err(AuthenticationError::InvalidToken)
}
} }
#[derive(Debug)] #[derive(Debug)]

12
src/secrets.rs
View file

@ -11,6 +11,12 @@ impl From<String> for Password {
} }
} }
impl PartialEq for Password {
fn eq(&self, other: &Self) -> bool {
self.0.expose_secret() == other.0.expose_secret()
}
}
#[derive(Debug, Clone, Deserialize)] #[derive(Debug, Clone, Deserialize)]
pub struct UserToken(pub SecretString); pub struct UserToken(pub SecretString);
impl From<String> for UserToken { impl From<String> for UserToken {
@ -19,6 +25,12 @@ impl From<String> for UserToken {
} }
} }
impl PartialEq for UserToken {
fn eq(&self, other: &Self) -> bool {
self.0.expose_secret() == other.0.expose_secret()
}
}
#[derive(Debug, Clone, Deserialize)] #[derive(Debug, Clone, Deserialize)]
pub struct UserServerKey(pub SecretString); pub struct UserServerKey(pub SecretString);
impl From<String> for UserServerKey { impl From<String> for UserServerKey {