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

Fix clippy warnings

Browse Source
This commit is contained in:
Dmitry Yakimenko
2025-10-25 19:34:14 +02:00
parent 953468268a
commit 6fddb44dc2
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/desktop/desktop_native/bitwarden_chromium_importer/src/bin/bitwarden_chromium_import_helper.rs
View File

@@ -70,7 +70,7 @@ mod windows_binary {
"9f6680c4720dbf66d1cb8ed6e328f58e42523badc60d138c7a04e63af14ea40d";
// List of SYSTEM process names to try to impersonate
const SYSTEM_PROCESS_NAMES: [&'static str; 2] = ["services.exe", "winlogon.exe"];
const SYSTEM_PROCESS_NAMES: [&str; 2] = ["services.exe", "winlogon.exe"];
async fn open_pipe_client(pipe_name: &'static str) -> Result<NamedPipeClient> {
// TODO: Don't loop forever, but retry a few times

13
apps/desktop/desktop_native/bitwarden_chromium_importer/src/windows.rs
View File

@@ -1,10 +1,9 @@
use aes_gcm::aead::Aead;
use aes_gcm::{Aes256Gcm, Key, KeyInit, Nonce};
use aes_gcm::{aead::Aead, Aes256Gcm, Key, KeyInit, Nonce};
use anyhow::{anyhow, Result};
use async_trait::async_trait;
use base64::{engine::general_purpose::STANDARD as BASE64_STANDARD, Engine as _};
use chacha20poly1305::ChaCha20Poly1305;
use std::path::PathBuf;
use std::path::{Path, PathBuf};
use windows::Win32::{
Foundation::{LocalFree, HLOCAL},
Security::Cryptography::{CryptUnprotectData, CRYPT_INTEGER_BLOB},
@@ -57,7 +56,7 @@ pub fn get_crypto_service(
// Private
//
const ADMIN_EXE_FILENAME: &'static str = "bitwarden_chromium_import_helper.exe";
const ADMIN_EXE_FILENAME: &str = "bitwarden_chromium_import_helper.exe";
//
// CryptoService
@@ -183,7 +182,7 @@ impl WindowsCryptoService {
.ok_or_else(|| anyhow!("Failed to convert {} path to string", ADMIN_EXE_FILENAME))?;
let key_base64 = abe::decrypt_with_admin_exe(
&admin_exe_str,
admin_exe_str,
self.app_bound_encrypted_key
.as_ref()
.expect("app_bound_encrypted_key should not be None"),
@@ -303,7 +302,7 @@ fn get_admin_exe_path() -> Result<PathBuf> {
.file_name()
.ok_or_else(|| anyhow!("Failed to get file name from current executable path"))?;
let admin_exe_full_path = if exe_name.to_ascii_lowercase() == "electron.exe" {
let admin_exe_full_path = if exe_name.eq_ignore_ascii_case("electron.exe") {
get_debug_admin_exe_path()?
} else {
get_dist_admin_exe_path(&current_exe_full_path)?
@@ -321,7 +320,7 @@ fn get_admin_exe_path() -> Result<PathBuf> {
Ok(admin_exe_full_path)
}
fn get_dist_admin_exe_path(current_exe_full_path: &PathBuf) -> Result<PathBuf> {
fn get_dist_admin_exe_path(current_exe_full_path: &Path) -> Result<PathBuf> {
let admin_exe = current_exe_full_path
.parent()
.map(|p| p.join(ADMIN_EXE_FILENAME))