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

Tweak group containers path

Browse Source
This commit is contained in:
Anders Åberg
2025-06-03 11:47:38 +02:00
parent 2605c27831
commit 22b495e68d
1 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,28 +46,23 @@ pub fn path(name: &str) -> std::path::PathBuf {
#[cfg(target_os = "macos")]
{
// When running in an unsandboxed environment, path is: /Users/<user>/
// While running sandboxed, it's different: /Users/<user>/Library/Containers/com.bitwarden.desktop/Data
let mut home = dirs::home_dir().unwrap();
// Check if the app is sandboxed by looking for the Containers directory
let containers_position = home
.components()
.position(|c| c.as_os_str() == "Containers");
// If the app is sanboxed, we need to use the App Group directory
let position = containers_position.unwrap_or(4);
// We want to use App Groups in /Users/<user>/Library/Group Containers/LTZ2PFU5D6.com.bitwarden.desktop,
// so we need to remove all the components after the user. We can use the previous position to do this.
while home.components().count() > position - 1 {
home.pop();
// Always trim back to /Users/<user> (first 2 components) if we detect sandboxing
if home.components().any(|c| c.as_os_str() == "Containers") {
// Sandboxed: trim to /Users/<user>
while home.components().count() > 2 {
home.pop();
}
}
// Unsandboxed paths should already be /Users/<user>
let tmp = home.join("Library/Group Containers/LTZ2PFU5D6.com.bitwarden.desktop/tmp");
// The tmp directory might not exist, so create it
let _ = std::fs::create_dir_all(&tmp);
if let Err(e) = std::fs::create_dir_all(&tmp) {
eprintln!("Warning: Failed to create tmp directory: {}", e);
}
return tmp.join(format!("app.{name}"));
}