Find out which KeePassXC variant is used

Enables KeePassXC installed via Flatpak and Snap

Author: purejava

src/main/java/org/keepassxc/KeePassXCType.java

@@ -0,0 +1,8 @@
+package org.keepassxc;
+
+public enum KeePassXCType {
+    Repo,
+    AppImage,
+    Snap,
+    Flatpak
+}

src/main/java/org/keepassxc/KindOfKeePassXC.java

@@ -0,0 +1,44 @@
+package org.keepassxc;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Optional;
+
+public class KindOfKeePassXC {
+    private static final Logger log = LoggerFactory.getLogger(KindOfKeePassXC.class);
+
+    static Optional<KeePassXCType> determineType() {
+        var processHandle = ProcessHandle.allProcesses()
+                .filter(ph -> ph.info().command().isPresent() && ph.info().command().get().contains("KeePassXC"))
+                .findFirst();
+        if (processHandle.isPresent() && processHandle.get().info().command().get().contains("AppImage")) {
+            log.debug("Found running KeePassXC AppImage");
+            return Optional.of(KeePassXCType.AppImage);
+        }
+
+        processHandle = ProcessHandle.allProcesses()
+                .filter(ph -> ph.info().commandLine().isPresent() && ph.info().commandLine().get().contains("keepassxc"))
+                .findFirst();
+        if (processHandle.isPresent()) {
+            log.debug("Found running KeePassXC installed from repository");
+            return Optional.of(KeePassXCType.Repo);
+        }
+
+        processHandle = ProcessHandle.allProcesses()
+                .filter(ph -> ph.info().command().isPresent() && ph.info().command().get().contains("keepassxc"))
+                .findFirst();
+        if (processHandle.isPresent() && processHandle.get().info().command().get().contains("app")) {
+            log.debug("Found running KeePassXC installed via Flatpak");
+            return Optional.of(KeePassXCType.Flatpak);
+        }
+
+        if (processHandle.isPresent() && processHandle.get().info().command().get().contains("snap")) {
+            log.debug("Found running KeePassXC installed via Snap");
+            return Optional.of(KeePassXCType.Snap);
+        }
+
+        log.debug("Could not find running KeePassXC application");
+        return Optional.empty();
+    }
+}

src/main/java/org/keepassxc/LinuxMacConnection.java

@@ -7,6 +7,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.File;
 import java.io.IOException;
 import java.net.UnixDomainSocketAddress;
 import java.nio.ByteBuffer;
@@ -22,12 +23,15 @@ public class LinuxMacConnection extends Connection {
 
     private final int BUFFER_SIZE = 1024;
     private SocketChannel socket;
-    private final UnixDomainSocketAddress socketAddress;
+    private UnixDomainSocketAddress socketAddress;
     private final ByteBuffer buffer = ByteBuffer.allocate(BUFFER_SIZE);
     private final Charset charset = StandardCharsets.UTF_8;
     private final CharsetDecoder charsetDecoder = charset.newDecoder();
     private final CharBuffer charBuffer = CharBuffer.allocate(BUFFER_SIZE);
 
+    private static final String FLATPAK_PATH = "/app/org.keepassxc.KeePassXC";
+    private static final String SNAP_PATH = System.getProperty("user.home") + "/snap/keepassxc/common";
+
     public LinuxMacConnection() {
         var socketPath = getSocketPath();
         this.socketAddress = UnixDomainSocketAddress.of(socketPath + "/" + PROXY_NAME);
@@ -100,15 +104,30 @@ protected JSONObject getCleartextResponse() {
     }
 
     /**
-     * Get the os-specific directory, where runtime files and sockets are kept.
+     * Get the os-specific and KeePassXC installation-specific directory, where runtime files and sockets are kept.
      *
      * @return The socket path.
      */
     private String getSocketPath() {
         if (SystemUtils.IS_OS_LINUX) {
-            var path = System.getenv("XDG_RUNTIME_DIR");
-            if (null == path) path = System.getenv("TMPDIR");
-            return (null == path) ? "/tmp" : path;
+            var type = KindOfKeePassXC.determineType();
+            if (type.isEmpty()) {
+                return getXDGPath();
+            } else {
+                switch (type.get()) {
+                    case Repo, AppImage -> {
+                        return getXDGPath();
+                    }
+                    case Flatpak -> {
+                        log.debug("Using XDG_RUNTIME_DIR" + FLATPAK_PATH);
+                        return System.getenv("XDG_RUNTIME_DIR") + FLATPAK_PATH;
+                    }
+                    case Snap -> {
+                        log.debug("Using " + SNAP_PATH);
+                        return SNAP_PATH;
+                    }
+                }
+            }
         }
         if (SystemUtils.IS_OS_MAC_OSX) {
             return System.getenv("TMPDIR");
@@ -118,6 +137,34 @@ private String getSocketPath() {
         }
     }
 
+    /**
+     * Find the XDG_RUNTIME_DIR KeePassXC is using.
+     * When installed from a repo or run as an AppImage, it depends on the KeePassXC version, where it creates its socket:
+     * KeePassXC <2.7.2 create it in the XDG_RUNTIME_DIR
+     * KeePassXC 2.7.2+ create it in XDG_RUNTIME_DIR/app/org.keepassxc.KeePassXC/
+     *
+     * @return The correct socket path.
+     */
+    private String getXDGPath() {
+        var path = System.getenv("XDG_RUNTIME_DIR");
+        log.debug("Checking if XDG_RUNTIME_DIR exists ...");
+        if (null == path) {
+            log.debug("Unable to find XDG_RUNTIME_DIR");
+            path = System.getenv("TMPDIR");
+            log.debug("Using TEMPDIR");
+            return (null == path) ? "/tmp" : path;
+        } else {
+            var flatpakPath = new File(path + FLATPAK_PATH);
+            if (flatpakPath.exists()) {
+                log.debug("Using XDG_RUNTIME_DIR" + FLATPAK_PATH);
+                return path + FLATPAK_PATH;
+            } else {
+                log.debug("Using XDG_RUNTIME_DIR");
+                return path;
+            }
+        }
+    }
+
     @Override
     protected boolean isConnected() {
         return null != socket && socket.isOpen();