Implement generate-password request uses KeePassXC's password generator popup

(KeePassXC 2.7.0+)

Author: purejava

src/main/java/org/purejava/KeepassProxyAccess.java

@@ -15,6 +15,7 @@
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
+import java.lang.module.ModuleDescriptor.Version;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
@@ -36,6 +37,8 @@ public class KeepassProxyAccess implements PropertyChangeListener {
     private final AtomicReference<ScheduledFuture<?>> scheduledSaveCmd = new AtomicReference<>();
     private final ScheduledExecutorService scheduler;
 
+    private final String V2_7_0 = "2.7.0";
+
     public KeepassProxyAccess() {
         if (SystemUtils.IS_OS_LINUX || SystemUtils.IS_OS_MAC_OSX) {
             connection = new LinuxMacConnection();
@@ -322,8 +325,12 @@ public JSONObject getDatabaseGroups() {
      */
     public String generatePassword() {
         try {
-            var response = connection.generatePassword().getJSONArray("entries");
-            return response.getJSONObject(0).getString("password");
+            var response = connection.generatePassword();
+            if (isMinimiumVersion(response.getString("version"), V2_7_0)) {
+                return response.getString("password");
+            } else {
+                return response.getJSONArray("entries").getJSONObject(0).getString("password");
+            }
         } catch (IOException | IllegalStateException | KeepassProxyAccessException | JSONException e) {
             log.info(e.toString(), e.getCause());
             return "";
@@ -458,6 +465,17 @@ private void traverse(List<Object> children, Map<String, String> groups) {
                 });
     }
 
+    /**
+     * Compare two software version strings to check for a minimum software version.
+     *
+     * @param v1 The first version string.
+     * @param v2 The second version string.
+     * @return True in case v1 >= v2, false otherwise.
+     */
+    private boolean isMinimiumVersion(String v1, String v2) {
+        return Version.parse(v1).compareTo(Version.parse(v2)) >= 0;
+    }
+
     @Override
     public void propertyChange(PropertyChangeEvent event) {
         scheduleSave((Optional<Credentials>) event.getNewValue());

src/test/java/org/purejava/UnlockedDatabaseTest.java

@@ -42,7 +42,7 @@ public void shouldHaveNoErrors() throws InterruptedException {
         assertTrue(kpa.getLogins("https://github.com", null, false, l).toString().contains("uuid=2aafee1a89fd435c8bad7df12bbaaa3e"));
         assertTrue(kpa.setLogin("https://github.com", "https://github.com", null, "User", "Passsword", "Group", null, null));
         assertTrue(kpa.databaseGroupsToMap(kpa.getDatabaseGroups()).toString().contains("KeePassXC-Browser Passwords"));
-        assertTrue(null != kpa.generatePassword() && !kpa.generatePassword().isEmpty());
+        assertFalse(kpa.generatePassword().isEmpty());
         log.info("Please allow to create new group");
         assertEquals(kpa.createNewGroup("Testgroup").get("name"), "Testgroup");
         assertTrue(null != kpa.getTotp("2aafee1a89fd435c8bad7df12bbaaa3e") && !kpa.getTotp("2aafee1a89fd435c8bad7df12bbaaa3e").isEmpty());