bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2026-02-04 02:33:33 +00:00
Code Issues Releases Wiki Activity

[BEEEP] Enable clippy pedantic for Autofill Desktop

Browse Source
This commit is contained in:
neuronull
2025-10-17 13:16:42 -06:00
parent d65824e624
commit 9b1cba4652
10 changed files with 71 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/desktop/desktop_native/autotype/src/lib.rs
View File

@@ -1,3 +1,5 @@
#![deny(clippy::pedantic, warnings)]
use anyhow::Result;
#[cfg_attr(target_os = "linux", path = "linux.rs")]

5
apps/desktop/desktop_native/core/src/autofill/macos.rs
View File

@@ -1,5 +1,10 @@
use anyhow::Result;
/// # Errors
///
/// This function errors if any error occurs while executing
/// the `ObjC` command, or if converting the `value` argument
/// into a `CString`.
pub async fn run_command(value: String) -> Result<String> {
desktop_objc::run_command(value).await
}

2
apps/desktop/desktop_native/core/src/autofill/mod.rs
View File

@@ -1,3 +1,5 @@
#![deny(clippy::pedantic, warnings)]
#[allow(clippy::module_inception)]
#[cfg_attr(target_os = "linux", path = "unix.rs")]
#[cfg_attr(target_os = "windows", path = "windows.rs")]

3
apps/desktop/desktop_native/core/src/autofill/unix.rs
View File

@@ -1,5 +1,8 @@
use anyhow::Result;
/// # Errors
///
/// TODO
#[allow(clippy::unused_async)]
pub async fn run_command(_value: String) -> Result<String> {
todo!("Unix does not support autofill");

5
apps/desktop/desktop_native/core/src/autofill/windows.rs
View File

@@ -1,6 +1,9 @@
use anyhow::Result;
#[allow(clippy::unused_async)]
/// # Errors
///
/// TODO
#[allow(clippy::unused_async, missing_errors_doc)]
pub async fn run_command(_value: String) -> Result<String> {
todo!("Windows does not support autofill");
}

37
apps/desktop/desktop_native/core/src/ssh_agent/mod.rs
View File

@@ -1,3 +1,5 @@
#![deny(clippy::pedantic, warnings)]
use std::sync::{
atomic::{AtomicBool, AtomicU32},
Arc,
@@ -103,7 +105,7 @@ impl ssh_agent::Agent<peerinfo::models::PeerInfo, BitwardenSshKey>
request_parser::SshAgentSignRequest::SshSigRequest(ref req) => {
Some(req.namespace.clone())
}
_ => None,
request_parser::SshAgentSignRequest::SignRequest(_) => None,
};
info!(
@@ -180,6 +182,9 @@ impl ssh_agent::Agent<peerinfo::models::PeerInfo, BitwardenSshKey>
}
impl BitwardenDesktopAgent<BitwardenSshKey> {
/// # Panics
///
/// This function panics if the underlying `RwLock` is poisoned.
pub fn stop(&self) {
if !self.is_running() {
error!("Tried to stop agent while it is not running");
@@ -195,10 +200,15 @@ impl BitwardenDesktopAgent<BitwardenSshKey> {
.clear();
}
pub fn set_keys(
&mut self,
new_keys: Vec<(String, String, String)>,
) -> Result<(), anyhow::Error> {
/// # Errors
///
/// This function returns an error if the agent is not running.
///
/// # Panics
///
/// This function panics if the underlying `RwLock` is poisoned or
/// if the cipher's public key is not serializable to bytes.
pub fn set_keys(&mut self, new_keys: &[(String, String, String)]) -> Result<(), anyhow::Error> {
if !self.is_running() {
return Err(anyhow::anyhow!(
"[BitwardenDesktopAgent] Tried to set keys while agent is not running"
@@ -211,7 +221,7 @@ impl BitwardenDesktopAgent<BitwardenSshKey> {
self.needs_unlock
.store(true, std::sync::atomic::Ordering::Relaxed);
for (key, name, cipher_id) in new_keys.iter() {
for (key, name, cipher_id) in new_keys {
match parse_key_safe(key) {
Ok(private_key) => {
let public_key_bytes = private_key
@@ -236,6 +246,13 @@ impl BitwardenDesktopAgent<BitwardenSshKey> {
Ok(())
}
/// # Errors
///
/// This function returns an error if the agent is not running.
///
/// # Panics
///
/// This function panics if the underlying `RwLock` is poisoned.
pub fn lock(&mut self) -> Result<(), anyhow::Error> {
if !self.is_running() {
return Err(anyhow::anyhow!(
@@ -255,13 +272,14 @@ impl BitwardenDesktopAgent<BitwardenSshKey> {
Ok(())
}
pub fn clear_keys(&mut self) -> Result<(), anyhow::Error> {
/// # Panics
///
/// This function panics if the underlying `RwLock` is poisoned.
pub fn clear_keys(&mut self) {
let keystore = &mut self.keystore;
keystore.0.write().expect("RwLock is not poisoned").clear();
self.needs_unlock
.store(true, std::sync::atomic::Ordering::Relaxed);
Ok(())
}
fn get_request_id(&self) -> u32 {
@@ -274,6 +292,7 @@ impl BitwardenDesktopAgent<BitwardenSshKey> {
.fetch_add(1, std::sync::atomic::Ordering::Relaxed)
}
#[must_use]
pub fn is_running(&self) -> bool {
self.is_running.load(std::sync::atomic::Ordering::Relaxed)
}

4
apps/desktop/desktop_native/core/src/ssh_agent/peercred_unix_listener_stream.rs
View File

@@ -29,14 +29,14 @@ impl Stream for PeercredUnixListenerStream {
Poll::Ready(Ok((stream, _))) => {
let pid = match stream.peer_cred() {
Ok(peer) => match peer.pid() {
Some(pid) => pid,
Some(pid) => u32::try_from(pid).expect("pid should not be negative."),
None => {
return Poll::Ready(Some(Ok((stream, PeerInfo::unknown()))));
}
},
Err(_) => return Poll::Ready(Some(Ok((stream, PeerInfo::unknown())))),
};
let peer_info = peerinfo::gather::get_peer_info(pid as u32);
let peer_info = peerinfo::gather::get_peer_info(pid);
match peer_info {
Ok(info) => Poll::Ready(Some(Ok((stream, info)))),
Err(_) => Poll::Ready(Some(Ok((stream, PeerInfo::unknown())))),

18
apps/desktop/desktop_native/core/src/ssh_agent/peerinfo/gather.rs
View File

@@ -1,16 +1,17 @@
use sysinfo::{Pid, System};
use tracing::error;
use super::models::PeerInfo;
pub fn get_peer_info(peer_pid: u32) -> Result<PeerInfo, String> {
///
/// # Errors
///
/// This function returns an error string if there is no matching process
/// for the provided `peer_pid`.
pub(crate) fn get_peer_info(peer_pid: u32) -> Result<PeerInfo, String> {
let s = System::new_all();
if let Some(process) = s.process(Pid::from_u32(peer_pid)) {
let peer_process_name = match process.name().to_str() {
Some(name) => name.to_string(),
None => {
return Err("Failed to get process name".to_string());
}
};
let peer_process_name = process.name().to_string_lossy().to_string();
return Ok(PeerInfo::new(
peer_pid,
@@ -19,5 +20,6 @@ pub fn get_peer_info(peer_pid: u32) -> Result<PeerInfo, String> {
));
}
Err("Failed to get process".to_string())
error!(peer_pid, "No process matching peer PID.");
Err("No process matching PID".to_string())
}

13
apps/desktop/desktop_native/core/src/ssh_agent/peerinfo/models.rs
View File

@@ -14,6 +14,7 @@ pub struct PeerInfo {
}
impl PeerInfo {
#[must_use]
pub fn new(uid: u32, pid: u32, process_name: String) -> Self {
Self {
uid,
@@ -24,6 +25,7 @@ impl PeerInfo {
}
}
#[must_use]
pub fn unknown() -> Self {
Self {
uid: 0,
@@ -34,18 +36,22 @@ impl PeerInfo {
}
}
#[must_use]
pub fn uid(&self) -> u32 {
self.uid
}
#[must_use]
pub fn pid(&self) -> u32 {
self.pid
}
#[must_use]
pub fn process_name(&self) -> &str {
&self.process_name
}
#[must_use]
pub fn is_forwarding(&self) -> bool {
self.is_forwarding
.load(std::sync::atomic::Ordering::Relaxed)
@@ -56,11 +62,18 @@ impl PeerInfo {
.store(value, std::sync::atomic::Ordering::Relaxed);
}
/// # Panics
///
/// This function panics if the underlying `host_key` mutex is poisoned.
pub fn set_host_key(&self, host_key: Vec<u8>) {
let mut host_key_lock = self.host_key.lock().expect("Mutex is not poisoned");
*host_key_lock = host_key;
}
/// # Panics
///
/// This function panics if the underlying `host_key` mutex is poisoned.
#[must_use]
pub fn host_key(&self) -> Vec<u8> {
self.host_key.lock().expect("Mutex is not poisoned").clone()
}

6
apps/desktop/desktop_native/napi/src/lib.rs
View File

@@ -312,11 +312,9 @@ pub mod sshagent {
}
#[napi]
pub fn clear_keys(agent_state: &mut SshAgentState) -> napi::Result<()> {
pub fn clear_keys(agent_state: &mut SshAgentState) {
let bitwarden_agent_state = &mut agent_state.state;
bitwarden_agent_state
.clear_keys()
.map_err(|e| napi::Error::from_reason(e.to_string()))
bitwarden_agent_state.clear_keys();
}
}