From b6aa2c0e928b114be0e8585d7b35b9fc72a07fe8 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Wed, 9 Aug 2023 21:18:39 +0200
Subject: [PATCH 01/23] replace deprecated create-release action

---
 .github/workflows/build.yml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8d9f79be..bd7ca9b6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -40,12 +40,10 @@ jobs:
         with:
           name: artifacts
           path: target/*.jar
-      - name: Create Release
-        uses: actions/create-release@v1 #NOTE: action is archived and unmaintained
+      - name: Create release
         if: startsWith(github.ref, 'refs/tags/')
-        env:
-          GITHUB_TOKEN: ${{ secrets.CRYPTOBOT_RELEASE_TOKEN }} # release as "cryptobot"
+        uses: softprops/action-gh-release@v1
         with:
-          tag_name: ${{ github.ref }}
-          release_name: Release ${{ github.ref }}
+          token: ${{ secrets.CRYPTOBOT_RELEASE_TOKEN }}
+          generate_release_notes: true
           prerelease: true
\ No newline at end of file

From 4444bd6180128df53aa9b26806bebfd104865526 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Mon, 20 Nov 2023 14:26:40 +0100
Subject: [PATCH 02/23] [ci skip] Update IDE files

---
 .idea/misc.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 58ff93ce..67e1e611 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="MavenProjectsManager">
     <option name="originalFiles">
       <list>

From 0e46ad58da7e498a830cd64772eed0572a75b324 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Mon, 20 Nov 2023 15:46:09 +0100
Subject: [PATCH 03/23] add reproducer test

---
 .../cryptofs/CryptoPathMapperTest.java        | 42 ++++++++++++++++++-
 1 file changed, 41 insertions(+), 1 deletion(-)

diff --git a/src/test/java/org/cryptomator/cryptofs/CryptoPathMapperTest.java b/src/test/java/org/cryptomator/cryptofs/CryptoPathMapperTest.java
index 76ac28f1..ee9ed2e8 100644
--- a/src/test/java/org/cryptomator/cryptofs/CryptoPathMapperTest.java
+++ b/src/test/java/org/cryptomator/cryptofs/CryptoPathMapperTest.java
@@ -14,6 +14,7 @@
 import org.cryptomator.cryptolib.api.FileNameCryptor;
 import org.junit.jupiter.api.Assertions;
 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.mockito.ArgumentMatchers;
@@ -26,6 +27,8 @@
 import java.nio.file.Path;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.nio.file.spi.FileSystemProvider;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 
 public class CryptoPathMapperTest {
 
@@ -133,6 +136,44 @@ public void testPathEncryptionForFooBar() throws IOException {
 		Assertions.assertEquals(d0002, path);
 	}
 
+	@DisplayName("Decrypts a deeply nested filepath")
+	@Test
+	public void testPathEncryptionDEEP() throws IOException {
+		Path d00 = Mockito.mock(Path.class, "d/00/");
+		Mockito.when(dataRoot.resolve("00")).thenReturn(d00);
+		Mockito.when(fileNameCryptor.hashDirectoryId("")).thenReturn("0000");
+
+		int maxNestingDepth = 9;
+
+		for (int depth=0; depth < maxNestingDepth; depth++) {
+			var dirId = "%02d".formatted(depth);
+			var nextDirId = "%02d".formatted(depth+1);
+			String pathPrefix = "d/00/"+dirId;
+			Path contentDir = Mockito.mock(Path.class, pathPrefix);
+			Path dirLinkDir = Mockito.mock(Path.class, pathPrefix+"/cipherDir"+dirId+".c9r");
+			Path dirLinkFile = Mockito.mock(Path.class, pathPrefix + "/cipherDir"+dirId+".c9r/dir.c9r");
+			Mockito.when(d00.resolve(dirId)).thenReturn(contentDir);
+			Mockito.when(contentDir.resolve("cipherDir"+dirId+".c9r")).thenReturn(dirLinkDir);
+			Mockito.when(dirLinkDir.resolve("dir.c9r")).thenReturn(dirLinkFile);
+			Mockito.when(fileNameCryptor.encryptFilename(Mockito.any(), Mockito.eq(dirId), Mockito.any())).thenReturn("cipherDir"+dirId);
+			Mockito.when(dirIdProvider.load(dirLinkFile)).thenReturn(nextDirId);
+			Mockito.when(fileNameCryptor.hashDirectoryId(nextDirId)).thenReturn("%04d".formatted(depth+1));
+		}
+
+		var finalDirId = "%02d".formatted(maxNestingDepth);
+		Path finalContentDir = Mockito.mock(Path.class, "d/00/"+finalDirId);
+		Path finalEncryptedFile = Mockito.mock(Path.class, "d/00/"+finalDirId+"/file.c9r");
+		Mockito.when(d00.resolve(finalDirId)).thenReturn(finalContentDir);
+		Mockito.when(finalContentDir.resolve("file.c9r")).thenReturn(finalEncryptedFile);
+		Mockito.when(fileNameCryptor.encryptFilename(Mockito.any(), Mockito.eq("cleartextFile"), Mockito.any())).thenReturn("file");
+
+		var testPath ="/"+ IntStream.range(0,maxNestingDepth).mapToObj("%02d"::formatted).collect(Collectors.joining("/"))+"/cleartextFile";
+
+		CryptoPathMapper mapper = new CryptoPathMapper(pathToVault, cryptor, dirIdProvider, longFileNameProvider, vaultConfig);
+		Path path = mapper.getCiphertextFilePath(fileSystem.getPath(testPath)).getRawPath();
+		Assertions.assertEquals(finalEncryptedFile, path);
+	}
+
 	@Test
 	public void testPathEncryptionForFooBarBaz() throws IOException {
 		Path d00 = Mockito.mock(Path.class, "d/00/");
@@ -169,7 +210,6 @@ public void testPathEncryptionForFooBarBaz() throws IOException {
 		Path path = mapper.getCiphertextFilePath(fileSystem.getPath("/foo/bar/baz")).getRawPath();
 		Assertions.assertEquals(d0002zab, path);
 	}
-
 	@Nested
 	public class GetCiphertextFileType {
 

From 1dead22034a76360e9a7c7a9173c822de7ec7fe8 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Mon, 20 Nov 2023 16:27:20 +0100
Subject: [PATCH 04/23] ensure really deep nesting

---
 .../java/org/cryptomator/cryptofs/CryptoPathMapperTest.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/org/cryptomator/cryptofs/CryptoPathMapperTest.java b/src/test/java/org/cryptomator/cryptofs/CryptoPathMapperTest.java
index ee9ed2e8..6a4f09a8 100644
--- a/src/test/java/org/cryptomator/cryptofs/CryptoPathMapperTest.java
+++ b/src/test/java/org/cryptomator/cryptofs/CryptoPathMapperTest.java
@@ -143,7 +143,7 @@ public void testPathEncryptionDEEP() throws IOException {
 		Mockito.when(dataRoot.resolve("00")).thenReturn(d00);
 		Mockito.when(fileNameCryptor.hashDirectoryId("")).thenReturn("0000");
 
-		int maxNestingDepth = 9;
+		int maxNestingDepth = 97;
 
 		for (int depth=0; depth < maxNestingDepth; depth++) {
 			var dirId = "%02d".formatted(depth);

From 85606755983fda4220b6ec4b684879c9ccb8996e Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Mon, 20 Nov 2023 16:31:40 +0100
Subject: [PATCH 05/23] fixes #180

---
 .../cryptofs/CryptoPathMapper.java            | 36 ++++++++++---------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/src/main/java/org/cryptomator/cryptofs/CryptoPathMapper.java b/src/main/java/org/cryptomator/cryptofs/CryptoPathMapper.java
index 8e3b8120..9f9dd971 100644
--- a/src/main/java/org/cryptomator/cryptofs/CryptoPathMapper.java
+++ b/src/main/java/org/cryptomator/cryptofs/CryptoPathMapper.java
@@ -8,7 +8,7 @@
  *******************************************************************************/
 package org.cryptomator.cryptofs;
 
-import com.github.benmanes.caffeine.cache.Cache;
+import com.github.benmanes.caffeine.cache.AsyncCache;
 import com.github.benmanes.caffeine.cache.Caffeine;
 import com.github.benmanes.caffeine.cache.LoadingCache;
 import com.google.common.io.BaseEncoding;
@@ -31,6 +31,7 @@
 import java.time.Duration;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
 
 import static org.cryptomator.cryptofs.common.Constants.DATA_DIR_NAME;
 
@@ -48,7 +49,7 @@ public class CryptoPathMapper {
 	private final LongFileNameProvider longFileNameProvider;
 	private final VaultConfig vaultConfig;
 	private final LoadingCache<DirIdAndName, String> ciphertextNames;
-	private final Cache<CryptoPath, CiphertextDirectory> ciphertextDirectories;
+	private final AsyncCache<CryptoPath, CiphertextDirectory> ciphertextDirectories;
 
 	private final CiphertextDirectory rootDirectory;
 
@@ -60,7 +61,7 @@ public class CryptoPathMapper {
 		this.longFileNameProvider = longFileNameProvider;
 		this.vaultConfig = vaultConfig;
 		this.ciphertextNames = Caffeine.newBuilder().maximumSize(MAX_CACHED_CIPHERTEXT_NAMES).build(this::getCiphertextFileName);
-		this.ciphertextDirectories = Caffeine.newBuilder().maximumSize(MAX_CACHED_DIR_PATHS).expireAfterWrite(MAX_CACHE_AGE).build();
+		this.ciphertextDirectories = Caffeine.newBuilder().maximumSize(MAX_CACHED_DIR_PATHS).expireAfterWrite(MAX_CACHE_AGE).buildAsync();
 		this.rootDirectory = resolveDirectory(Constants.ROOT_DIR_ID);
 	}
 
@@ -140,14 +141,15 @@ private String getCiphertextFileName(DirIdAndName dirIdAndName) {
 	}
 
 	public void invalidatePathMapping(CryptoPath cleartextPath) {
-		ciphertextDirectories.invalidate(cleartextPath);
+		ciphertextDirectories.synchronous().invalidate(cleartextPath);
 	}
-	
+
 	public void movePathMapping(CryptoPath cleartextSrc, CryptoPath cleartextDst) {
-		CiphertextDirectory cachedValue = ciphertextDirectories.getIfPresent(cleartextSrc);
+		var syncedCache = ciphertextDirectories.synchronous();
+		CiphertextDirectory cachedValue = syncedCache.getIfPresent(cleartextSrc);
 		if (cachedValue != null) {
-			ciphertextDirectories.put(cleartextDst, cachedValue);
-			ciphertextDirectories.invalidate(cleartextSrc);
+			syncedCache.put(cleartextDst, cachedValue);
+			syncedCache.invalidate(cleartextSrc);
 		}
 	}
 
@@ -158,14 +160,16 @@ public CiphertextDirectory getCiphertextDir(CryptoPath cleartextPath) throws IOE
 			return rootDirectory;
 		} else {
 			try {
-				return ciphertextDirectories.get(cleartextPath, p -> {
-					try {
-						Path dirFile = getCiphertextFilePath(p).getDirFilePath();
-						return resolveDirectory(dirFile);
-					} catch (IOException e) {
-						throw new UncheckedIOException(e);
-					}
-				});
+				var lazyEntry = new CompletableFuture<CiphertextDirectory>();
+				var priorEntry = ciphertextDirectories.asMap().putIfAbsent(cleartextPath, lazyEntry);
+				if (priorEntry != null) {
+					return priorEntry.join();
+				} else {
+					Path dirFile = getCiphertextFilePath(cleartextPath).getDirFilePath();
+					CiphertextDirectory cipherDir = resolveDirectory(dirFile);
+					lazyEntry.complete(cipherDir);
+					return cipherDir;
+				}
 			} catch (UncheckedIOException e) {
 				throw new IOException(e);
 			}

From 1b815373ce749a116d592b34f5d418942c01bf60 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Thu, 23 Nov 2023 11:31:23 +0100
Subject: [PATCH 06/23] * use asMap() instead of synchronous() to remove
 mappings from cache * on mapping move, let temporary cache do not have any
 mapping

---
 .../java/org/cryptomator/cryptofs/CryptoPathMapper.java   | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/cryptomator/cryptofs/CryptoPathMapper.java b/src/main/java/org/cryptomator/cryptofs/CryptoPathMapper.java
index 9f9dd971..fa8e57a5 100644
--- a/src/main/java/org/cryptomator/cryptofs/CryptoPathMapper.java
+++ b/src/main/java/org/cryptomator/cryptofs/CryptoPathMapper.java
@@ -141,15 +141,13 @@ private String getCiphertextFileName(DirIdAndName dirIdAndName) {
 	}
 
 	public void invalidatePathMapping(CryptoPath cleartextPath) {
-		ciphertextDirectories.synchronous().invalidate(cleartextPath);
+		ciphertextDirectories.asMap().remove(cleartextPath);
 	}
 
 	public void movePathMapping(CryptoPath cleartextSrc, CryptoPath cleartextDst) {
-		var syncedCache = ciphertextDirectories.synchronous();
-		CiphertextDirectory cachedValue = syncedCache.getIfPresent(cleartextSrc);
+		var cachedValue = ciphertextDirectories.asMap().remove(cleartextSrc);
 		if (cachedValue != null) {
-			syncedCache.put(cleartextDst, cachedValue);
-			syncedCache.invalidate(cleartextSrc);
+			ciphertextDirectories.put(cleartextDst, cachedValue);
 		}
 	}
 

From 8ccf2861d95a73431c71e8823e80438cd7d3ecac Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Thu, 23 Nov 2023 11:32:05 +0100
Subject: [PATCH 07/23] clean up

---
 .../cryptofs/CryptoPathMapper.java            | 25 ++++++++-----------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/src/main/java/org/cryptomator/cryptofs/CryptoPathMapper.java b/src/main/java/org/cryptomator/cryptofs/CryptoPathMapper.java
index fa8e57a5..c725611e 100644
--- a/src/main/java/org/cryptomator/cryptofs/CryptoPathMapper.java
+++ b/src/main/java/org/cryptomator/cryptofs/CryptoPathMapper.java
@@ -20,7 +20,6 @@
 
 import javax.inject.Inject;
 import java.io.IOException;
-import java.io.UncheckedIOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.FileAlreadyExistsException;
 import java.nio.file.Files;
@@ -124,7 +123,7 @@ public CiphertextFilePath getCiphertextFilePath(CryptoPath cleartextPath) throws
 		String cleartextName = cleartextPath.getFileName().toString();
 		return getCiphertextFilePath(parent.path, parent.dirId, cleartextName);
 	}
-	
+
 	public CiphertextFilePath getCiphertextFilePath(Path parentCiphertextDir, String parentDirId, String cleartextName) {
 		String ciphertextName = ciphertextNames.get(new DirIdAndName(parentDirId, cleartextName));
 		Path c9rPath = parentCiphertextDir.resolve(ciphertextName);
@@ -157,19 +156,15 @@ public CiphertextDirectory getCiphertextDir(CryptoPath cleartextPath) throws IOE
 		if (parentPath == null) {
 			return rootDirectory;
 		} else {
-			try {
-				var lazyEntry = new CompletableFuture<CiphertextDirectory>();
-				var priorEntry = ciphertextDirectories.asMap().putIfAbsent(cleartextPath, lazyEntry);
-				if (priorEntry != null) {
-					return priorEntry.join();
-				} else {
-					Path dirFile = getCiphertextFilePath(cleartextPath).getDirFilePath();
-					CiphertextDirectory cipherDir = resolveDirectory(dirFile);
-					lazyEntry.complete(cipherDir);
-					return cipherDir;
-				}
-			} catch (UncheckedIOException e) {
-				throw new IOException(e);
+			var lazyEntry = new CompletableFuture<CiphertextDirectory>();
+			var priorEntry = ciphertextDirectories.asMap().putIfAbsent(cleartextPath, lazyEntry);
+			if (priorEntry != null) {
+				return priorEntry.join();
+			} else {
+				Path dirFile = getCiphertextFilePath(cleartextPath).getDirFilePath();
+				CiphertextDirectory cipherDir = resolveDirectory(dirFile);
+				lazyEntry.complete(cipherDir);
+				return cipherDir;
 			}
 		}
 	}

From 846dd92c226b92db28e515c12813c700c555acda Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Thu, 23 Nov 2023 11:39:49 +0100
Subject: [PATCH 08/23] [ci skip] reformat

---
 .../cryptofs/CryptoPathMapperTest.java        | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/test/java/org/cryptomator/cryptofs/CryptoPathMapperTest.java b/src/test/java/org/cryptomator/cryptofs/CryptoPathMapperTest.java
index 6a4f09a8..263f7ca9 100644
--- a/src/test/java/org/cryptomator/cryptofs/CryptoPathMapperTest.java
+++ b/src/test/java/org/cryptomator/cryptofs/CryptoPathMapperTest.java
@@ -90,7 +90,7 @@ public void testPathEncryptionForFoo() throws IOException {
 		Mockito.when(d00.resolve("00")).thenReturn(d0000);
 		Mockito.when(d0000.resolve("oof.c9r")).thenReturn(d0000oof);
 		Mockito.when(d0000oof.resolve("dir.c9r")).thenReturn(d0000oofdir);
-		Mockito.when(fileNameCryptor.encryptFilename(Mockito.any(),Mockito.eq("foo"), Mockito.any())).thenReturn("oof");
+		Mockito.when(fileNameCryptor.encryptFilename(Mockito.any(), Mockito.eq("foo"), Mockito.any())).thenReturn("oof");
 		Mockito.when(dirIdProvider.load(d0000oofdir)).thenReturn("1");
 		Mockito.when(fileNameCryptor.hashDirectoryId("1")).thenReturn("0001");
 
@@ -145,29 +145,29 @@ public void testPathEncryptionDEEP() throws IOException {
 
 		int maxNestingDepth = 97;
 
-		for (int depth=0; depth < maxNestingDepth; depth++) {
+		for (int depth = 0; depth < maxNestingDepth; depth++) {
 			var dirId = "%02d".formatted(depth);
-			var nextDirId = "%02d".formatted(depth+1);
-			String pathPrefix = "d/00/"+dirId;
+			var nextDirId = "%02d".formatted(depth + 1);
+			String pathPrefix = "d/00/" + dirId;
 			Path contentDir = Mockito.mock(Path.class, pathPrefix);
-			Path dirLinkDir = Mockito.mock(Path.class, pathPrefix+"/cipherDir"+dirId+".c9r");
-			Path dirLinkFile = Mockito.mock(Path.class, pathPrefix + "/cipherDir"+dirId+".c9r/dir.c9r");
+			Path dirLinkDir = Mockito.mock(Path.class, pathPrefix + "/cipherDir" + dirId + ".c9r");
+			Path dirLinkFile = Mockito.mock(Path.class, pathPrefix + "/cipherDir" + dirId + ".c9r/dir.c9r");
 			Mockito.when(d00.resolve(dirId)).thenReturn(contentDir);
-			Mockito.when(contentDir.resolve("cipherDir"+dirId+".c9r")).thenReturn(dirLinkDir);
+			Mockito.when(contentDir.resolve("cipherDir" + dirId + ".c9r")).thenReturn(dirLinkDir);
 			Mockito.when(dirLinkDir.resolve("dir.c9r")).thenReturn(dirLinkFile);
-			Mockito.when(fileNameCryptor.encryptFilename(Mockito.any(), Mockito.eq(dirId), Mockito.any())).thenReturn("cipherDir"+dirId);
+			Mockito.when(fileNameCryptor.encryptFilename(Mockito.any(), Mockito.eq(dirId), Mockito.any())).thenReturn("cipherDir" + dirId);
 			Mockito.when(dirIdProvider.load(dirLinkFile)).thenReturn(nextDirId);
-			Mockito.when(fileNameCryptor.hashDirectoryId(nextDirId)).thenReturn("%04d".formatted(depth+1));
+			Mockito.when(fileNameCryptor.hashDirectoryId(nextDirId)).thenReturn("%04d".formatted(depth + 1));
 		}
 
 		var finalDirId = "%02d".formatted(maxNestingDepth);
-		Path finalContentDir = Mockito.mock(Path.class, "d/00/"+finalDirId);
-		Path finalEncryptedFile = Mockito.mock(Path.class, "d/00/"+finalDirId+"/file.c9r");
+		Path finalContentDir = Mockito.mock(Path.class, "d/00/" + finalDirId);
+		Path finalEncryptedFile = Mockito.mock(Path.class, "d/00/" + finalDirId + "/file.c9r");
 		Mockito.when(d00.resolve(finalDirId)).thenReturn(finalContentDir);
 		Mockito.when(finalContentDir.resolve("file.c9r")).thenReturn(finalEncryptedFile);
 		Mockito.when(fileNameCryptor.encryptFilename(Mockito.any(), Mockito.eq("cleartextFile"), Mockito.any())).thenReturn("file");
 
-		var testPath ="/"+ IntStream.range(0,maxNestingDepth).mapToObj("%02d"::formatted).collect(Collectors.joining("/"))+"/cleartextFile";
+		var testPath = "/" + IntStream.range(0, maxNestingDepth).mapToObj("%02d"::formatted).collect(Collectors.joining("/")) + "/cleartextFile";
 
 		CryptoPathMapper mapper = new CryptoPathMapper(pathToVault, cryptor, dirIdProvider, longFileNameProvider, vaultConfig);
 		Path path = mapper.getCiphertextFilePath(fileSystem.getPath(testPath)).getRawPath();
@@ -210,6 +210,7 @@ public void testPathEncryptionForFooBarBaz() throws IOException {
 		Path path = mapper.getCiphertextFilePath(fileSystem.getPath("/foo/bar/baz")).getRawPath();
 		Assertions.assertEquals(d0002zab, path);
 	}
+
 	@Nested
 	public class GetCiphertextFileType {
 
@@ -247,7 +248,7 @@ public void setup() throws IOException {
 			Mockito.when(dirFilePath.getFileSystem()).thenReturn(underlyingFileSystem);
 			Mockito.when(symlinkFilePath.getFileSystem()).thenReturn(underlyingFileSystem);
 			Mockito.when(contentsFilePath.getFileSystem()).thenReturn(underlyingFileSystem);
-			
+
 		}
 
 

From 1c30fe9a2b2786d7fecdefa67ac798f0952b2967 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Fri, 24 Nov 2023 12:47:06 +0100
Subject: [PATCH 09/23] define jimfs dependency version as maven property

---
 pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 0a797544..21fc1f3d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,6 +29,7 @@
 		<junit.jupiter.version>5.9.1</junit.jupiter.version>
 		<mockito.version>4.9.0</mockito.version>
 		<hamcrest.version>2.2</hamcrest.version>
+		<jimfs.version>1.3.0</jimfs.version>
 
 		<!-- build plugin dependencies -->
 		<dependency-check.version>8.1.2</dependency-check.version>
@@ -131,7 +132,7 @@
 		<dependency>
 			<groupId>com.google.jimfs</groupId>
 			<artifactId>jimfs</artifactId>
-			<version>1.2</version>
+			<version>${jimfs.version}</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>

From 2a0a6ef359451eed1656979ecfed253cb39b2c2c Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Fri, 24 Nov 2023 12:47:30 +0100
Subject: [PATCH 10/23] add dependabot config

---
 .github/dependabot.yml | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 .github/dependabot.yml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 00000000..e1590088
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,24 @@
+version: 2
+updates:
+  - package-ecosystem: "maven"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+      day: "monday"
+      time: "06:00"
+      timezone: "UTC"
+    groups:
+      maven-dependencies:
+        patterns:
+          - "*"
+
+  - package-ecosystem: "github-actions"
+    directory: "/" # even for `.github/workflows`
+    schedule:
+      interval: "monthly"
+    groups:
+      github-actions:
+        patterns:
+          - "*"
+    labels:
+      - "misc:ci"
\ No newline at end of file

From ef7abd962652c8bd0d1bb62e98610ec065e436cb Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Fri, 24 Nov 2023 12:49:15 +0100
Subject: [PATCH 11/23] Update dependabot.yml

---
 .github/dependabot.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index e1590088..001e3740 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -20,5 +20,3 @@ updates:
       github-actions:
         patterns:
           - "*"
-    labels:
-      - "misc:ci"
\ No newline at end of file

From e2287f2a7db50c059b4a432724755fbff01405d4 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Fri, 24 Nov 2023 13:08:00 +0100
Subject: [PATCH 12/23] grouping maven dependencies

---
 .github/dependabot.yml | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 001e3740..5fb33cc3 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -8,9 +8,29 @@ updates:
       time: "06:00"
       timezone: "UTC"
     groups:
-      maven-dependencies:
+      java-test-dependencies:
+        patterns:
+          - "org.junit.jupiter:*"
+          - "org.mockito:*"
+          - "org.hamcrest:*"
+          - "com.google.jimfs:jimfs"
+      maven-build-plugins:
+        patterns:
+          - "org.apache.maven.plugins:*"
+          - "org.jacoco:jacoco-maven-plugin"
+          - "org.owasp:dependency-check-maven"
+      java-production-dependencies:
         patterns:
           - "*"
+        exclude-patterns:
+          - "org.apache.maven.plugins:*"
+          - "org.jacoco:jacoco-maven-plugin"
+          - "org.owasp:dependency-check-maven"
+          - "org.junit.jupiter:*"
+          - "org.mockito:*"
+          - "org.hamcrest:*"
+          - "com.google.jimfs:jimfs"
+
 
   - package-ecosystem: "github-actions"
     directory: "/" # even for `.github/workflows`

From ff57f158c6a76d41e3460c63e9b3602332c4b01f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 24 Nov 2023 12:21:08 +0000
Subject: [PATCH 13/23] Bump the github-actions group with 1 update (#182)

---
 .github/workflows/build.yml           | 2 +-
 .github/workflows/codeql-analysis.yml | 2 +-
 .github/workflows/publish-central.yml | 2 +-
 .github/workflows/publish-github.yml  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index bd7ca9b6..7871e2d7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -7,7 +7,7 @@ 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@v3
+      - uses: actions/checkout@v4
         with:
            fetch-depth: 0
       - uses: actions/setup-java@v3
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index c9c1a68c..73edbfe4 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -15,7 +15,7 @@ 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@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 2
     - uses: actions/setup-java@v3
diff --git a/.github/workflows/publish-central.yml b/.github/workflows/publish-central.yml
index 35deee11..b3636ca1 100644
--- a/.github/workflows/publish-central.yml
+++ b/.github/workflows/publish-central.yml
@@ -10,7 +10,7 @@ jobs:
   publish:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: "refs/tags/${{ github.event.inputs.tag }}"
       - uses: actions/setup-java@v3
diff --git a/.github/workflows/publish-github.yml b/.github/workflows/publish-github.yml
index 6a9b3e33..64861590 100644
--- a/.github/workflows/publish-github.yml
+++ b/.github/workflows/publish-github.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     if: startsWith(github.ref, 'refs/tags/') # only allow publishing tagged versions
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-java@v3
         with:
           java-version: 17

From d4ec6f4f089d12b790857696efd29dd2f59653b1 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Fri, 24 Nov 2023 13:23:56 +0100
Subject: [PATCH 14/23] reduce ci noise by supressing git fetching output

---
 .github/workflows/build.yml           | 1 +
 .github/workflows/codeql-analysis.yml | 1 +
 .github/workflows/publish-central.yml | 1 +
 .github/workflows/publish-github.yml  | 2 ++
 4 files changed, 5 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7871e2d7..a0543596 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -10,6 +10,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
            fetch-depth: 0
+           show-progress: false
       - uses: actions/setup-java@v3
         with:
           java-version: 17
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 73edbfe4..45c95548 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -18,6 +18,7 @@ jobs:
     - uses: actions/checkout@v4
       with:
         fetch-depth: 2
+        show-progress: false
     - uses: actions/setup-java@v3
       with:
         java-version: 17
diff --git a/.github/workflows/publish-central.yml b/.github/workflows/publish-central.yml
index b3636ca1..3260070c 100644
--- a/.github/workflows/publish-central.yml
+++ b/.github/workflows/publish-central.yml
@@ -13,6 +13,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           ref: "refs/tags/${{ github.event.inputs.tag }}"
+          show-progress: false
       - uses: actions/setup-java@v3
         with:
           java-version: 17
diff --git a/.github/workflows/publish-github.yml b/.github/workflows/publish-github.yml
index 64861590..37166beb 100644
--- a/.github/workflows/publish-github.yml
+++ b/.github/workflows/publish-github.yml
@@ -8,6 +8,8 @@ jobs:
     if: startsWith(github.ref, 'refs/tags/') # only allow publishing tagged versions
     steps:
       - uses: actions/checkout@v4
+        with:
+          show-progress: false
       - uses: actions/setup-java@v3
         with:
           java-version: 17

From e14e427a730034fbd40286145a0273f516c9ffbe Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Fri, 24 Nov 2023 13:25:22 +0100
Subject: [PATCH 15/23] add label to CI updating PRs

---
 .github/dependabot.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 5fb33cc3..c2b928dc 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -40,3 +40,5 @@ updates:
       github-actions:
         patterns:
           - "*"
+    labels:
+      - "ci"

From 6bc407869569d0251ebcf8a0e1df8b648e4de520 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 24 Nov 2023 12:34:28 +0000
Subject: [PATCH 16/23] Bump the java-production-dependencies group with 6
 updates (#186)

---
 pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 21fc1f3d..4b0ced84 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,10 +20,10 @@
 		<!-- dependencies -->
 		<cryptolib.version>2.1.2</cryptolib.version>
 		<jwt.version>4.4.0</jwt.version>
-		<dagger.version>2.44.2</dagger.version>
-		<guava.version>32.0.0-jre</guava.version>
-		<caffeine.version>3.1.4</caffeine.version>
-		<slf4j.version>2.0.3</slf4j.version>
+		<dagger.version>2.48.1</dagger.version>
+		<guava.version>32.1.3-jre</guava.version>
+		<caffeine.version>3.1.8</caffeine.version>
+		<slf4j.version>2.0.9</slf4j.version>
 
 		<!-- test dependencies -->
 		<junit.jupiter.version>5.9.1</junit.jupiter.version>

From d3fc6601dbd0af46ac2f713c29b547b17c5bcd4f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 24 Nov 2023 12:36:26 +0000
Subject: [PATCH 17/23] Bump the java-test-dependencies group with 2 updates

Bumps the java-test-dependencies group with 2 updates: [org.junit.jupiter:junit-jupiter](https://github.com/junit-team/junit5) and [org.mockito:mockito-inline](https://github.com/mockito/mockito).


Updates `org.junit.jupiter:junit-jupiter` from 5.9.1 to 5.10.1
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.9.1...r5.10.1)

Updates `org.mockito:mockito-inline` from 4.9.0 to 5.2.0
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v4.9.0...v5.2.0)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: java-test-dependencies
- dependency-name: org.mockito:mockito-inline
  dependency-type: direct:development
  update-type: version-update:semver-major
  dependency-group: java-test-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4b0ced84..086c7c86 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,8 +26,8 @@
 		<slf4j.version>2.0.9</slf4j.version>
 
 		<!-- test dependencies -->
-		<junit.jupiter.version>5.9.1</junit.jupiter.version>
-		<mockito.version>4.9.0</mockito.version>
+		<junit.jupiter.version>5.10.1</junit.jupiter.version>
+		<mockito.version>5.2.0</mockito.version>
 		<hamcrest.version>2.2</hamcrest.version>
 		<jimfs.version>1.3.0</jimfs.version>
 

From 7635249911306a7d98ad3d8c099aba74af6d6c87 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Fri, 24 Nov 2023 17:53:50 +0100
Subject: [PATCH 18/23] adjust to new mockito varargs matching

---
 .../cryptofs/CryptoFileSystemImplTest.java    | 35 +++++++++++--------
 .../cryptofs/CryptoPathMapperTest.java        |  2 +-
 .../cryptomator/cryptofs/SymlinksTest.java    |  3 +-
 .../cryptofs/attr/AttributeProviderTest.java  |  6 ++--
 4 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/src/test/java/org/cryptomator/cryptofs/CryptoFileSystemImplTest.java b/src/test/java/org/cryptomator/cryptofs/CryptoFileSystemImplTest.java
index 12cc3ef2..e694130f 100644
--- a/src/test/java/org/cryptomator/cryptofs/CryptoFileSystemImplTest.java
+++ b/src/test/java/org/cryptomator/cryptofs/CryptoFileSystemImplTest.java
@@ -49,6 +49,7 @@
 import java.nio.file.attribute.BasicFileAttributes;
 import java.nio.file.attribute.DosFileAttributeView;
 import java.nio.file.attribute.DosFileAttributes;
+import java.nio.file.attribute.FileAttribute;
 import java.nio.file.attribute.FileOwnerAttributeView;
 import java.nio.file.attribute.FileTime;
 import java.nio.file.attribute.GroupPrincipal;
@@ -71,6 +72,7 @@
 import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.isA;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doThrow;
@@ -454,7 +456,7 @@ public void setup() throws IOException {
 			when(ciphertextPath.getFilePath()).thenReturn(ciphertextFilePath);
 			when(openCryptoFiles.getOrCreate(ciphertextFilePath)).thenReturn(openCryptoFile);
 			when(ciphertextFilePath.getName(3)).thenReturn(mock(CryptoPath.class, "path.c9r"));
-			when(openCryptoFile.newFileChannel(any(), any())).thenReturn(fileChannel);
+			when(openCryptoFile.newFileChannel(any(), any(FileAttribute[].class))).thenReturn(fileChannel);
 		}
 
 		@Nested
@@ -861,7 +863,7 @@ public class Copy {
 			private final CryptoPath cleartextTargetParent = mock(CryptoPath.class, "cleartextTargetParent");
 			private final Path ciphertextTargetParent = mock(Path.class, "ciphertextTargetParent");
 			private final Path ciphertextTargetDirParent = mock(Path.class, "ciphertextTargetDirParent");
-			private final FileChannel ciphertextTargetDirFileChannel = mock(FileChannel.class);
+			private final FileChannel ciphertextTargetDirDirFileFileChannel = mock(FileChannel.class);
 
 			@BeforeEach
 			public void setup() throws IOException, ReflectiveOperationException {
@@ -872,7 +874,7 @@ public void setup() throws IOException, ReflectiveOperationException {
 
 				when(cryptoPathMapper.getCiphertextDir(cleartextTargetParent)).thenReturn(new CiphertextDirectory("41", ciphertextTargetParent));
 				when(cryptoPathMapper.getCiphertextDir(cleartextDestination)).thenReturn(new CiphertextDirectory("42", ciphertextDestinationDir));
-				when(physicalFsProv.newFileChannel(Mockito.same(ciphertextDestinationDirFile), Mockito.anySet(), Mockito.any())).thenReturn(ciphertextTargetDirFileChannel);
+				when(physicalFsProv.newFileChannel(Mockito.same(ciphertextDestinationDirFile), Mockito.anySet(), Mockito.any())).thenReturn(ciphertextTargetDirDirFileFileChannel);
 			}
 
 			@Test
@@ -954,6 +956,7 @@ public void copyFile() throws IOException {
 
 			@Test
 			public void copyDirectory() throws IOException {
+				when(physicalFsProv.newFileChannel(Mockito.eq(ciphertextDestinationDirFile), Mockito.any(), any(FileAttribute[].class))).thenReturn(ciphertextTargetDirDirFileFileChannel);
 				when(cryptoPathMapper.getCiphertextFileType(cleartextSource)).thenReturn(CiphertextFileType.DIRECTORY);
 				when(cryptoPathMapper.getCiphertextFileType(cleartextDestination)).thenThrow(NoSuchFileException.class);
 				Mockito.doThrow(new NoSuchFileException("ciphertextDestinationDirFile")).when(physicalFsProv).checkAccess(ciphertextDestinationFile);
@@ -961,7 +964,7 @@ public void copyDirectory() throws IOException {
 				inTest.copy(cleartextSource, cleartextDestination);
 
 				verify(readonlyFlag, atLeast(1)).assertWritable();
-				verify(ciphertextTargetDirFileChannel).write(any(ByteBuffer.class));
+				verify(ciphertextTargetDirDirFileFileChannel).write(any(ByteBuffer.class));
 				verify(physicalFsProv).createDirectory(ciphertextDestinationDir);
 				verify(dirIdProvider, Mockito.never()).delete(Mockito.any());
 				verify(cryptoPathMapper, Mockito.never()).invalidatePathMapping(Mockito.any());
@@ -981,7 +984,7 @@ public void copyDirectoryReplaceExisting() throws IOException {
 				inTest.copy(cleartextSource, cleartextDestination, StandardCopyOption.REPLACE_EXISTING);
 
 				verify(readonlyFlag).assertWritable();
-				verify(ciphertextTargetDirFileChannel, Mockito.never()).write(any(ByteBuffer.class));
+				verify(ciphertextTargetDirDirFileFileChannel, Mockito.never()).write(any(ByteBuffer.class));
 				verify(physicalFsProv, Mockito.never()).createDirectory(Mockito.any());
 				verify(dirIdProvider, Mockito.never()).delete(Mockito.any());
 				verify(cryptoPathMapper, Mockito.never()).invalidatePathMapping(Mockito.any());
@@ -1001,8 +1004,9 @@ public void moveDirectoryCopyBasicAttributes() throws IOException {
 				when(srcAttrs.lastModifiedTime()).thenReturn(lastModifiedTime);
 				when(srcAttrs.lastAccessTime()).thenReturn(lastAccessTime);
 				when(srcAttrs.creationTime()).thenReturn(createTime);
-				when(physicalFsProv.readAttributes(Mockito.same(ciphertextSourceDir), Mockito.same(BasicFileAttributes.class), Mockito.any())).thenReturn(srcAttrs);
-				when(physicalFsProv.getFileAttributeView(Mockito.same(ciphertextDestinationDir), Mockito.same(BasicFileAttributeView.class), Mockito.any())).thenReturn(dstAttrView);
+				when(physicalFsProv.readAttributes(Mockito.same(ciphertextSourceDir), Mockito.same(BasicFileAttributes.class), any(LinkOption[].class))).thenReturn(srcAttrs);
+				when(physicalFsProv.getFileAttributeView(Mockito.same(ciphertextDestinationDir), Mockito.same(BasicFileAttributeView.class), any(LinkOption[].class))).thenReturn(dstAttrView);
+				when(physicalFsProv.newFileChannel(Mockito.same(ciphertextDestinationDirFile), Mockito.anySet(), any(FileAttribute[].class))).thenReturn(ciphertextTargetDirDirFileFileChannel);
 
 				inTest.copy(cleartextSource, cleartextDestination, StandardCopyOption.COPY_ATTRIBUTES);
 
@@ -1020,8 +1024,9 @@ public void moveDirectoryCopyFileOwnerAttributes() throws IOException {
 				FileOwnerAttributeView srcAttrsView = mock(FileOwnerAttributeView.class);
 				FileOwnerAttributeView dstAttrView = mock(FileOwnerAttributeView.class);
 				when(srcAttrsView.getOwner()).thenReturn(owner);
-				when(physicalFsProv.getFileAttributeView(Mockito.same(ciphertextSourceDir), Mockito.same(FileOwnerAttributeView.class), Mockito.any())).thenReturn(srcAttrsView);
-				when(physicalFsProv.getFileAttributeView(Mockito.same(ciphertextDestinationDir), Mockito.same(FileOwnerAttributeView.class), Mockito.any())).thenReturn(dstAttrView);
+				when(physicalFsProv.getFileAttributeView(Mockito.same(ciphertextSourceDir), Mockito.same(FileOwnerAttributeView.class), any(LinkOption[].class))).thenReturn(srcAttrsView);
+				when(physicalFsProv.getFileAttributeView(Mockito.same(ciphertextDestinationDir), Mockito.same(FileOwnerAttributeView.class), any(LinkOption[].class))).thenReturn(dstAttrView);
+				when(physicalFsProv.newFileChannel(Mockito.same(ciphertextDestinationDirFile), Mockito.anySet(), any(FileAttribute[].class))).thenReturn(ciphertextTargetDirDirFileFileChannel);
 
 				inTest.copy(cleartextSource, cleartextDestination, StandardCopyOption.COPY_ATTRIBUTES);
 
@@ -1042,8 +1047,9 @@ public void moveDirectoryCopyPosixAttributes() throws IOException {
 				PosixFileAttributeView dstAttrView = mock(PosixFileAttributeView.class);
 				when(srcAttrs.group()).thenReturn(group);
 				when(srcAttrs.permissions()).thenReturn(permissions);
-				when(physicalFsProv.readAttributes(Mockito.same(ciphertextSourceDir), Mockito.same(PosixFileAttributes.class), Mockito.any())).thenReturn(srcAttrs);
-				when(physicalFsProv.getFileAttributeView(Mockito.same(ciphertextDestinationDir), Mockito.same(PosixFileAttributeView.class), Mockito.any())).thenReturn(dstAttrView);
+				when(physicalFsProv.readAttributes(Mockito.same(ciphertextSourceDir), Mockito.same(PosixFileAttributes.class), any(LinkOption[].class))).thenReturn(srcAttrs);
+				when(physicalFsProv.getFileAttributeView(Mockito.same(ciphertextDestinationDir), Mockito.same(PosixFileAttributeView.class), any(LinkOption[].class))).thenReturn(dstAttrView);
+				when(physicalFsProv.newFileChannel(Mockito.same(ciphertextDestinationDirFile), Mockito.anySet(), any(FileAttribute[].class))).thenReturn(ciphertextTargetDirDirFileFileChannel);
 
 				inTest.copy(cleartextSource, cleartextDestination, StandardCopyOption.COPY_ATTRIBUTES);
 
@@ -1064,8 +1070,9 @@ public void moveDirectoryCopyDosAttributes() throws IOException {
 				when(srcAttrs.isHidden()).thenReturn(true);
 				when(srcAttrs.isReadOnly()).thenReturn(true);
 				when(srcAttrs.isSystem()).thenReturn(true);
-				when(physicalFsProv.readAttributes(Mockito.same(ciphertextSourceDir), Mockito.same(DosFileAttributes.class), Mockito.any())).thenReturn(srcAttrs);
-				when(physicalFsProv.getFileAttributeView(Mockito.same(ciphertextDestinationDir), Mockito.same(DosFileAttributeView.class), Mockito.any())).thenReturn(dstAttrView);
+				when(physicalFsProv.readAttributes(Mockito.same(ciphertextSourceDir), Mockito.same(DosFileAttributes.class), any(LinkOption[].class))).thenReturn(srcAttrs);
+				when(physicalFsProv.getFileAttributeView(Mockito.same(ciphertextDestinationDir), Mockito.same(DosFileAttributeView.class), any(LinkOption[].class))).thenReturn(dstAttrView);
+				when(physicalFsProv.newFileChannel(Mockito.same(ciphertextDestinationDirFile), Mockito.anySet(), any(FileAttribute[].class))).thenReturn(ciphertextTargetDirDirFileFileChannel);
 
 				inTest.copy(cleartextSource, cleartextDestination, StandardCopyOption.COPY_ATTRIBUTES);
 
@@ -1091,7 +1098,7 @@ public void moveDirectoryReplaceExistingNonEmpty() throws IOException {
 					inTest.copy(cleartextSource, cleartextDestination, StandardCopyOption.REPLACE_EXISTING);
 				});
 				verify(readonlyFlag).assertWritable();
-				verify(ciphertextTargetDirFileChannel, Mockito.never()).write(any(ByteBuffer.class));
+				verify(ciphertextTargetDirDirFileFileChannel, Mockito.never()).write(any(ByteBuffer.class));
 				verify(physicalFsProv, Mockito.never()).createDirectory(Mockito.any());
 				verify(dirIdProvider, Mockito.never()).delete(Mockito.any());
 				verify(cryptoPathMapper, Mockito.never()).invalidatePathMapping(Mockito.any());
diff --git a/src/test/java/org/cryptomator/cryptofs/CryptoPathMapperTest.java b/src/test/java/org/cryptomator/cryptofs/CryptoPathMapperTest.java
index 263f7ca9..e2da36a8 100644
--- a/src/test/java/org/cryptomator/cryptofs/CryptoPathMapperTest.java
+++ b/src/test/java/org/cryptomator/cryptofs/CryptoPathMapperTest.java
@@ -50,7 +50,7 @@ public void setup() {
 		Mockito.when(cryptor.fileNameCryptor()).thenReturn(fileNameCryptor);
 		Mockito.when(pathToVault.resolve("d")).thenReturn(dataRoot);
 		Mockito.when(vaultConfig.getShorteningThreshold()).thenReturn(220);
-		Mockito.when(fileSystem.getPath(ArgumentMatchers.anyString(), ArgumentMatchers.any())).thenAnswer(invocation -> {
+		Mockito.when(fileSystem.getPath(ArgumentMatchers.anyString(), ArgumentMatchers.any(String[].class))).thenAnswer(invocation -> {
 			String first = invocation.getArgument(0);
 			if (invocation.getArguments().length == 1) {
 				return cryptoPathFactory.getPath(fileSystem, first);
diff --git a/src/test/java/org/cryptomator/cryptofs/SymlinksTest.java b/src/test/java/org/cryptomator/cryptofs/SymlinksTest.java
index 0fa01436..5169dc64 100644
--- a/src/test/java/org/cryptomator/cryptofs/SymlinksTest.java
+++ b/src/test/java/org/cryptomator/cryptofs/SymlinksTest.java
@@ -17,6 +17,7 @@
 import java.nio.file.NoSuchFileException;
 import java.nio.file.Path;
 import java.nio.file.attribute.BasicFileAttributes;
+import java.nio.file.attribute.FileAttribute;
 import java.nio.file.spi.FileSystemProvider;
 
 public class SymlinksTest {
@@ -69,7 +70,7 @@ public void testCreateSymbolicLink() throws IOException {
 		inTest.createSymbolicLink(cleartextPath, target);
 
 		ArgumentCaptor<ByteBuffer> bytesWritten = ArgumentCaptor.forClass(ByteBuffer.class);
-		Mockito.verify(underlyingFsProvider).createDirectory(Mockito.eq(ciphertextPath), Mockito.any());
+		Mockito.verify(underlyingFsProvider).createDirectory(Mockito.eq(ciphertextPath), Mockito.any(FileAttribute[].class));
 		Mockito.verify(openCryptoFiles).writeCiphertextFile(Mockito.eq(symlinkFilePath), Mockito.any(), bytesWritten.capture());
 		Assertions.assertEquals("/symlink/target/path", StandardCharsets.UTF_8.decode(bytesWritten.getValue()).toString());
 	}
diff --git a/src/test/java/org/cryptomator/cryptofs/attr/AttributeProviderTest.java b/src/test/java/org/cryptomator/cryptofs/attr/AttributeProviderTest.java
index 85dd5916..d123f3df 100644
--- a/src/test/java/org/cryptomator/cryptofs/attr/AttributeProviderTest.java
+++ b/src/test/java/org/cryptomator/cryptofs/attr/AttributeProviderTest.java
@@ -62,9 +62,9 @@ public void setup() throws IOException {
 		ciphertextBasicAttr = Mockito.mock(BasicFileAttributes.class);
 		ciphertextPosixAttr = Mockito.mock(PosixFileAttributes.class);
 		ciphertextDosAttr = Mockito.mock(DosFileAttributes.class);
-		Mockito.when(provider.readAttributes(Mockito.same(ciphertextRawPath), Mockito.same(BasicFileAttributes.class), any())).thenReturn(ciphertextBasicAttr);
-		Mockito.when(provider.readAttributes(Mockito.same(ciphertextRawPath), Mockito.same(PosixFileAttributes.class), any())).thenReturn(ciphertextPosixAttr);
-		Mockito.when(provider.readAttributes(Mockito.same(ciphertextRawPath), Mockito.same(DosFileAttributes.class), any())).thenReturn(ciphertextDosAttr);
+		Mockito.when(provider.readAttributes(Mockito.same(ciphertextRawPath), Mockito.same(BasicFileAttributes.class), any(LinkOption[].class))).thenReturn(ciphertextBasicAttr);
+		Mockito.when(provider.readAttributes(Mockito.same(ciphertextRawPath), Mockito.same(PosixFileAttributes.class), any(LinkOption[].class))).thenReturn(ciphertextPosixAttr);
+		Mockito.when(provider.readAttributes(Mockito.same(ciphertextRawPath), Mockito.same(DosFileAttributes.class), any(LinkOption[].class))).thenReturn(ciphertextDosAttr);
 
 		Mockito.when(pathMapper.getCiphertextFileType(cleartextPath)).thenReturn(CiphertextFileType.FILE);
 		Mockito.when(pathMapper.getCiphertextFilePath(cleartextPath)).thenReturn(ciphertextPath);

From 5cf1ea136bbb101bd86767754e4fe1237de4229d Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Fri, 24 Nov 2023 17:55:29 +0100
Subject: [PATCH 19/23] beautify maven test output

---
 pom.xml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/pom.xml b/pom.xml
index 4b0ced84..bbbb506c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,6 +33,7 @@
 
 		<!-- build plugin dependencies -->
 		<dependency-check.version>8.1.2</dependency-check.version>
+		<junit-tree-reporter.version>1.2.1</junit-tree-reporter.version>
 		<jacoco.version>0.8.8</jacoco.version>
 		<nexus-staging.version>1.6.13</nexus-staging.version>
 	</properties>
@@ -158,10 +159,23 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
 				<version>3.0.0-M7</version>
+				<dependencies>
+					<dependency>
+						<groupId>me.fabriciorby</groupId>
+						<artifactId>maven-surefire-junit5-tree-reporter</artifactId>
+						<version>${junit-tree-reporter.version}</version>
+					</dependency>
+				</dependencies>
 				<configuration>
 					<systemPropertyVariables>
 						<org.slf4j.simpleLogger.defaultLogLevel>ERROR</org.slf4j.simpleLogger.defaultLogLevel>
 					</systemPropertyVariables>
+					<consoleOutputReporter>
+						<disable>true</disable>
+					</consoleOutputReporter>
+					<statelessTestsetInfoReporter
+							implementation="org.apache.maven.plugin.surefire.extensions.junit5.JUnit5StatelessTestsetInfoTreeReporter">
+					</statelessTestsetInfoReporter>
 				</configuration>
 			</plugin>
 			<plugin>

From 6aedba448a8894007612d720cb80f41f6b9bc5fa Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Fri, 24 Nov 2023 18:56:22 +0100
Subject: [PATCH 20/23] clean up ci scripts

---
 .github/workflows/build.yml           | 1 -
 .github/workflows/codeql-analysis.yml | 5 +++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a0543596..503ff532 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -5,7 +5,6 @@ jobs:
   build:
     name: Build and Test
     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@v4
         with:
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 45c95548..b90c55f8 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -13,7 +13,8 @@ jobs:
   analyse:
     name: Analyse
     runs-on: ubuntu-latest
-    if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')"
+    # dependeabot has on push events only read-only access, but codeql requires write access
+    if: ${{ !(github.actor == 'dependabot[bot]' && contains(fromJSON('["push"]'), github.event_name)) }}
     steps:
     - uses: actions/checkout@v4
       with:
@@ -28,7 +29,7 @@ jobs:
       uses: github/codeql-action/init@v2
       with:
         languages: java
-    - name: Build and Test
+    - name: Build
       run: mvn -B install -DskipTests
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v2
\ No newline at end of file

From ae0391fcfb283d596097904910663a4ce5ef4639 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Tue, 28 Nov 2023 10:04:46 +0100
Subject: [PATCH 21/23] deactivate dependency-check during build

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 503ff532..fa25f713 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -29,7 +29,7 @@ jobs:
           mvn -B verify
           jacoco:report
           org.sonarsource.scanner.maven:sonar-maven-plugin:sonar
-          -Pcoverage,dependency-check
+          -Pcoverage
           -Dsonar.projectKey=cryptomator_cryptofs
           -Dsonar.organization=cryptomator
           -Dsonar.host.url=https://sonarcloud.io

From 6479a4a36d43ef7b29351a599a4d3dc7279b1180 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 28 Nov 2023 09:12:01 +0000
Subject: [PATCH 22/23] Bump the maven-build-plugins group with 7 updates
 (#187)

---
 pom.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6b6610da..391185a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,9 +32,9 @@
 		<jimfs.version>1.3.0</jimfs.version>
 
 		<!-- build plugin dependencies -->
-		<dependency-check.version>8.1.2</dependency-check.version>
+		<dependency-check.version>9.0.1</dependency-check.version>
 		<junit-tree-reporter.version>1.2.1</junit-tree-reporter.version>
-		<jacoco.version>0.8.8</jacoco.version>
+		<jacoco.version>0.8.11</jacoco.version>
 		<nexus-staging.version>1.6.13</nexus-staging.version>
 	</properties>
 
@@ -143,7 +143,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.10.1</version>
+				<version>3.11.0</version>
 				<configuration>
 					<showWarnings>true</showWarnings>
 					<annotationProcessorPaths>
@@ -158,7 +158,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>3.0.0-M7</version>
+				<version>3.2.2</version>
 				<dependencies>
 					<dependency>
 						<groupId>me.fabriciorby</groupId>
@@ -185,7 +185,7 @@
 			</plugin>
 			<plugin>
 				<artifactId>maven-source-plugin</artifactId>
-				<version>3.2.1</version>
+				<version>3.3.0</version>
 				<executions>
 					<execution>
 						<id>attach-sources</id>
@@ -197,7 +197,7 @@
 			</plugin>
 			<plugin>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>3.4.1</version>
+				<version>3.6.2</version>
 				<executions>
 					<execution>
 						<id>attach-javadocs</id>
@@ -298,7 +298,7 @@
 				<plugins>
 					<plugin>
 						<artifactId>maven-gpg-plugin</artifactId>
-						<version>3.0.1</version>
+						<version>3.1.0</version>
 						<executions>
 							<execution>
 								<id>sign-artifacts</id>

From a37c26bdf91017ac1f0b392c4544ae3049ed1e73 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Tue, 28 Nov 2023 10:21:13 +0100
Subject: [PATCH 23/23] prepare 2.6.8

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 391185a7..1b93bbea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.cryptomator</groupId>
 	<artifactId>cryptofs</artifactId>
-	<version>2.7.0-SNAPSHOT</version>
+	<version>2.6.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>