Merge branch 'release/1.1.2'

Author: infeo

README.md

@@ -6,6 +6,7 @@ Windows-specific implementations of [integrations-api](https://github.com/crypto
 
 This project uses the following JVM properties:
 * `cryptomator.integrationsWin.autoStartShellLinkName` - Name of the shell link, which is placed in the Windows startup folder to start application on user login
+* `cryptomator.integrationsWin.keychainPaths` - Colon separated list of paths, which are checked for encrypted data
 
 ## Building
 

pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.cryptomator</groupId>
     <artifactId>integrations-win</artifactId>
-    <version>1.1.1</version>
+    <version>1.1.2</version>
 
     <name>Cryptomator Integrations for Windows</name>
     <description>Provides optional Windows services used by Cryptomator</description>

src/main/java/org/cryptomator/windows/keychain/WindowsProtectedKeychainAccess.java

@@ -37,10 +37,15 @@
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 
+/**
+ * Windows implementation for the {@link KeychainAccessProvider} based on the <a href="https://en.wikipedia.org/wiki/Data_Protection_API">data protection API</a>.
+ * The storage locations to check for encrypted data can be set with the JVM property {@value KEYCHAIN_PATHS_PROPERTY} as a colon({@value PATH_LIST_SEP}) separated list of paths.
+ */
 @Priority(1000)
 @OperatingSystem(OperatingSystem.Value.WINDOWS)
 public class WindowsProtectedKeychainAccess implements KeychainAccessProvider {
 
+	private static final String KEYCHAIN_PATHS_PROPERTY = "cryptomator.integrationsWin.keychainPaths";
 	private static final Logger LOG = LoggerFactory.getLogger(WindowsProtectedKeychainAccess.class);
 	private static final String PATH_LIST_SEP = ":";
 	private static final Path USER_HOME_REL = Path.of("~");
@@ -67,16 +72,12 @@ public WindowsProtectedKeychainAccess() {
 	}
 
 	private static List<Path> readKeychainPathsFromEnv() {
-		String rawPaths = System.getProperty("cryptomator.keychainPath");
-		if (rawPaths == null) {
-			return List.of();
-		} else {
-			return Arrays.stream(rawPaths.split(PATH_LIST_SEP))
-					.filter(Predicate.not(String::isEmpty))
-					.map(Path::of)
-					.map(WindowsProtectedKeychainAccess::resolveHomeDir)
-					.collect(Collectors.toList());
-		}
+		return Optional.ofNullable(System.getProperty(KEYCHAIN_PATHS_PROPERTY))
+				.stream().flatMap(rawPaths -> Arrays.stream(rawPaths.split(PATH_LIST_SEP)))
+				.filter(Predicate.not(String::isEmpty))
+				.map(Path::of)
+				.map(WindowsProtectedKeychainAccess::resolveHomeDir)
+				.collect(Collectors.toList());
 	}
 
 	private static Path resolveHomeDir(Path path) {
@@ -176,13 +177,14 @@ private void loadKeychainEntriesIfNeeded() throws KeychainAccessException {
 		}
 	}
 
-	private Optional<Map<String, KeychainEntry>> loadKeychainEntries(Path keychainPath) throws KeychainAccessException {
+	//visible for testing
+	Optional<Map<String, KeychainEntry>> loadKeychainEntries(Path keychainPath) throws KeychainAccessException {
 		LOG.debug("Attempting to load keychain from {}", keychainPath);
 		Type type = new TypeToken<Map<String, KeychainEntry>>() {
 		}.getType();
 		try (InputStream in = Files.newInputStream(keychainPath, StandardOpenOption.READ); //
 			 Reader reader = new InputStreamReader(in, UTF_8)) {
-			return Optional.of(GSON.fromJson(reader, type));
+			return Optional.ofNullable(GSON.fromJson(reader, type));
 		} catch (NoSuchFileException | JsonParseException e) {
 			return Optional.empty();
 		} catch (IOException e) {

src/main/resources/WinIntegrationsBundle_be.properties

@@ -0,0 +1 @@
+org.cryptomator.windows.keychain.displayName=Bảo vệ Dữ liệu Windows

src/main/resources/WinIntegrationsBundle_si.properties

@@ -0,0 +1 @@
+org.cryptomator.windows.keychain.displayName=Windows 數據保護

src/main/resources/WinIntegrationsBundle_vi.properties

@@ -1,31 +1,64 @@
 package org.cryptomator.windows.keychain;
 
+import org.cryptomator.integrations.keychain.KeychainAccessException;
 import org.cryptomator.integrations.keychain.KeychainAccessProvider;
 import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
+import java.io.IOException;
+import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.Objects;
 
 public class KeychainAccessProviderTest {
 
 	@BeforeAll
 	public static void setup(@TempDir Path tmpDir) {
 		Path keychainPath = tmpDir.resolve("keychain.tmp");
-		System.setProperty("cryptomator.keychainPath", keychainPath.toString());
+		System.setProperty("cryptomator.integrationsWin.keychainPaths", keychainPath.toString());
 	}
 
 	@Test
 	@DisplayName("WindowsProtectedKeychainAccess can be loaded")
 	public void testLoadWindowsProtectedKeychainAccess() {
-		Assumptions.assumeFalse(System.getProperty("cryptomator.keychainPath", "").isBlank());
-		
 		var windowsKeychainAccessProvider = KeychainAccessProvider.get().findAny();
+
 		Assertions.assertTrue(windowsKeychainAccessProvider.isPresent());
 		Assertions.assertInstanceOf(WindowsProtectedKeychainAccess.class, windowsKeychainAccessProvider.get());
 	}
 
+	@Nested
+	public class LoadKeyChainEntries {
+
+		Path keychainPath;
+		WindowsProtectedKeychainAccess keychainAccess;
+
+		@BeforeEach
+		public void init(@TempDir Path tmpDir) {
+			keychainPath = tmpDir.resolve("keychain.tmp");
+			keychainAccess = (WindowsProtectedKeychainAccess) KeychainAccessProvider.get().findAny().get();
+		}
+
+		@Test
+		public void testNonExistingFileReturnsEmpty() throws KeychainAccessException, IOException {
+			var result = keychainAccess.loadKeychainEntries(keychainPath);
+
+			Assertions.assertTrue(result.isEmpty());
+		}
+
+		@Test
+		public void testEmptyFileReturnsEmpty() throws KeychainAccessException, IOException {
+			Files.write(keychainPath, new byte[] {});
+
+			var result = keychainAccess.loadKeychainEntries(keychainPath);
+
+			Assertions.assertTrue(result.isEmpty());
+		}
+	}
+
 }