Merge branch 'release/1.6.0'

infeo · infeo · commit b1d52d4422d4 · 2025-05-30T15:34:50.000+02:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -12,8 +12,8 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4
         with:
-          distribution: 'zulu'
-          java-version: 22
+          distribution: 'temurin'
+          java-version: 24
           cache: 'maven'
       - name: Ensure to use tagged version
         if: startsWith(github.ref, 'refs/tags/')
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -21,8 +21,8 @@ jobs:
         fetch-depth: 2
     - uses: actions/setup-java@v4
       with:
-        distribution: 'zulu'
-        java-version: 22
+        distribution: 'temurin'
+        java-version: 24
         cache: 'maven'
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v3
diff --git a/.github/workflows/dependency-check.yml b/.github/workflows/dependency-check.yml
@@ -14,7 +14,7 @@ jobs:
     with:
       runner-os: 'ubuntu-latest'
       java-distribution: 'temurin'
-      java-version: 22
+      java-version: 24
     secrets:
       nvd-api-key: ${{ secrets.NVD_API_KEY }}
       slack-webhook-url: ${{ secrets.SLACK_WEBHOOK_URL }}
diff --git a/.github/workflows/publish-central.yml b/.github/workflows/publish-central.yml
@@ -10,8 +10,8 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4
         with:
-          distribution: 'zulu'
-          java-version: 22
+          distribution: 'temurin'
+          java-version: 24
           cache: 'maven'
           server-id: central
           server-username: MAVEN_CENTRAL_USERNAME
diff --git a/.github/workflows/publish-github.yml b/.github/workflows/publish-github.yml
@@ -10,8 +10,8 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4
         with:
-          distribution: 'zulu'
-          java-version: 22
+          distribution: 'temurin'
+          java-version: 24
           cache: 'maven'
       - name: Enforce project version ${{ github.event.release.tag_name }}
         run: mvn versions:set -B -DnewVersion=${{ github.event.release.tag_name }}
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/README.md b/README.md
@@ -9,5 +9,5 @@ This library uses the following JVM properties:
 
 ## Building Requirements
 
-* JDK 22
+* JDK 24
 * Maven 3.9.6
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.cryptomator</groupId>
 	<artifactId>integrations-linux</artifactId>
-	<version>1.5.3</version>
+	<version>1.6.0</version>
 
 	<name>integrations-linux</name>
 	<description>Provides optional Linux services used by Cryptomator</description>
@@ -36,28 +36,28 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<project.jdk.version>22</project.jdk.version>
+		<project.jdk.version>24</project.jdk.version>
 
 		<!-- runtime dependencies -->
 
-		<api.version>1.5.1</api.version>
+		<api.version>1.6.0</api.version>
 		<secret-service.version>2.0.1-alpha</secret-service.version>
 		<kdewallet.version>1.4.0</kdewallet.version>
 		<slf4j.version>2.0.17</slf4j.version>
 		<appindicator.version>1.4.2</appindicator.version>
 
 		<!-- test dependencies -->
-		<junit.version>5.12.0</junit.version>
+		<junit.version>5.12.2</junit.version>
 
 		<!-- build plugin dependencies -->
 		<mvn-compiler.version>3.14.0</mvn-compiler.version>
-		<mvn-surefire.version>3.5.2</mvn-surefire.version>
+		<mvn-surefire.version>3.5.3</mvn-surefire.version>
 		<mvn-enforcer.version>3.5.0</mvn-enforcer.version>
 		<mvn-source.version>3.3.1</mvn-source.version>
 		<mvn-javadoc.version>3.11.2</mvn-javadoc.version>
 		<mvn-gpg.version>3.2.7</mvn-gpg.version>
 		<mvn-deploy.version>3.1.4</mvn-deploy.version>
-		<dependency-check.version>12.1.0</dependency-check.version>
+		<dependency-check.version>12.1.1</dependency-check.version>
 		<central-publishing.version>0.7.0</central-publishing.version>
 	</properties>
 
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
@@ -5,7 +5,7 @@
 import org.cryptomator.integrations.tray.TrayMenuController;
 import org.cryptomator.linux.autostart.FreedesktopAutoStartService;
 import org.cryptomator.linux.keychain.KDEWalletKeychainAccess;
-import org.cryptomator.linux.keychain.SecretServiceKeychainAccess;
+import org.cryptomator.linux.keychain.GnomeKeyringKeychainAccess;
 import org.cryptomator.linux.quickaccess.DolphinPlaces;
 import org.cryptomator.linux.quickaccess.NautilusBookmarks;
 import org.cryptomator.linux.revealpath.DBusSendRevealPathService;
@@ -20,7 +20,7 @@
 	requires de.swiesend.secretservice;
 
 	provides AutoStartProvider with FreedesktopAutoStartService;
-	provides KeychainAccessProvider with SecretServiceKeychainAccess, KDEWalletKeychainAccess;
+	provides KeychainAccessProvider with GnomeKeyringKeychainAccess, KDEWalletKeychainAccess;
 	provides RevealPathService with DBusSendRevealPathService;
 	provides TrayMenuController with AppindicatorTrayMenuController;
 	provides QuickAccessService with NautilusBookmarks, DolphinPlaces;
diff --git a/src/main/java/org/cryptomator/linux/keychain/GnomeKeyringKeychainAccess.java b/src/main/java/org/cryptomator/linux/keychain/GnomeKeyringKeychainAccess.java
@@ -1,6 +1,7 @@
 package org.cryptomator.linux.keychain;
 
 import de.swiesend.secretservice.simple.SimpleCollection;
+import org.cryptomator.integrations.common.DisplayName;
 import org.cryptomator.integrations.common.OperatingSystem;
 import org.cryptomator.integrations.common.Priority;
 import org.cryptomator.integrations.keychain.KeychainAccessException;
@@ -14,21 +15,17 @@
 
 @Priority(900)
 @OperatingSystem(OperatingSystem.Value.LINUX)
-public class SecretServiceKeychainAccess implements KeychainAccessProvider {
+@DisplayName("GNOME Keyring")
+public class GnomeKeyringKeychainAccess implements KeychainAccessProvider {
 
-	private static final Logger LOG = LoggerFactory.getLogger(SecretServiceKeychainAccess.class);
+	private static final Logger LOG = LoggerFactory.getLogger(GnomeKeyringKeychainAccess.class);
 
 	private final String LABEL_FOR_SECRET_IN_KEYRING = "Cryptomator";
 
-	@Override
-	public String displayName() {
-		return "Gnome Keyring";
-	}
-
 	@Override
 	public boolean isSupported() {
 		try {
-			return SimpleCollection.isAvailable();
+			return SimpleCollection.isGnomeKeyringAvailable();
 		} catch (RuntimeException e) {
 			LOG.warn("Initializing secret service keychain access failed", e);
 			return false;
@@ -48,7 +45,7 @@ public boolean isLocked() {
 	}
 
 	@Override
-	public void storePassphrase(String key, String displayName, CharSequence passphrase, boolean ignored) throws KeychainAccessException {
+	public void storePassphrase(String key, String displayName, CharSequence passphrase) throws KeychainAccessException {
 		try (SimpleCollection keyring = new SimpleCollection()) {
 			List<String> list = keyring.getItems(createAttributes(key));
 			if (list == null || list.isEmpty()) {
diff --git a/src/main/java/org/cryptomator/linux/keychain/KDEWalletKeychainAccess.java b/src/main/java/org/cryptomator/linux/keychain/KDEWalletKeychainAccess.java
@@ -1,5 +1,6 @@
 package org.cryptomator.linux.keychain;
 
+import org.cryptomator.integrations.common.DisplayName;
 import org.cryptomator.integrations.common.OperatingSystem;
 import org.cryptomator.integrations.common.Priority;
 import org.cryptomator.integrations.keychain.KeychainAccessException;
@@ -20,6 +21,7 @@
 
 @Priority(900)
 @OperatingSystem(OperatingSystem.Value.LINUX)
+@DisplayName("KDE Wallet")
 public class KDEWalletKeychainAccess implements KeychainAccessProvider {
 
 	private static final Logger LOG = LoggerFactory.getLogger(KDEWalletKeychainAccess.class);
@@ -32,11 +34,6 @@ public KDEWalletKeychainAccess() {
 		this.wallet = ConnectedWallet.connect();
 	}
 
-	@Override
-	public String displayName() {
-		return "KDE Wallet";
-	}
-
 	@Override
 	public boolean isSupported() {
 		return wallet.map(ConnectedWallet::isSupported).orElse(false);
@@ -48,7 +45,7 @@ public boolean isLocked() {
 	}
 
 	@Override
-	public void storePassphrase(String key, String displayName, CharSequence passphrase, boolean ignored) throws KeychainAccessException {
+	public void storePassphrase(String key, String displayName, CharSequence passphrase) throws KeychainAccessException {
 		CheckUtil.checkState(wallet.isPresent(), "Keychain not supported.");
 		wallet.get().storePassphrase(key, passphrase);
 	}
diff --git a/src/main/resources/META-INF/services/org.cryptomator.integrations.keychain.KeychainAccessProvider b/src/main/resources/META-INF/services/org.cryptomator.integrations.keychain.KeychainAccessProvider
@@ -1,2 +1,2 @@
 org.cryptomator.linux.keychain.KDEWalletKeychainAccess
-org.cryptomator.linux.keychain.SecretServiceKeychainAccess
+org.cryptomator.linux.keychain.GnomeKeyringKeychainAccess
diff --git a/src/test/java/org/cryptomator/linux/keychain/GnomeKeyringKeychainAccessTest.java b/src/test/java/org/cryptomator/linux/keychain/GnomeKeyringKeychainAccessTest.java
@@ -0,0 +1,90 @@
+package org.cryptomator.linux.keychain;
+
+import org.cryptomator.integrations.keychain.KeychainAccessException;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Order;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.condition.EnabledIf;
+import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Unit tests for GNOME keyring access via DBUS.
+ */
+@EnabledIfEnvironmentVariable(named = "DISPLAY", matches = ".*")
+public class GnomeKeyringKeychainAccessTest {
+
+	private static boolean isInstalled;
+
+	@BeforeAll
+	public static void checkSystemAndSetup() throws IOException {
+		ProcessBuilder dbusSend = new ProcessBuilder("dbus-send", "--print-reply", "--dest=org.freedesktop.DBus", "/org/freedesktop/DBus", "org.freedesktop.DBus.ListNames");
+		ProcessBuilder grep = new ProcessBuilder("grep", "-q", "org.gnome.keyring");
+		try {
+			Process end = ProcessBuilder.startPipeline(List.of(dbusSend, grep)).get(1);
+			if (end.waitFor(1000, TimeUnit.MILLISECONDS)) {
+				isInstalled = end.exitValue() == 0;
+			} else {
+				isInstalled = false;
+			}
+		} catch (InterruptedException e) {
+			Thread.currentThread().interrupt();
+		}
+	}
+
+	@Test
+	public void testIsSupported() {
+		var gnomeKeyring = new GnomeKeyringKeychainAccess();
+		Assertions.assertEquals(isInstalled, gnomeKeyring.isSupported());
+	}
+
+	@Nested
+	@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
+	@EnabledIf("gnomeKeyringAvailableAndUnlocked")
+	class FunctionalTests {
+
+		static final String KEY_ID = "cryptomator-test-" + UUID.randomUUID();
+		final GnomeKeyringKeychainAccess gnomeKeyring = new GnomeKeyringKeychainAccess();
+
+		@Test
+		@Order(1)
+		public void testStore() throws KeychainAccessException {
+			gnomeKeyring.storePassphrase(KEY_ID, "cryptomator-test", "p0ssw0rd");
+		}
+
+		@Test
+		@Order(2)
+		public void testLoad() throws KeychainAccessException {
+			var passphrase = gnomeKeyring.loadPassphrase(KEY_ID);
+			Assertions.assertNotNull(passphrase);
+			Assertions.assertEquals("p0ssw0rd", String.copyValueOf(passphrase));
+		}
+
+		@Test
+		@Order(3)
+		public void testDelete() throws KeychainAccessException {
+			gnomeKeyring.deletePassphrase(KEY_ID);
+		}
+
+		@Test
+		@Order(4)
+		public void testLoadNotExisting() throws KeychainAccessException {
+			var result = gnomeKeyring.loadPassphrase(KEY_ID);
+			Assertions.assertNull(result);
+		}
+
+		public static boolean gnomeKeyringAvailableAndUnlocked() {
+			var secretServiceKeychain = new GnomeKeyringKeychainAccess();
+			return secretServiceKeychain.isSupported() && !secretServiceKeychain.isLocked();
+		}
+	}
+
+}
diff --git a/src/test/java/org/cryptomator/linux/keychain/KDEWalletKeychainAccessTest.java b/src/test/java/org/cryptomator/linux/keychain/KDEWalletKeychainAccessTest.java
@@ -3,7 +3,7 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.EnabledIf;
+import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
 import org.junit.jupiter.api.condition.EnabledOnOs;
 import org.junit.jupiter.api.condition.OS;
 
@@ -15,15 +15,15 @@
  * Unit tests for KWallet access via DBUS.
  */
 @EnabledOnOs(OS.LINUX)
-@EnabledIf("osEnvironmentSuitable")
+@EnabledIfEnvironmentVariable(named = "DISPLAY", matches = ".*")
 public class KDEWalletKeychainAccessTest {
 
 	private static boolean isInstalled;
 
 	@BeforeAll
 	public static void checkSystemAndSetup() throws IOException {
-		ProcessBuilder dbusSend = new ProcessBuilder("dbus-send","--print-reply","--dest=org.freedesktop.DBus", "/org/freedesktop/DBus", "org.freedesktop.DBus.ListNames");
-		ProcessBuilder grep = new ProcessBuilder("grep", "org.kde.kwallet");
+		ProcessBuilder dbusSend = new ProcessBuilder("dbus-send", "--print-reply", "--dest=org.freedesktop.DBus", "/org/freedesktop/DBus", "org.freedesktop.DBus.ListActivatableNames");
+		ProcessBuilder grep = new ProcessBuilder("grep", "-q", "org.kde.kwallet");
 		try {
 			Process end = ProcessBuilder.startPipeline(List.of(dbusSend, grep)).get(1);
 			if (end.waitFor(1000, TimeUnit.MILLISECONDS)) {
@@ -42,9 +42,4 @@ public void testIsSupported() {
 		KDEWalletKeychainAccess keychainAccess = new KDEWalletKeychainAccess();
 		Assertions.assertEquals(isInstalled, keychainAccess.isSupported());
 	}
-
-
-	private static boolean osEnvironmentSuitable() {
-		return System.getenv().containsKey("DISPLAY");
-	}
 }
diff --git a/src/test/java/org/cryptomator/linux/keychain/SecretServiceKeychainAccessTest.java b/src/test/java/org/cryptomator/linux/keychain/SecretServiceKeychainAccessTest.java
