bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-10 21:33:27 +00:00
Code Issues Releases Wiki Activity

[PM-25932] Shorten socket paths (#17093)

Browse Source 
* feat: shorten socket paths

* fix: No such file or directory error

* feat: remove tmp folder from path

* fix: No such file or directory autofill error
This commit is contained in:
Andreas Coroiu
2025-10-31 08:15:04 +01:00
committed by GitHub
parent 1264abfb19
commit 8aebfbeace
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apps/desktop/desktop_native/core/src/ipc/mod.rs
View File

@@ -35,7 +35,7 @@ fn internal_ipc_codec<T: AsyncRead + AsyncWrite>(inner: T) -> Framed<T, LengthDe
pub fn path(name: &str) -> std::path::PathBuf { pub fn path(name: &str) -> std::path::PathBuf {
#[cfg(target_os = "windows")] #[cfg(target_os = "windows")]
{ {
// Use a unique IPC pipe //./pipe/xxxxxxxxxxxxxxxxx.app.bitwarden per user. // Use a unique IPC pipe //./pipe/xxxxxxxxxxxxxxxxx.s.bw per user (s for socket).
// Hashing prevents problems with reserved characters and file length limitations. // Hashing prevents problems with reserved characters and file length limitations.
use base64::{engine::general_purpose::URL_SAFE_NO_PAD, Engine}; use base64::{engine::general_purpose::URL_SAFE_NO_PAD, Engine};
use sha2::Digest; use sha2::Digest;
@@ -43,7 +43,7 @@ pub fn path(name: &str) -> std::path::PathBuf {
let hash = sha2::Sha256::digest(home.as_os_str().as_encoded_bytes()); let hash = sha2::Sha256::digest(home.as_os_str().as_encoded_bytes());
let hash_b64 = URL_SAFE_NO_PAD.encode(hash.as_slice()); let hash_b64 = URL_SAFE_NO_PAD.encode(hash.as_slice());
format!(r"\\.\pipe\{hash_b64}.app.{name}").into() format!(r"\\.\pipe\{hash_b64}.s.{name}").into()
} }
#[cfg(target_os = "macos")] #[cfg(target_os = "macos")]
@@ -65,11 +65,11 @@ pub fn path(name: &str) -> std::path::PathBuf {
home.pop(); home.pop();
} }
let tmp = home.join("Library/Group Containers/LTZ2PFU5D6.com.bitwarden.desktop/tmp"); let tmp = home.join("Library/Group Containers/LTZ2PFU5D6.com.bitwarden.desktop");
// The tmp directory might not exist, so create it // The tmp directory might not exist, so create it
let _ = std::fs::create_dir_all(&tmp); let _ = std::fs::create_dir_all(&tmp);
return tmp.join(format!("app.{name}")); return tmp.join(format!("s.{name}"));
} }
} }
@@ -81,6 +81,6 @@ pub fn path(name: &str) -> std::path::PathBuf {
// The cache directory might not exist, so create it // The cache directory might not exist, so create it
let _ = std::fs::create_dir_all(&path_dir); let _ = std::fs::create_dir_all(&path_dir);
path_dir.join(format!("app.{name}")) path_dir.join(format!("s.{name}"))
} }
} }

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

@@ -96,7 +96,7 @@ impl MacOSProviderClient {
response_callbacks_queue: Arc::new(Mutex::new(HashMap::new())), response_callbacks_queue: Arc::new(Mutex::new(HashMap::new())),
}; };
let path = desktop_core::ipc::path("autofill"); let path = desktop_core::ipc::path("af");
let queue = client.response_callbacks_queue.clone(); let queue = client.response_callbacks_queue.clone();

2
apps/desktop/desktop_native/proxy/src/main.rs
View File

@@ -68,7 +68,7 @@ async fn main() {
#[cfg(target_os = "windows")] #[cfg(target_os = "windows")]
let should_foreground = windows::allow_foreground(); let should_foreground = windows::allow_foreground();
let sock_path = desktop_core::ipc::path("bitwarden"); let sock_path = desktop_core::ipc::path("bw");
let log_path = { let log_path = {
let mut path = sock_path.clone(); let mut path = sock_path.clone();

2
apps/desktop/src/main/native-messaging.main.ts
View File

@@ -78,7 +78,7 @@ export class NativeMessagingMain {
this.ipcServer.stop(); this.ipcServer.stop();
} }
this.ipcServer = await ipc.IpcServer.listen("bitwarden", (error, msg) => { this.ipcServer = await ipc.IpcServer.listen("bw", (error, msg) => {
switch (msg.kind) { switch (msg.kind) {
case ipc.IpcMessageType.Connected: { case ipc.IpcMessageType.Connected: {
this.connected.push(msg.clientId); this.connected.push(msg.clientId);

2
apps/desktop/src/platform/main/autofill/native-autofill.main.ts
View File

@@ -35,7 +35,7 @@ export class NativeAutofillMain {
); );
this.ipcServer = await autofill.IpcServer.listen( this.ipcServer = await autofill.IpcServer.listen(
"autofill", "af",
// RegistrationCallback // RegistrationCallback
(error, clientId, sequenceNumber, request) => { (error, clientId, sequenceNumber, request) => {
if (error) { if (error) {