Merge branch 'release/1.8.8'

Author: overheadhunter

pom.xml

@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.cryptomator</groupId>
 	<artifactId>cryptofs</artifactId>
-	<version>1.8.7</version>
+	<version>1.8.8</version>
 	<name>Cryptomator Crypto Filesystem</name>
 	<description>This library provides the Java filesystem provider used by Cryptomator.</description>
 	<url>https://github.com/cryptomator/cryptofs</url>

src/main/java/org/cryptomator/cryptofs/ReadonlyFlag.java

@@ -22,23 +22,15 @@ public ReadonlyFlag(CryptoFileSystemProperties properties, @PathToVault Path pat
 		if (properties.readonly()) {
 			LOG.info("Vault opened readonly.");
 			readonly = true;
-		} else if (targetFileStoreIsReadonly(pathToVault)) {
-			LOG.warn("Vault on readonly filesystem.");
+		} else if (!Files.isWritable(pathToVault)) {
+			LOG.warn("Vault directory is write-protected.");
 			readonly = true;
 		} else {
 			LOG.debug("Vault opened for read and write.");
 			readonly = false;
 		}
 	}
 
-	private boolean targetFileStoreIsReadonly(Path pathToVault) {
-		try {
-			return Files.getFileStore(pathToVault).isReadOnly();
-		} catch (IOException e) {
-			throw new UncheckedIOException(e);
-		}
-	}
-
 	public void assertWritable() throws ReadOnlyFileSystemException {
 		if (readonly) {
 			throw new ReadOnlyFileSystemException();

src/test/java/org/cryptomator/cryptofs/ReadonlyFlagTest.java

@@ -1,10 +1,18 @@
 package org.cryptomator.cryptofs;
 
+import org.hamcrest.CoreMatchers;
+import org.hamcrest.MatcherAssert;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
+import org.mockito.Mockito;
 
 import java.io.IOException;
+import java.nio.file.AccessDeniedException;
+import java.nio.file.AccessMode;
 import java.nio.file.FileStore;
 import java.nio.file.FileSystem;
 import java.nio.file.Path;
@@ -19,79 +27,62 @@ public class ReadonlyFlagTest {
 	private FileStore fileStore = mock(FileStore.class);
 	private FileSystemProvider provider = mock(FileSystemProvider.class);
 	private FileSystem fileSystem = mock(FileSystem.class);
-	private Path path = mock(Path.class);
+	private Path path = mock(Path.class, "test-path");
 
 	private CryptoFileSystemProperties properties = mock(CryptoFileSystemProperties.class);
 
-	private ReadonlyFlag inTest;
-
 	@BeforeEach
 	public void setup() throws IOException {
 		when(path.getFileSystem()).thenReturn(fileSystem);
 		when(fileSystem.provider()).thenReturn(provider);
 		when(provider.getFileStore(path)).thenReturn(fileStore);
 	}
 
-	@Test
-	public void testReadonlyFlagIsSetIfReadonlyIsSetOnProperties() throws IOException {
-		when(properties.readonly()).thenReturn(true);
-
-		inTest = new ReadonlyFlag(properties, path);
-
-		Assertions.assertTrue(inTest.isSet());
-	}
-
-	@Test
-	public void testReadonlyFlagIsSetIfReadonlyIsNotSetOnPropertiesAndFilestoreOfVaultIsReadonly() throws IOException {
-		when(properties.readonly()).thenReturn(false);
-		when(fileStore.isReadOnly()).thenReturn(true);
-
-		inTest = new ReadonlyFlag(properties, path);
-
-		Assertions.assertTrue(inTest.isSet());
-	}
-
-	@Test
-	public void testReadonlyFlagIsNotSetIfReadonlyIsNotSetOnPropertiesAndFilestoreOfVaultIsNotReadonly() throws IOException {
-		when(properties.readonly()).thenReturn(false);
-		when(fileStore.isReadOnly()).thenReturn(false);
-
-		inTest = new ReadonlyFlag(properties, path);
-
-		Assertions.assertFalse(inTest.isSet());
+	@DisplayName("isSet()")
+	@ParameterizedTest(name = "readonlyFlag: {0}, writeProtected: {1} -> mounted readonly {2}")
+	@CsvSource({
+			"false, false, false",
+			"true, false, true",
+			"false, true, true",
+			"true, true, true",
+	})
+	public void testIsSet(boolean readonlyFlag, boolean writeProtected, boolean expectedResult) throws IOException {
+		when(properties.readonly()).thenReturn(readonlyFlag);
+		if (writeProtected) {
+			Mockito.doThrow(new AccessDeniedException(path.toString())).when(provider).checkAccess(path, AccessMode.WRITE);
+		}
+		ReadonlyFlag inTest = new ReadonlyFlag(properties, path);
+
+		boolean result = inTest.isSet();
+
+		MatcherAssert.assertThat(result, CoreMatchers.is(expectedResult));
+		Assertions.assertEquals(expectedResult, result);
 	}
 
-	@Test
-	public void testAssertWritableThrowsIOExceptionIfReadonlyIsSetOnProperties() throws IOException {
-		when(properties.readonly()).thenReturn(true);
-
-		inTest = new ReadonlyFlag(properties, path);
-
-		Assertions.assertThrows(ReadOnlyFileSystemException.class, () -> {
-			inTest.assertWritable();
-		});
-	}
-
-	@Test
-	public void testAssertWritableThrowsIOExceptionIfReadonlyIsNotSetOnPropertiesAndFilestoreOfVaultIsReadonly() throws IOException {
-		when(properties.readonly()).thenReturn(false);
-		when(fileStore.isReadOnly()).thenReturn(true);
-
-		inTest = new ReadonlyFlag(properties, path);
-
-		Assertions.assertThrows(ReadOnlyFileSystemException.class, () -> {
-			inTest.assertWritable();
-		});
-	}
-
-	@Test
-	public void testAssertWritableDoesNotThrowIOExceptionIfReadonlyIsNotSetOnPropertiesAndFilestoreOfVaultIsNotReadonly() throws IOException {
-		when(properties.readonly()).thenReturn(false);
-		when(fileStore.isReadOnly()).thenReturn(false);
-
-		inTest = new ReadonlyFlag(properties, path);
-
-		inTest.assertWritable();
+	@DisplayName("assertWritable()")
+	@ParameterizedTest(name = "readonlyFlag: {0}, writeProtected: {1} -> mounted readonly {2}")
+	@CsvSource({
+			"false, false, false",
+			"true, false, true",
+			"false, true, true",
+			"true, true, true",
+	})
+	public void testAssertWritable(boolean readonlyFlag, boolean writeProtected, boolean expectedResult) throws IOException {
+		when(properties.readonly()).thenReturn(readonlyFlag);
+		if (writeProtected) {
+			Mockito.doThrow(new AccessDeniedException(path.toString())).when(provider).checkAccess(path, AccessMode.WRITE);
+		}
+		ReadonlyFlag inTest = new ReadonlyFlag(properties, path);
+
+		if (expectedResult) {
+			Assertions.assertThrows(ReadOnlyFileSystemException.class, () -> {
+				inTest.assertWritable();
+			});
+		} else {
+			Assertions.assertDoesNotThrow(() -> {
+				inTest.assertWritable();
+			});
+		}
 	}
 
 }