Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions crates/bw-agent/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ serde_json = "1.0"
uuid = { version = "1.23", features = ["v4"] }
rusqlite = { version = "0.35", features = ["bundled"] }
clap = { version = "4", features = ["derive"] }
globset = "0.4"

[lints]
workspace = true
21 changes: 16 additions & 5 deletions crates/bw-agent/src/access_log.rs
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,10 @@ impl AccessLog {
}

fn init_schema(&self) -> rusqlite::Result<()> {
let conn = self.conn.lock().expect("lock poisoned");
let conn = self.conn.lock().unwrap_or_else(|e| {
log::warn!("Access log mutex was poisoned, recovering");
e.into_inner()
});
conn.execute_batch(
"CREATE TABLE IF NOT EXISTS access_log (
id INTEGER PRIMARY KEY AUTOINCREMENT,
Expand All @@ -57,9 +60,11 @@ impl AccessLog {
)?;

// Migration: add column if table already exists without it.
let _ = conn.execute_batch(
if let Err(e) = conn.execute_batch(
"ALTER TABLE access_log ADD COLUMN process_chain TEXT NOT NULL DEFAULT '[]'",
);
) {
log::debug!("access_log migration skipped (column may already exist): {e}");
}

Ok(())
}
Expand All @@ -74,7 +79,10 @@ impl AccessLog {
approved: bool,
process_chain: &[ProcessInfo],
) -> rusqlite::Result<()> {
let conn = self.conn.lock().expect("lock poisoned");
let conn = self.conn.lock().unwrap_or_else(|e| {
log::warn!("Access log mutex was poisoned, recovering");
e.into_inner()
});
let chain_json = serde_json::to_string(process_chain).unwrap_or_else(|_| "[]".to_string());
conn.execute(
"INSERT INTO access_log (key_fingerprint, key_name, client_exe, client_pid, approved, process_chain) VALUES (?1, ?2, ?3, ?4, ?5, ?6)",
Expand All @@ -85,7 +93,10 @@ impl AccessLog {

/// Query the most recent access log entries (newest first).
pub fn query(&self, limit: u32) -> rusqlite::Result<Vec<AccessLogEntry>> {
let conn = self.conn.lock().expect("lock poisoned");
let conn = self.conn.lock().unwrap_or_else(|e| {
log::warn!("Access log mutex was poisoned, recovering");
e.into_inner()
});
let mut stmt = conn.prepare(
"SELECT id, timestamp, key_fingerprint, key_name, client_exe, client_pid, approved, process_chain FROM access_log ORDER BY id DESC LIMIT ?1",
)?;
Expand Down
6 changes: 5 additions & 1 deletion crates/bw-agent/src/approval.rs
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,11 @@ impl ApprovalQueue {
/// Respond to a pending approval request.
pub async fn respond(&self, request_id: &str, approved: bool) {
if let Some(tx) = self.pending.lock().await.remove(request_id) {
let _ = tx.send(approved);
if tx.send(approved).is_err() {
log::warn!(
"Approval response dropped — receiver already cancelled for request {request_id}"
);
}
}
self.requests.lock().await.retain(|r| r.id != request_id);
}
Expand Down
53 changes: 42 additions & 11 deletions crates/bw-agent/src/auth.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,14 @@ pub async fn ensure_unlocked<U: crate::UiCallback>(
state: Arc<Mutex<State>>,
client: &bw_core::api::Client,
ui: &U,
max_attempts: u32,
) -> anyhow::Result<()> {
let is_unlocked = state.lock().await.is_unlocked();
if is_unlocked {
state.lock().await.touch();
return Ok(());
{
let mut state = state.lock().await;
if state.is_unlocked() {
state.touch();
return Ok(());
}
}

let email = state
Expand All @@ -21,7 +24,7 @@ pub async fn ensure_unlocked<U: crate::UiCallback>(
.ok_or_else(|| anyhow::anyhow!("Email not configured"))?;

let mut error: Option<String> = None;
for _attempt in 0..3 {
for _attempt in 0..max_attempts {
let password_str = ui
.request_password(&email, error.as_deref())
.await
Expand All @@ -39,7 +42,7 @@ pub async fn ensure_unlocked<U: crate::UiCallback>(
}
}

anyhow::bail!("Failed to unlock after 3 attempts");
anyhow::bail!("Failed to unlock after {max_attempts} attempts");
}

async fn try_login<U: crate::UiCallback>(
Expand Down Expand Up @@ -194,11 +197,39 @@ async fn try_login<U: crate::UiCallback>(
state.set_unlocked(keys, org_keys);
}

if let Ok(sync_data) = bw_core::api::sync_vault(client, &access_token).await {
let mut state = state.lock().await;
state.protected_private_key = Some(sync_data.protected_private_key);
state.protected_org_keys = sync_data.org_keys;
state.entries = sync_data.entries;
// Try to refresh the access token if we have a refresh_token
let refresh_token = state.lock().await.refresh_token.clone();
let fresh_token = match refresh_token {
Some(rt) => match client.exchange_refresh_token(&rt).await {
Ok(new_token) => {
state.lock().await.access_token = Some(new_token.clone());
log::info!("Token refreshed successfully during re-unlock");
new_token
}
Err(e) => {
log::warn!(
"Token refresh failed during re-unlock: {e}, trying existing token"
);
access_token.clone()
}
},
None => {
log::debug!("No refresh token available, using existing access token");
access_token.clone()
}
};

match bw_core::api::sync_vault(client, &fresh_token).await {
Ok(sync_data) => {
let mut state = state.lock().await;
state.protected_private_key = Some(sync_data.protected_private_key);
state.protected_org_keys = sync_data.org_keys;
state.entries = sync_data.entries;
log::debug!("Vault sync succeeded during re-unlock");
}
Err(e) => {
log::warn!("Vault sync failed during re-unlock: {e}. Local keys remain valid.");
}
}
}
}
Expand Down
73 changes: 72 additions & 1 deletion crates/bw-agent/src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ impl LockMode {
}
}

#[derive(serde::Serialize, serde::Deserialize, Debug, Clone, Default)]
#[derive(serde::Serialize, serde::Deserialize, Debug, Clone)]
pub struct Config {
pub email: Option<String>,
pub base_url: Option<String>,
Expand All @@ -58,9 +58,40 @@ pub struct Config {
#[serde(default, skip_serializing)]
lock_timeout: Option<u64>,

/// Timeout for SSH approval requests in seconds. Default: 30.
#[serde(default = "default_approval_timeout_secs")]
pub approval_timeout_secs: u64,

/// Maximum login retry attempts. Default: 3.
#[serde(default = "default_max_login_attempts")]
pub max_login_attempts: u32,

pub proxy: Option<String>,
}

const fn default_approval_timeout_secs() -> u64 {
30
}

const fn default_max_login_attempts() -> u32 {
3
}

impl Default for Config {
fn default() -> Self {
Self {
email: None,
base_url: None,
identity_url: None,
lock_mode: LockMode::default(),
lock_timeout: None,
approval_timeout_secs: default_approval_timeout_secs(),
max_login_attempts: default_max_login_attempts(),
proxy: None,
}
}
}

impl Config {
/// Load config from file, falling back to defaults if file doesn't exist.
/// Handles migration from the old `lock_timeout` (u64 seconds) field.
Expand Down Expand Up @@ -171,6 +202,12 @@ impl Config {
config_file_path().display()
);
}
if self.approval_timeout_secs < 5 {
anyhow::bail!("approval_timeout_secs must be at least 5 seconds");
}
if self.max_login_attempts < 1 {
anyhow::bail!("max_login_attempts must be at least 1");
}
Ok(())
}
}
Expand Down Expand Up @@ -203,6 +240,8 @@ mod tests {
assert_eq!(config.api_url(), "https://api.bitwarden.com");
assert_eq!(config.identity_url(), "https://identity.bitwarden.com");
assert_eq!(config.lock_mode, LockMode::Timeout { seconds: 900 });
assert_eq!(config.approval_timeout_secs, 30);
assert_eq!(config.max_login_attempts, 3);
}

#[test]
Expand Down Expand Up @@ -251,6 +290,26 @@ mod tests {
assert!(config.validate().is_ok());
}

#[test]
fn test_validate_fails_when_approval_timeout_too_low() {
let config = Config {
email: Some("user@example.com".to_string()),
approval_timeout_secs: 4,
..Config::default()
};
assert!(config.validate().is_err());
}

#[test]
fn test_validate_fails_when_max_login_attempts_too_low() {
let config = Config {
email: Some("user@example.com".to_string()),
max_login_attempts: 0,
..Config::default()
};
assert!(config.validate().is_err());
}

#[test]
fn test_config_roundtrip_json() {
let config = Config {
Expand All @@ -259,13 +318,25 @@ mod tests {
identity_url: None,
lock_mode: LockMode::Timeout { seconds: 600 },
lock_timeout: None,
approval_timeout_secs: 30,
max_login_attempts: 3,
proxy: Some("http://127.0.0.1:7890".to_string()),
};
let json = serde_json::to_string_pretty(&config).unwrap();
let deserialized: Config = serde_json::from_str(&json).unwrap();
assert_eq!(deserialized.email, config.email);
assert_eq!(deserialized.base_url, config.base_url);
assert_eq!(deserialized.lock_mode, LockMode::Timeout { seconds: 600 });
assert_eq!(deserialized.approval_timeout_secs, 30);
assert_eq!(deserialized.max_login_attempts, 3);
}

#[test]
fn test_new_fields_default_when_missing_from_json() {
let json = r#"{"email":"test@test.com"}"#;
let config: Config = serde_json::from_str(json).unwrap();
assert_eq!(config.approval_timeout_secs, 30);
assert_eq!(config.max_login_attempts, 3);
}

#[test]
Expand Down
15 changes: 12 additions & 3 deletions crates/bw-agent/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,15 @@ pub async fn start_agent_with_shared_state<U: UiCallback>(
log::info!("Proxy: {proxy}");
}

let handler =
ssh_agent::SshAgentHandler::new(state, client, Arc::new(ui), approval_queue, access_log);
let handler = ssh_agent::SshAgentHandler::new(
state,
client,
Arc::new(ui),
approval_queue,
access_log,
std::time::Duration::from_secs(config.approval_timeout_secs),
config.max_login_attempts,
);

log::info!("Starting bw-agent SSH agent...");

Expand All @@ -166,7 +173,9 @@ pub async fn start_agent_with_shared_state<U: UiCallback>(
#[cfg(unix)]
{
let socket_path = std::env::var("BW_SOCKET_PATH").unwrap_or_else(|_| default_socket_path());
let _ = std::fs::remove_file(&socket_path);
if let Err(e) = std::fs::remove_file(&socket_path) {
log::debug!("Could not remove stale socket {socket_path}: {e}");
}
log::info!("Listening on Unix socket: {socket_path}");
let listener = tokio::net::UnixListener::bind(&socket_path)?;
ssh_agent_lib::agent::listen(listener, handler).await?;
Expand Down
Loading
Loading