harald/zeroclaw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

fix: replace std::sync::Mutex with parking_lot::Mutex (#350)

Browse source 
Merges #422
This commit is contained in:
Argenis 2026-02-16 15:02:46 -05:00 • committed by GitHub
parent bff0507132
commit 15e1d50a5d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
12 changed files with 1595 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/security/pairing.rs
View file

@ -9,8 +9,8 @@
// re-pairing.
use sha2::{Digest, Sha256};
use parking_lot::Mutex;
use std::collections::HashSet;
use std::sync::Mutex;
use std::time::Instant;
/// Maximum failed pairing attempts before lockout.
@ -72,7 +72,6 @@ impl PairingGuard {
pub fn pairing_code(&self) -> Option<String> {
self.pairing_code
.lock()
.unwrap_or_else(std::sync::PoisonError::into_inner)
.clone()
}
@ -89,7 +88,7 @@ impl PairingGuard {
let attempts = self
.failed_attempts
.lock()
.unwrap_or_else(std::sync::PoisonError::into_inner);
;
if let (count, Some(locked_at)) = &*attempts {
if *count >= MAX_PAIR_ATTEMPTS {
let elapsed = locked_at.elapsed().as_secs();
@ -104,7 +103,7 @@ impl PairingGuard {
let mut pairing_code = self
.pairing_code
.lock()
.unwrap_or_else(std::sync::PoisonError::into_inner);
;
if let Some(ref expected) = *pairing_code {
if constant_time_eq(code.trim(), expected.trim()) {
// Reset failed attempts on success
@ -112,14 +111,14 @@ impl PairingGuard {
let mut attempts = self
.failed_attempts
.lock()
.unwrap_or_else(std::sync::PoisonError::into_inner);
;
*attempts = (0, None);
}
let token = generate_token();
let mut tokens = self
.paired_tokens
.lock()
.unwrap_or_else(std::sync::PoisonError::into_inner);
;
tokens.insert(hash_token(&token));
// Consume the pairing code so it cannot be reused
@ -135,7 +134,7 @@ impl PairingGuard {
let mut attempts = self
.failed_attempts
.lock()
.unwrap_or_else(std::sync::PoisonError::into_inner);
;
attempts.0 += 1;
if attempts.0 >= MAX_PAIR_ATTEMPTS {
attempts.1 = Some(Instant::now());
@ -154,7 +153,7 @@ impl PairingGuard {
let tokens = self
.paired_tokens
.lock()
.unwrap_or_else(std::sync::PoisonError::into_inner);
;
tokens.contains(&hashed)
}
@ -163,7 +162,7 @@ impl PairingGuard {
let tokens = self
.paired_tokens
.lock()
.unwrap_or_else(std::sync::PoisonError::into_inner);
;
!tokens.is_empty()
}
@ -172,7 +171,7 @@ impl PairingGuard {
let tokens = self
.paired_tokens
.lock()
.unwrap_or_else(std::sync::PoisonError::into_inner);
;
tokens.iter().cloned().collect()
}
}

11
src/security/policy.rs
View file

@ -1,6 +1,6 @@
use serde::{Deserialize, Serialize};
use parking_lot::Mutex;
use std::path::{Path, PathBuf};
use std::sync::Mutex;
use std::time::Instant;
/// How much autonomy the agent has
@ -42,8 +42,7 @@ impl ActionTracker {
pub fn record(&self) -> usize {
let mut actions = self
.actions
.lock()
.unwrap_or_else(std::sync::PoisonError::into_inner);
.lock();
let cutoff = Instant::now()
.checked_sub(std::time::Duration::from_secs(3600))
.unwrap_or_else(Instant::now);
@ -56,8 +55,7 @@ impl ActionTracker {
pub fn count(&self) -> usize {
let mut actions = self
.actions
.lock()
.unwrap_or_else(std::sync::PoisonError::into_inner);
.lock();
let cutoff = Instant::now()
.checked_sub(std::time::Duration::from_secs(3600))
.unwrap_or_else(Instant::now);
@ -70,8 +68,7 @@ impl Clone for ActionTracker {
fn clone(&self) -> Self {
let actions = self
.actions
.lock()
.unwrap_or_else(std::sync::PoisonError::into_inner);
.lock();
Self {
actions: Mutex::new(actions.clone()),
}