mart-w/kanidm
1
0
Fork 0
mirror of https://github.com/kanidm/kanidm.git synced 2025-02-23 12:37:00 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

improved error description for commit_credential_update (#2579)

Browse source
This commit is contained in:
Sebastiano Tocci 2024-02-24 01:18:38 +01:00 committed by GitHub
parent 3bf16d4253
commit d3af1a9e1b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
server/lib/src/idm/credupdatesession.rs
View file

@ -1,6 +1,6 @@
use core::ops::Deref;
use std::collections::BTreeMap;
use std::fmt;
use std::fmt::{self, Display};
use std::sync::{Arc, Mutex};
use std::time::Duration;
@ -280,6 +280,12 @@ pub enum CredentialUpdateSessionStatusWarnings {
WebauthnAttestationUnsatisfiable,
}
impl Display for CredentialUpdateSessionStatusWarnings {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> Result<(), std::fmt::Error> {
write!(f, "{:?}", self)
}
}
impl From<CredentialUpdateSessionStatusWarnings> for CURegWarning {
fn from(val: CredentialUpdateSessionStatusWarnings) -> CURegWarning {
match val {
@ -370,7 +376,7 @@ impl From<&CredentialUpdateSession> for CredentialUpdateSessionStatus {
.resolved_account_policy
.webauthn_attestation_ca_list()
.iter()
.flat_map(|att_ca_list| {
.flat_map(|att_ca_list: &&webauthn_rs::prelude::AttestationCaList| {
att_ca_list.cas().values().flat_map(|ca| {
ca.aaguids()
.values()
@ -1239,8 +1245,19 @@ impl<'a> IdmServerProxyWriteTransaction<'a> {
self.credential_update_commit_common(cust, ct)?;
// Can we actually proceed?
if !session.can_commit().0 {
admin_error!("Session is unable to commit due to a constraint violation.");
let can_commit = session.can_commit();
if !can_commit.0 {
let commit_failure_reasons = can_commit
.1
.iter()
.map(|e| e.to_string())
.collect::<Vec<String>>()
.join(", ");
admin_error!(
"Session is unable to commit due to: {}",
commit_failure_reasons
);
// TODO: perhaps it would be more helpful to add a new operation error that describes what the issue is
return Err(OperationError::InvalidState);
}