@wlfi-agent/cli 1.4.14 → 1.4.16

package/crates/vault-transport-unix/src/lib.rs

@@ -23,8 +23,8 @@ use vault_daemon::{
 };
 use vault_domain::{
     AdminSession, AgentCredentials, Lease, ManualApprovalDecision, ManualApprovalRequest,
-    NonceReleaseRequest, NonceReservation, NonceReservationRequest, PolicyAttachment, RelayConfig,
-    SignRequest, Signature, SpendingPolicy, VaultKey,
+    ManualApprovalStatus, NonceReleaseRequest, NonceReservation, NonceReservationRequest,
+    PolicyAttachment, RelayConfig, SignRequest, Signature, SpendingPolicy, VaultKey,
 };
 use vault_policy::{PolicyEvaluation, PolicyExplanation};
 use vault_signer::{KeyCreateRequest, SignerError, VaultSignerBackend};
@@ -185,6 +185,10 @@ enum WireDaemonError {
     ManualApprovalRejected {
         approval_request_id: Uuid,
     },
+    ManualApprovalRequestNotPending {
+        approval_request_id: Uuid,
+        status: ManualApprovalStatus,
+    },
     Policy(vault_policy::PolicyError),
     Signer(SignerError),
     PasswordHash(String),
@@ -233,6 +237,13 @@ impl From<DaemonError> for WireDaemonError {
             } => Self::ManualApprovalRejected {
                 approval_request_id,
             },
+            DaemonError::ManualApprovalRequestNotPending {
+                approval_request_id,
+                status,
+            } => Self::ManualApprovalRequestNotPending {
+                approval_request_id,
+                status,
+            },
             DaemonError::Policy(err) => Self::Policy(err),
             DaemonError::Signer(err) => Self::Signer(err),
             DaemonError::PasswordHash(msg) => Self::PasswordHash(msg),
@@ -293,6 +304,13 @@ impl WireDaemonError {
             } => DaemonError::ManualApprovalRejected {
                 approval_request_id,
             },
+            WireDaemonError::ManualApprovalRequestNotPending {
+                approval_request_id,
+                status,
+            } => DaemonError::ManualApprovalRequestNotPending {
+                approval_request_id,
+                status,
+            },
             WireDaemonError::Policy(err) => DaemonError::Policy(err),
             WireDaemonError::Signer(err) => DaemonError::Signer(err),
             WireDaemonError::PasswordHash(msg) => DaemonError::PasswordHash(msg),
@@ -1451,10 +1469,11 @@ mod tests {
         );
 
         let current_euid = nix::unistd::geteuid().as_raw();
+        let non_root_euid = if current_euid == 0 { 1 } else { current_euid };
         assert_eq!(
             socket_mode_for_allowed_peer_euids(
                 &singleton_allowed_set(0),
-                &singleton_allowed_set(current_euid)
+                &singleton_allowed_set(non_root_euid)
             ),
             0o666
         );

package/crates/vault-transport-xpc/src/lib.rs

@@ -22,8 +22,8 @@ use vault_daemon::{
 };
 use vault_domain::{
     AdminSession, AgentCredentials, Lease, ManualApprovalDecision, ManualApprovalRequest,
-    NonceReleaseRequest, NonceReservation, NonceReservationRequest, PolicyAttachment, RelayConfig,
-    SignRequest, Signature, SpendingPolicy, VaultKey,
+    ManualApprovalStatus, NonceReleaseRequest, NonceReservation, NonceReservationRequest,
+    PolicyAttachment, RelayConfig, SignRequest, Signature, SpendingPolicy, VaultKey,
 };
 use vault_policy::{PolicyError, PolicyEvaluation, PolicyExplanation};
 use vault_signer::{KeyCreateRequest, SignerError, VaultSignerBackend};
@@ -194,6 +194,10 @@ enum WireDaemonError {
     ManualApprovalRejected {
         approval_request_id: Uuid,
     },
+    ManualApprovalRequestNotPending {
+        approval_request_id: Uuid,
+        status: ManualApprovalStatus,
+    },
     Policy(PolicyError),
     Signer(SignerError),
     PasswordHash(String),
@@ -242,6 +246,13 @@ impl From<DaemonError> for WireDaemonError {
             } => Self::ManualApprovalRejected {
                 approval_request_id,
             },
+            DaemonError::ManualApprovalRequestNotPending {
+                approval_request_id,
+                status,
+            } => Self::ManualApprovalRequestNotPending {
+                approval_request_id,
+                status,
+            },
             DaemonError::Policy(err) => Self::Policy(err),
             DaemonError::Signer(err) => Self::Signer(err),
             DaemonError::PasswordHash(msg) => Self::PasswordHash(msg),
@@ -302,6 +313,13 @@ impl WireDaemonError {
             } => DaemonError::ManualApprovalRejected {
                 approval_request_id,
             },
+            WireDaemonError::ManualApprovalRequestNotPending {
+                approval_request_id,
+                status,
+            } => DaemonError::ManualApprovalRequestNotPending {
+                approval_request_id,
+                status,
+            },
             WireDaemonError::Policy(err) => DaemonError::Policy(err),
             WireDaemonError::Signer(err) => DaemonError::Signer(err),
             WireDaemonError::PasswordHash(msg) => DaemonError::PasswordHash(msg),