From e71c00ee30c6836df3c94ac0e8a888d91455e02f Mon Sep 17 00:00:00 2001
From: Victor Lavaud <victor.lavaud@pm.me>
Date: Sat, 22 Jun 2024 16:06:58 +0200
Subject: [PATCH] profiles: keepassxc: add new socket location

The KeePassXC browser extension looks for the KeePassXC socket at
`${RUNUSER}/app/org.keepassxc.KeePassXC`[1].

But `${RUNUSER}/app` seems to be blacklisted in disable-common.inc under the
flatpak section[2], so the KeePassXC extension cannot connect to it.

Fixes #5447.

[1] https://github.com/keepassxreboot/keepassxc/blob/6b1ab1a5edd66ac10706a2fb5af34ec9458a901d/src/browser/BrowserShared.cpp#L41
[2] https://github.com/netblue30/firejail/blob/b89ec818926b4bcd3a58bb4e2a67b68a8090ba1c/etc/inc/disable-common.inc#L667
---
 etc/profile-a-l/cachy-browser.profile | 2 ++
 etc/profile-a-l/firefox.profile       | 2 ++
 etc/profile-a-l/floorp.profile        | 2 ++
 etc/profile-a-l/keepassxc.profile     | 4 ++++
 etc/profile-a-l/librewolf.profile     | 2 ++
 5 files changed, 12 insertions(+)

diff --git a/etc/profile-a-l/cachy-browser.profile b/etc/profile-a-l/cachy-browser.profile
index 05e1a69f1b8..b0dd167bc0b 100644
--- a/etc/profile-a-l/cachy-browser.profile
+++ b/etc/profile-a-l/cachy-browser.profile
@@ -21,6 +21,8 @@ whitelist /usr/share/cachy-browser
 
 # To enable KeePassXC Plugin add one of the following lines to your cachy-browser.local.
 # Note: Start KeePassXC before CachyBrowser and keep it open to allow communication between them.
+#noblacklist ${RUNUSER}/app
+#whitelist ${RUNUSER}/app/org.keepassxc.KeePassXC
 #whitelist ${RUNUSER}/kpxc_server
 #whitelist ${RUNUSER}/org.keepassxc.KeePassXC.BrowserServer
 
diff --git a/etc/profile-a-l/firefox.profile b/etc/profile-a-l/firefox.profile
index 009a0d11969..4e725019eac 100644
--- a/etc/profile-a-l/firefox.profile
+++ b/etc/profile-a-l/firefox.profile
@@ -31,6 +31,8 @@ whitelist ${HOME}/.mozilla
 
 # Add one of the following whitelist options to your firefox.local to enable KeePassXC Plugin support.
 # Note: Start KeePassXC before Firefox and keep it open to allow communication between them.
+#noblacklist ${RUNUSER}/app
+#whitelist ${RUNUSER}/app/org.keepassxc.KeePassXC
 #whitelist ${RUNUSER}/kpxc_server
 #whitelist ${RUNUSER}/org.keepassxc.KeePassXC.BrowserServer
 
diff --git a/etc/profile-a-l/floorp.profile b/etc/profile-a-l/floorp.profile
index 49caed107f4..b8a37460c44 100644
--- a/etc/profile-a-l/floorp.profile
+++ b/etc/profile-a-l/floorp.profile
@@ -20,6 +20,8 @@ whitelist ${HOME}/.floorp
 
 # To enable KeePassXC Plugin add one of the following lines to your floorp.local.
 # Note: Start KeePassXC before floorp and keep it open to allow communication between them.
+#noblacklist ${RUNUSER}/app
+#whitelist ${RUNUSER}/app/org.keepassxc.KeePassXC
 #whitelist ${RUNUSER}/kpxc_server
 #whitelist ${RUNUSER}/org.keepassxc.KeePassXC.BrowserServer
 
diff --git a/etc/profile-a-l/keepassxc.profile b/etc/profile-a-l/keepassxc.profile
index 4e8c8e4497d..7a122744236 100644
--- a/etc/profile-a-l/keepassxc.profile
+++ b/etc/profile-a-l/keepassxc.profile
@@ -13,6 +13,7 @@ noblacklist ${HOME}/.config/keepassxc
 noblacklist ${HOME}/.config/KeePassXCrc
 noblacklist ${HOME}/.keepassxc
 noblacklist ${DOCUMENTS}
+noblacklist ${RUNUSER}/app
 
 # Allow browser profiles, required for browser integration.
 noblacklist ${HOME}/.config/BraveSoftware
@@ -62,8 +63,11 @@ include disable-xdg.inc
 #whitelist ${HOME}/.config/KeePassXCrc
 #include whitelist-common.inc
 
+mkdir ${RUNUSER}/app/org.keepassxc.KeePassXC
+whitelist ${RUNUSER}/app/org.keepassxc.KeePassXC
 whitelist /usr/share/keepassxc
 include whitelist-run-common.inc
+include whitelist-runuser-common.inc
 include whitelist-usr-share-common.inc
 include whitelist-var-common.inc
 
diff --git a/etc/profile-a-l/librewolf.profile b/etc/profile-a-l/librewolf.profile
index 65a4a378796..8da53b9e0c9 100644
--- a/etc/profile-a-l/librewolf.profile
+++ b/etc/profile-a-l/librewolf.profile
@@ -20,6 +20,8 @@ whitelist ${HOME}/.librewolf
 
 # To enable KeePassXC Plugin add one of the following lines to your librewolf.local.
 # Note: Start KeePassXC before Librewolf and keep it open to allow communication between them.
+#noblacklist ${RUNUSER}/app
+#whitelist ${RUNUSER}/app/org.keepassxc.KeePassXC
 #whitelist ${RUNUSER}/kpxc_server
 #whitelist ${RUNUSER}/org.keepassxc.KeePassXC.BrowserServer