saltyming/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2025-06-01 16:33:56 +00:00
Code Activity

Updated bw_rs to Rocket version 0.4-rc1

Browse source
This commit is contained in:
Daniel García 2018-10-10 20:40:39 +02:00
parent f1b1000600
commit c673370103
No known key found for this signature in database
GPG key ID: FC8A7D14C3CD543A
31 changed files with 716 additions and 1485 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/auth.rs
View file

@ -40,7 +40,7 @@ pub fn decode_jwt(token: &str) -> Result<JWTClaims, String> {
let validation = jwt::Validation {
leeway: 30, // 30 seconds
validate_exp: true,
validate_iat: true,
validate_iat: false, // IssuedAt is the same as NotBefore
validate_nbf: true,
aud: None,
iss: Some(JWT_ISSUER.clone()),
@ -197,8 +197,7 @@ impl<'a, 'r> FromRequest<'a, 'r> for OrgHeaders {
Outcome::Success(headers) => {
// org_id is expected to be the first dynamic param
match request.get_param::<String>(0) {
Err(_) => err_handler!("Error getting the organization id"),
Ok(org_id) => {
Some(Ok(org_id)) => {
let conn = match request.guard::<DbConn>() {
Outcome::Success(conn) => conn,
_ => err_handler!("Error getting DB")
@ -227,7 +226,8 @@ impl<'a, 'r> FromRequest<'a, 'r> for OrgHeaders {
user: headers.user,
org_user_type: org_user.type_,
})
}
},
_ => err_handler!("Error getting the organization id"),
}
}
}