update to proxmox-sys 0.2 crate
- imported pbs-api-types/src/common_regex.rs from old proxmox crate - use hex crate to generate/parse hex digest - remove all reference to proxmox crate (use proxmox-sys and proxmox-serde instead) Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
This commit is contained in:
@ -1,6 +1,6 @@
|
||||
use proxmox_router::{Router, SubdirMap};
|
||||
use proxmox_router::list_subdirs_api_method;
|
||||
use proxmox::{identity, sortable};
|
||||
use proxmox_sys::{identity, sortable};
|
||||
|
||||
pub mod tfa;
|
||||
pub mod openid;
|
||||
|
@ -3,6 +3,7 @@
|
||||
use anyhow::{bail, Error};
|
||||
use serde_json::Value;
|
||||
use ::serde::{Deserialize, Serialize};
|
||||
use hex::FromHex;
|
||||
|
||||
use proxmox_router::{Router, RpcEnvironment, Permission};
|
||||
use proxmox_schema::api;
|
||||
@ -37,7 +38,7 @@ pub fn list_openid_realms(
|
||||
|
||||
let list = config.convert_to_typed_array("openid")?;
|
||||
|
||||
rpcenv["digest"] = proxmox::tools::digest_to_hex(&digest).into();
|
||||
rpcenv["digest"] = hex::encode(&digest).into();
|
||||
|
||||
Ok(list)
|
||||
}
|
||||
@ -106,7 +107,7 @@ pub fn delete_openid_realm(
|
||||
let (mut domains, expected_digest) = domains::config()?;
|
||||
|
||||
if let Some(ref digest) = digest {
|
||||
let digest = proxmox::tools::hex_to_digest(digest)?;
|
||||
let digest = <[u8; 32]>::from_hex(digest)?;
|
||||
crate::tools::detect_modified_configuration_file(&digest, &expected_digest)?;
|
||||
}
|
||||
|
||||
@ -142,7 +143,7 @@ pub fn read_openid_realm(
|
||||
|
||||
let config = domains.lookup("openid", &realm)?;
|
||||
|
||||
rpcenv["digest"] = proxmox::tools::digest_to_hex(&digest).into();
|
||||
rpcenv["digest"] = hex::encode(&digest).into();
|
||||
|
||||
Ok(config)
|
||||
}
|
||||
@ -211,7 +212,7 @@ pub fn update_openid_realm(
|
||||
let (mut domains, expected_digest) = domains::config()?;
|
||||
|
||||
if let Some(ref digest) = digest {
|
||||
let digest = proxmox::tools::hex_to_digest(digest)?;
|
||||
let digest = <[u8; 32]>::from_hex(digest)?;
|
||||
crate::tools::detect_modified_configuration_file(&digest, &expected_digest)?;
|
||||
}
|
||||
|
||||
|
@ -2,6 +2,7 @@
|
||||
//! If we add more, it should be moved into a sub module.
|
||||
|
||||
use anyhow::Error;
|
||||
use hex::FromHex;
|
||||
|
||||
use proxmox_router::{Router, RpcEnvironment, Permission, SubdirMap};
|
||||
use proxmox_schema::api;
|
||||
@ -42,7 +43,7 @@ pub fn get_webauthn_config(
|
||||
Some(c) => c,
|
||||
None => return Ok(None),
|
||||
};
|
||||
rpcenv["digest"] = proxmox::tools::digest_to_hex(&digest).into();
|
||||
rpcenv["digest"] = hex::encode(&digest).into();
|
||||
Ok(Some(config))
|
||||
}
|
||||
|
||||
@ -72,7 +73,7 @@ pub fn update_webauthn_config(
|
||||
|
||||
if let Some(wa) = &mut tfa.webauthn {
|
||||
if let Some(ref digest) = digest {
|
||||
let digest = proxmox::tools::hex_to_digest(digest)?;
|
||||
let digest = <[u8; 32]>::from_hex(digest)?;
|
||||
crate::tools::detect_modified_configuration_file(
|
||||
&digest,
|
||||
&crate::config::tfa::webauthn_config_digest(&wa)?,
|
||||
|
Reference in New Issue
Block a user