mirror of
https://git.proxmox.com/git/proxmox-perl-rs
synced 2025-05-23 20:11:03 +00:00
pve: add_totp anda dd_yubico cannot error, drop Result type
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
parent
951bc726a2
commit
3e5228dd73
@ -388,9 +388,11 @@ fn add_totp(
|
||||
{
|
||||
bail!("failed to verify TOTP challenge");
|
||||
}
|
||||
config
|
||||
.add_totp(userid, description, totp)
|
||||
.map(TfaUpdateInfo::id)
|
||||
Ok(TfaUpdateInfo::id(config.add_totp(
|
||||
userid,
|
||||
description,
|
||||
totp,
|
||||
)))
|
||||
}
|
||||
|
||||
fn add_yubico(
|
||||
@ -400,9 +402,11 @@ fn add_yubico(
|
||||
value: Option<String>,
|
||||
) -> Result<TfaUpdateInfo, Error> {
|
||||
let key = value.ok_or_else(|| format_err!("missing 'value' parameter for 'yubico' entry"))?;
|
||||
config
|
||||
.add_yubico(userid, description, key)
|
||||
.map(TfaUpdateInfo::id)
|
||||
Ok(TfaUpdateInfo::id(config.add_yubico(
|
||||
userid,
|
||||
description,
|
||||
key,
|
||||
)))
|
||||
}
|
||||
|
||||
fn add_u2f<A: OpenUserChallengeData>(
|
||||
|
@ -167,34 +167,22 @@ impl TfaConfig {
|
||||
///
|
||||
/// Unlike U2F/WA, this does not require a challenge/response. The user can choose their secret
|
||||
/// themselves.
|
||||
pub fn add_totp(
|
||||
&mut self,
|
||||
userid: &str,
|
||||
description: String,
|
||||
value: Totp,
|
||||
) -> Result<String, Error> {
|
||||
Ok(self
|
||||
.users
|
||||
pub fn add_totp(&mut self, userid: &str, description: String, value: Totp) -> String {
|
||||
self.users
|
||||
.entry(userid.to_owned())
|
||||
.or_default()
|
||||
.add_totp(description, value))
|
||||
.add_totp(description, value)
|
||||
}
|
||||
|
||||
/// Add a Yubico key to a user.
|
||||
///
|
||||
/// Unlike U2F/WA, this does not require a challenge/response. The user can choose their secret
|
||||
/// themselves.
|
||||
pub fn add_yubico(
|
||||
&mut self,
|
||||
userid: &str,
|
||||
description: String,
|
||||
key: String,
|
||||
) -> Result<String, Error> {
|
||||
Ok(self
|
||||
.users
|
||||
pub fn add_yubico(&mut self, userid: &str, description: String, key: String) -> String {
|
||||
self.users
|
||||
.entry(userid.to_owned())
|
||||
.or_default()
|
||||
.add_yubico(description, key))
|
||||
.add_yubico(description, key)
|
||||
}
|
||||
|
||||
/// Add a new set of recovery keys. There can only be 1 set of keys at a time.
|
||||
|
Loading…
Reference in New Issue
Block a user