proxmox-mirrors/proxmox
1
0
Fork 1
mirror of https://git.proxmox.com/git/proxmox synced 2025-07-25 13:57:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tfa: formatting

Browse Source 
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller 2021-12-07 11:51:22 +01:00
parent a774958239
commit dddfa1164b
2 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
proxmox-tfa/src/api/methods.rs
View File

@ -152,12 +152,10 @@ pub fn get_tfa_entry(config: &TfaConfig, userid: &str, id: &str) -> Option<Typed
}, },
None => return None, None => return None,
}, },
Some((TfaType::Totp, index)) => { Some((TfaType::Totp, index)) => TypedTfaInfo {
TypedTfaInfo { ty: TfaType::Totp,
ty: TfaType::Totp, info: user_data.totp.get(index).unwrap().info.clone(),
info: user_data.totp.get(index).unwrap().info.clone(), },
}
}
Some((TfaType::Webauthn, index)) => TypedTfaInfo { Some((TfaType::Webauthn, index)) => TypedTfaInfo {
ty: TfaType::Webauthn, ty: TfaType::Webauthn,
info: user_data.webauthn.get(index).unwrap().info.clone(), info: user_data.webauthn.get(index).unwrap().info.clone(),
@ -449,12 +447,7 @@ fn add_webauthn<A: OpenUserChallengeData>(
) -> Result<TfaUpdateInfo, Error> { ) -> Result<TfaUpdateInfo, Error> {
match challenge { match challenge {
None => config None => config
.webauthn_registration_challenge( .webauthn_registration_challenge(access, userid, need_description(description)?, origin)
access,
userid,
need_description(description)?,
origin,
)
.map(|c| TfaUpdateInfo { .map(|c| TfaUpdateInfo {
challenge: Some(c), challenge: Some(c),
..Default::default() ..Default::default()

5
proxmox-tfa/src/u2f.rs
View File

@ -578,10 +578,7 @@ mod bytes_as_base64url_nopad {
use serde::{Deserialize, Deserializer, Serializer}; use serde::{Deserialize, Deserializer, Serializer};
pub fn serialize<S: Serializer>(data: &[u8], serializer: S) -> Result<S::Ok, S::Error> { pub fn serialize<S: Serializer>(data: &[u8], serializer: S) -> Result<S::Ok, S::Error> {
serializer.serialize_str(&base64::encode_config( serializer.serialize_str(&base64::encode_config(data, base64::URL_SAFE_NO_PAD))
data,
base64::URL_SAFE_NO_PAD,
))
} }
pub fn deserialize<'de, D: Deserializer<'de>>(deserializer: D) -> Result<Vec<u8>, D::Error> { pub fn deserialize<'de, D: Deserializer<'de>>(deserializer: D) -> Result<Vec<u8>, D::Error> {