Merge branch 'release/2.6.1'

cryptomator · Jan 5, 2023 · ec170e7 · ec170e7
2 parents 1fe8036 + 5d3f986
commit ec170e7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.cryptomator</groupId>
 	<artifactId>cryptofs</artifactId>
-	<version>2.6.0</version>
+	<version>2.6.1</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>

diff --git a/src/main/java/org/cryptomator/cryptofs/CryptoFileSystemImpl.java b/src/main/java/org/cryptomator/cryptofs/CryptoFileSystemImpl.java
@@ -140,10 +140,11 @@ public Path getPathToVault() {
 	public Path getCiphertextPath(Path cleartextPath) throws IOException {
 		var p = CryptoPath.castAndAssertAbsolute(cleartextPath);
 		var nodeType = cryptoPathMapper.getCiphertextFileType(p);
-		var cipherFile = cryptoPathMapper.getCiphertextFilePath(p);
 		if( nodeType == CiphertextFileType.DIRECTORY) {
 			return cryptoPathMapper.getCiphertextDir(p).path;
-		} else if( nodeType == CiphertextFileType.SYMLINK) {
+		}
+		var cipherFile = cryptoPathMapper.getCiphertextFilePath(p);
+		if( nodeType == CiphertextFileType.SYMLINK) {
 			return cipherFile.getSymlinkFilePath();
 		} else {
 			return cipherFile.getFilePath();

diff --git a/src/test/java/org/cryptomator/cryptofs/CryptoFileSystemImplTest.java b/src/test/java/org/cryptomator/cryptofs/CryptoFileSystemImplTest.java
@@ -74,6 +74,7 @@
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
@@ -204,6 +205,7 @@ public void testCleartextDirectory() throws IOException {
 
 				Path result = inTest.getCiphertextPath(cleartext);
 				Assertions.assertEquals(ciphertext, result);
+				Mockito.verify(cryptoPathMapper,never()).getCiphertextFilePath(any());
 			}
 		}