Merge branch 'release/0.1.1'

Author: infeo

pom.xml

@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.cryptomator</groupId>
 	<artifactId>integrations-linux</artifactId>
-	<version>0.1.0</version>
+	<version>0.1.1</version>
 
 	<name>integrations-linux</name>
 	<description>Provides optional Linux services used by Cryptomator</description>
@@ -43,6 +43,7 @@
 		<kdewallet.version>1.1.1</kdewallet.version>
 		<guava.version>30.0-jre</guava.version>
 		<slf4j.version>1.7.30</slf4j.version>
+		<junit.version>5.7.0</junit.version>
 	</properties>
 
 	<repositories>
@@ -86,6 +87,12 @@
 			<artifactId>kdewallet</artifactId>
 			<version>${kdewallet.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter</artifactId>
+			<version>${junit.version}</version>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 
 	<build>

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

@@ -24,7 +24,17 @@ public class KDEWalletKeychainAccess implements KeychainAccessProvider {
 	public KDEWalletKeychainAccess() {
 		ConnectedWallet wallet = null;
 		try {
-			DBusConnection conn = DBusConnection.getConnection(DBusConnection.DBusBusType.SESSION);
+			DBusConnection conn = null;
+			try {
+				conn = DBusConnection.getConnection(DBusConnection.DBusBusType.SESSION);
+			} catch (RuntimeException e) {
+				if (e.getMessage() == "Cannot Resolve Session Bus Address") {
+					LOG.warn("SESSION DBus not found.");
+				}
+			}
+			if (conn == null) {
+				conn = DBusConnection.getConnection(DBusConnection.DBusBusType.SYSTEM);
+			}
 			wallet = new ConnectedWallet(conn);
 		} catch (DBusException e) {
 			LOG.warn("Connecting to D-Bus failed.", e);

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

@@ -18,7 +18,7 @@ public boolean isSupported() {
 		try (@SuppressWarnings("unused") SimpleCollection keyring = new SimpleCollection()) {
 			// seems like we're able to access the keyring.
 			return true;
-		} catch (IOException | RuntimeException e) {
+		} catch (IOException | ExceptionInInitializerError | RuntimeException e) {
 			return false;
 		}
 	}

src/test/java/org/cryptomator/linux/keychain/KDEWalletKeychainAccessTest.java

@@ -0,0 +1,43 @@
+package org.cryptomator.linux.keychain;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledOnOs;
+import org.junit.jupiter.api.condition.OS;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Unit tests for KWallet access via DBUS.
+ */
+@EnabledOnOs(OS.LINUX)
+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");
+		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() {
+		KDEWalletKeychainAccess keychainAccess = new KDEWalletKeychainAccess();
+		Assertions.assertEquals(isInstalled, keychainAccess.isSupported());
+	}
+}

src/test/java/org/cryptomator/linux/keychain/SecretServiceKeychainAccessTest.java

@@ -0,0 +1,45 @@
+package org.cryptomator.linux.keychain;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledOnOs;
+import org.junit.jupiter.api.condition.OS;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Unit tests for GNOME keyring access via DBUS.
+ */
+@EnabledOnOs(OS.LINUX)
+public class SecretServiceKeychainAccessTest {
+
+	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.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(){
+		SecretServiceKeychainAccess secretService = new SecretServiceKeychainAccess();
+		Assertions.assertEquals(isInstalled, secretService.isSupported());
+	}
+
+
+}