Merge branch 'release/1.2.0'

Author: infeo

.github/workflows/build.yml

@@ -7,11 +7,11 @@ jobs:
     runs-on: ubuntu-latest
     if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')"
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-java@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: 17
+          java-version: 19
           cache: 'maven'
       - name: Ensure to use tagged version
         if: startsWith(github.ref, 'refs/tags/')
@@ -21,16 +21,14 @@ jobs:
       - name: Build and Test
         id: buildAndTest
         run: mvn -B clean install -Pdependency-check
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           name: artifacts
           path: target/*.jar
       - name: Create Release
-        uses: actions/create-release@v1
+        uses: softprops/action-gh-release@v1
         if: startsWith(github.ref, 'refs/tags/')
-        env:
-          GITHUB_TOKEN: ${{ secrets.CRYPTOBOT_RELEASE_TOKEN }} # release as "cryptobot"
         with:
-          tag_name: ${{ github.ref }}
-          release_name: Release ${{ github.ref }}
-          prerelease: true
+          prerelease: true
+          token: ${{ secrets.CRYPTOBOT_RELEASE_TOKEN }}
+          generate_release_notes: true

.github/workflows/codeql-analysis.yml

@@ -15,19 +15,19 @@ jobs:
     runs-on: ubuntu-latest
     if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')"
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         fetch-depth: 2
-    - uses: actions/setup-java@v2
+    - uses: actions/setup-java@v3
       with:
         distribution: 'temurin'
-        java-version: 17
+        java-version: 19
         cache: 'maven'
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v2
       with:
         languages: java
     - name: Build
       run: mvn -B compile
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2

.github/workflows/publish-central.yml

@@ -10,13 +10,13 @@ jobs:
   publish:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           ref: "refs/tags/${{ github.event.inputs.tag }}"
-      - uses: actions/setup-java@v2
+      - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: 17
+          java-version: 19
           cache: 'maven'
           server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml
           server-username: MAVEN_USERNAME # env variable for username in deploy

.github/workflows/publish-github.yml

@@ -7,11 +7,11 @@ jobs:
     runs-on: ubuntu-latest
     if: startsWith(github.ref, 'refs/tags/') # only allow publishing tagged versions
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-java@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: 17
+          java-version: 19
           cache: 'maven'
           gpg-private-key: ${{ secrets.RELEASES_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
           gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase

pom.xml

@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.cryptomator</groupId>
 	<artifactId>integrations-linux</artifactId>
-	<version>1.1.0</version>
+	<version>1.2.0</version>
 
 	<name>integrations-linux</name>
 	<description>Provides optional Linux services used by Cryptomator</description>
@@ -36,12 +36,13 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<project.jdk.version>17</project.jdk.version>
+		<project.jdk.version>19</project.jdk.version>
 
 		<!-- runtime dependencies -->
-		<api.version>1.1.0</api.version>
-		<secret-service.version>1.7.0</secret-service.version>
-		<kdewallet.version>1.2.6</kdewallet.version>
+
+		<api.version>1.2.0-beta4</api.version>
+		<secret-service.version>1.8.1-jdk17</secret-service.version>
+		<kdewallet.version>1.2.8</kdewallet.version>
 		<guava.version>31.1-jre</guava.version>
 		<slf4j.version>1.7.36</slf4j.version>
 
@@ -94,7 +95,7 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>3.9.0</version>
 				<configuration>
-					<release>17</release>
+					<release>${project.jdk.version}</release>
 				</configuration>
 			</plugin>
 			<plugin>

src/main/java/org/cryptomator/linux/keychain/KDEWalletKeychainAccess.java

@@ -6,8 +6,10 @@
 import org.cryptomator.integrations.keychain.KeychainAccessException;
 import org.cryptomator.integrations.keychain.KeychainAccessProvider;
 import org.freedesktop.dbus.connections.impl.DBusConnection;
+import org.freedesktop.dbus.connections.impl.DBusConnectionBuilder;
 import org.freedesktop.dbus.exceptions.DBusConnectionException;
 import org.freedesktop.dbus.exceptions.DBusException;
+import org.freedesktop.dbus.exceptions.DBusExecutionException;
 import org.kde.KWallet;
 import org.kde.Static;
 import org.purejava.KDEWallet;
@@ -89,11 +91,12 @@ static Optional<ConnectedWallet> connect() {
 
 		private static DBusConnection getNewConnection() throws DBusException {
 			try {
-				return DBusConnection.newConnection(DBusConnection.DBusBusType.SESSION);
-			} catch (DBusConnectionException ce) {
-				LOG.warn("SESSION DBus not found, falling back to SYSTEM DBus");
+				return DBusConnectionBuilder.forSessionBus().withShared(false).build();
+			} catch (DBusConnectionException | DBusExecutionException de) {
+				LOG.warn("Connecting to SESSION bus failed.", de);
+				LOG.warn("Falling back to SYSTEM DBus");
 				try {
-					return DBusConnection.newConnection(DBusConnection.DBusBusType.SYSTEM);
+					return DBusConnectionBuilder.forSystemBus().build();
 				} catch (DBusException e) {
 					throw e;
 				}

src/main/java/org/cryptomator/linux/keychain/SecretServiceKeychainAccess.java

@@ -4,6 +4,8 @@
 import org.cryptomator.integrations.common.Priority;
 import org.cryptomator.integrations.keychain.KeychainAccessException;
 import org.cryptomator.integrations.keychain.KeychainAccessProvider;
+import org.freedesktop.dbus.exceptions.DBusConnectionException;
+import org.freedesktop.dbus.exceptions.DBusExecutionException;
 import org.freedesktop.secret.simple.SimpleCollection;
 
 import java.io.IOException;
@@ -23,7 +25,16 @@ public String displayName() {
 
 	@Override
 	public boolean isSupported() {
-		return SimpleCollection.isAvailable();
+		try {
+			return SimpleCollection.isAvailable();
+		} catch (ExceptionInInitializerError e) {
+			//TODO: remove try-catch once secret-service lib is fixed
+			if(e.getException() instanceof DBusExecutionException) {
+				return false;
+			} else {
+				throw e;
+			}
+		}
 	}
 
 	@Override

src/main/java/org/cryptomator/linux/revealpath/DBusSendRevealPathService.java

@@ -0,0 +1,112 @@
+package org.cryptomator.linux.revealpath;
+
+import com.google.common.base.Preconditions;
+import org.cryptomator.integrations.revealpath.RevealFailedException;
+import org.cryptomator.integrations.revealpath.RevealPathService;
+
+import java.io.IOException;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.LinkOption;
+import java.nio.file.Path;
+import java.nio.file.attribute.BasicFileAttributes;
+import java.util.Arrays;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+/**
+ * RevealPathService provider using the <a href="https://freedesktop.org/wiki/Specifications/file-manager-interface/">DBus freedesktop FileManager1 interface</a> and dbus-send command.
+ */
+public class DBusSendRevealPathService implements RevealPathService {
+
+	private static final String FILEMANAGER1_XML_ELEMENT = "<interface name=\"org.freedesktop.FileManager1\">";
+	private static final String FOR_FOLDERS = "org.freedesktop.FileManager1.ShowFolders";
+	private static final String FOR_FILES = "org.freedesktop.FileManager1.ShowItems";
+	private static final int TIMEOUT_THRESHOLD = 5000;
+
+	@Override
+	public void reveal(Path path) throws RevealFailedException {
+		try {
+			var attrs = Files.readAttributes(path, BasicFileAttributes.class, LinkOption.NOFOLLOW_LINKS);
+			var uriPath = Arrays.stream(path.toUri().getPath().split("/")).map(s -> URLEncoder.encode(s, StandardCharsets.UTF_8).replace("+", "%20")).collect(Collectors.joining("/"));
+			ProcessBuilder pb = new ProcessBuilder().command("dbus-send",
+					"--print-reply",
+					"--reply-timeout=" + TIMEOUT_THRESHOLD,
+					"--dest=org.freedesktop.FileManager1",
+					"--type=method_call",
+					"/org/freedesktop/FileManager1",
+					attrs.isDirectory() ? FOR_FOLDERS : FOR_FILES,
+					String.format("array:string:file://%s", uriPath),
+					"string:\"\""
+			);
+			var process = pb.start();
+			try (var reader = process.errorReader()) {
+				if (process.waitFor(TIMEOUT_THRESHOLD, TimeUnit.MILLISECONDS)) {
+					int exitValue = process.exitValue();
+					if (process.exitValue() != 0) {
+						String error = reader.lines().collect(Collectors.joining());
+						throw new RevealFailedException("dbus-send exited with code " + exitValue + " and error message: " + error);
+					}
+				}
+			}
+		} catch (IOException e) {
+			throw new RevealFailedException(e);
+		} catch (InterruptedException e) {
+			Thread.currentThread().interrupt();
+			throw new RevealFailedException(e);
+		}
+	}
+
+	@Override
+	public boolean isSupported() {
+		CountDownLatch waitBarrier = new CountDownLatch(2);
+		ProcessBuilder dbusSendExistsBuilder = new ProcessBuilder().command("test", " `command -v dbus-send`");
+		ProcessBuilder fileManager1ExistsBuilder = createFileManager1Check();
+
+		try {
+			var dbusSendExists = dbusSendExistsBuilder.start();
+			dbusSendExists.onExit().thenRun(waitBarrier::countDown);
+			var fileManager1Exists = fileManager1ExistsBuilder.start();
+			fileManager1Exists.onExit().thenRun(waitBarrier::countDown);
+
+			if (waitBarrier.await(TIMEOUT_THRESHOLD, TimeUnit.MILLISECONDS)) {
+				if (dbusSendExists.exitValue() == 0 && fileManager1Exists.exitValue() == 0) {
+					return parseOutputForFileManagerInterface(fileManager1Exists);
+				}
+			}
+		} catch (IOException | InterruptedException e) {
+			//NO-OP
+		}
+		return false;
+	}
+
+	/**
+	 * Parses process stdout to see if the answer contains "{@value FILEMANAGER1_XML_ELEMENT}".
+	 * DBus introspection output is defined in the <a href="https://dbus.freedesktop.org/doc/dbus-specification.html#introspection-format">dbus spec</a>.
+	 *
+	 * @param fileManager1Process The already exited process for checking the FileManager1 interface
+	 * @return {@code true} if the interface is found in the introspection output, otherwise false
+	 * @throws IOException if the Inputer reader on the process output cannot be created
+	 */
+	private boolean parseOutputForFileManagerInterface(Process fileManager1Process) throws IOException {
+		Preconditions.checkState(!fileManager1Process.isAlive());
+		try (var reader = fileManager1Process.inputReader(StandardCharsets.UTF_8)) {
+			return reader.lines().map(String::trim).anyMatch(FILEMANAGER1_XML_ELEMENT::equals);
+		}
+	}
+
+	private static ProcessBuilder createFileManager1Check() {
+		return new ProcessBuilder().command(
+				"dbus-send",
+				"--session",
+				"--print-reply",
+				"--reply-timeout=" + TIMEOUT_THRESHOLD,
+				"--dest=org.freedesktop.FileManager1",
+				"--type=method_call",
+				"/org/freedesktop/FileManager1",
+				"org.freedesktop.DBus.Introspectable.Introspect"
+		);
+	}
+}

src/main/resources/META-INF/services/org.cryptomator.integrations.revealpath.RevealPathService

@@ -0,0 +1 @@
+org.cryptomator.linux.revealpath.DBusSendRevealPathService

src/test/java/org/cryptomator/linux/revealpath/DBusSendRevealPathServiceTest.java

@@ -0,0 +1,41 @@
+package org.cryptomator.linux.revealpath;
+
+import org.cryptomator.integrations.revealpath.RevealFailedException;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledOnOs;
+import org.junit.jupiter.api.condition.OS;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.nio.file.Path;
+
+@EnabledOnOs(OS.LINUX)
+@Disabled
+public class DBusSendRevealPathServiceTest {
+
+	@TempDir Path tmpDir;
+	DBusSendRevealPathService inTest = new DBusSendRevealPathService();
+
+	@Test
+	public void testIsSupported() {
+		Assertions.assertDoesNotThrow(() -> inTest.isSupported());
+	}
+
+	@Test
+	public void testRevealSuccess() {
+		DBusSendRevealPathService revealPathService = new DBusSendRevealPathService();
+		Assumptions.assumeTrue(revealPathService.isSupported());
+
+		Assertions.assertDoesNotThrow(() -> revealPathService.reveal(tmpDir));
+	}
+
+	@Test
+	public void testRevealFail() {
+		DBusSendRevealPathService revealPathService = new DBusSendRevealPathService();
+		Assumptions.assumeTrue(revealPathService.isSupported());
+
+		Assertions.assertThrows(RevealFailedException.class, () -> revealPathService.reveal(tmpDir.resolve("foobar")));
+	}
+}