Merge branch 'develop' into release/2.10.0

infeo · infeo · commit 67190a620445 · 2026-02-17T13:13:11.000+01:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -17,17 +17,17 @@ jobs:
       attestations: write # Required for the attestations step
       contents: write # Required for the release step
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
            fetch-depth: 0
            show-progress: false
-      - uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
+      - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
         with:
           java-version: ${{ env.JAVA_VERSION }}
           distribution: 'temurin'
           cache: 'maven'
       - name: Cache SonarCloud packages
-        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
+        uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
         with:
           path: ~/.sonar/cache
           key: ${{ runner.os }}-sonar
@@ -49,12 +49,12 @@ jobs:
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
       - name: Attest
         if: startsWith(github.ref, 'refs/tags/')
-        uses: actions/attest-build-provenance@977bb373ede98d70efdf65b84cb5f73e068dcc2a # v3.0.0
+        uses: actions/attest-build-provenance@96278af6caaf10aea03fd8d33a09a777ca52d62f # v3.2.0
         with:
           subject-path: |
             target/*.jar
             target/*.pom
-      - uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
+      - uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
         with:
           name: artifacts
           path: target/*.jar
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -16,20 +16,20 @@ jobs:
     # 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@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       with:
         fetch-depth: 2
         show-progress: false
-    - uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
+    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
       with:
         java-version: 25
         distribution: 'temurin'
         cache: 'maven'
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@cf1bb45a277cb3c205638b2cd5c984db1c46a412 # v4.31.7
+      uses: github/codeql-action/init@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # v4.32.0
       with:
         languages: java
     - name: Build
       run: mvn -B install -DskipTests
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@cf1bb45a277cb3c205638b2cd5c984db1c46a412 # v4.31.7
+      uses: github/codeql-action/analyze@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # v4.32.0
diff --git a/.github/workflows/dependency-check.yml b/.github/workflows/dependency-check.yml
@@ -11,7 +11,7 @@ on:
 
 jobs:
   check-dependencies:
-    uses: skymatic/workflows/.github/workflows/run-dependency-check.yml@1074588008ae3326a2221ea451783280518f0366 # v3.0.1
+    uses: skymatic/workflows/.github/workflows/run-dependency-check.yml@957d3c2c08c56855fdac41e5afb9a7aca8c30dd9 # v3.0.3
     with:
       runner-os: 'ubuntu-latest'
       java-distribution: 'temurin'
@@ -20,4 +20,4 @@ jobs:
       nvd-api-key: ${{ secrets.NVD_API_KEY }}
       ossindex-username: ${{ secrets.OSSINDEX_USERNAME }}
       ossindex-token: ${{ secrets.OSSINDEX_API_TOKEN }}
-      slack-webhook-url: ${{ secrets.SLACK_WEBHOOK_URL }}
+      slack-webhook-url: ${{ secrets.SLACK_WEBHOOK_CRYPTOMATOR_DESKTOP }}
diff --git a/.github/workflows/publish-central.yml b/.github/workflows/publish-central.yml
@@ -7,8 +7,8 @@ jobs:
     runs-on: ubuntu-latest
     if: startsWith(github.ref, 'refs/tags/') # only allow publishing tagged versions
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
-      - uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
         with:
           java-version: 25
           distribution: 'temurin'
diff --git a/.github/workflows/publish-github.yml b/.github/workflows/publish-github.yml
@@ -7,8 +7,8 @@ jobs:
     runs-on: ubuntu-latest
     if: startsWith(github.ref, 'refs/tags/') # only allow publishing tagged versions
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
-      - uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
         with:
           java-version: 25
           distribution: 'temurin'
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,7 +16,9 @@ Changes to prior versions can be found on the [Github release page](https://gith
 ### Changed
 * Use JDK 25 for build (bf26d6c9cd15a2489126ee0409a8ec9eca59da0c)
 * Pin external ci actions ([#320](https://github.com/cryptomator/cryptofs/pull/320))
-* Updated com.github.ben-manes.caffeine:caffeine from 3.2.0 to 3.2.3 ([#323](https://github.com/cryptomator/cryptofs/pull/323))
+* Updated dependencies:
+  * `com.github.ben-manes.caffeine:caffeine` from 3.2.0 to 3.2.3 ([#323](https://github.com/cryptomator/cryptofs/pull/323))
+  * `org.cryptomator:cryptolib` from 2.2.1 to 2.2.2
 
 ### Fixed
 * Replacing internal path class `CryptoPath` with strings in `FilesystemEvent`s ([#319](https://github.com/cryptomator/cryptofs/pull/319))
diff --git a/pom.xml b/pom.xml
@@ -18,33 +18,33 @@
 		<maven.compiler.release>25</maven.compiler.release>
 
 		<!-- dependencies -->
-		<cryptolib.version>2.2.1</cryptolib.version>
+		<cryptolib.version>2.2.2</cryptolib.version>
 		<jwt.version>4.5.0</jwt.version>
 		<dagger.version>2.55</dagger.version>
 		<caffeine.version>3.2.3</caffeine.version>
 		<slf4j.version>2.0.17</slf4j.version>
 
 		<!-- test dependencies -->
 		<awaitility.version>4.3.0</awaitility.version>
-		<junit.jupiter.version>6.0.0</junit.jupiter.version>
+		<junit.jupiter.version>6.0.3</junit.jupiter.version>
 		<jmh.version>1.37</jmh.version>
-		<mockito.version>5.20.0</mockito.version>
+		<mockito.version>5.21.0</mockito.version>
 		<hamcrest.version>3.0</hamcrest.version>
 		<jimfs.version>1.3.1</jimfs.version>
 
 		<!-- build plugin dependencies -->
-		<mvn-compiler.version>3.14.1</mvn-compiler.version>
-		<mvn-dependency.version>3.9.0</mvn-dependency.version>
+		<mvn-compiler.version>3.15.0</mvn-compiler.version>
+		<mvn-dependency.version>3.10.0</mvn-dependency.version>
 		<mvn-surefire.version>3.5.4</mvn-surefire.version>
-		<mvn-jar.version>3.4.2</mvn-jar.version>
-		<mvn-source.version>3.3.1</mvn-source.version>
+		<mvn-jar.version>3.5.0</mvn-jar.version>
+		<mvn-source.version>3.4.0</mvn-source.version>
 		<mvn-javadoc.version>3.12.0</mvn-javadoc.version>
 		<mvn-gpg.version>3.2.8</mvn-gpg.version>
 
-		<dependency-check.version>12.1.8</dependency-check.version>
+		<dependency-check.version>12.2.0</dependency-check.version>
 		<junit-tree-reporter.version>1.5.1</junit-tree-reporter.version>
 		<jacoco.version>0.8.14</jacoco.version>
-		<central-publishing.version>0.9.0</central-publishing.version>
+		<central-publishing.version>0.10.0</central-publishing.version>
 
 		<!-- Property used by surefire to determine jacoco engine -->
 		<surefire.jacoco.args></surefire.jacoco.args>
diff --git a/src/main/java/org/cryptomator/cryptofs/CryptoFileSystemModule.java b/src/main/java/org/cryptomator/cryptofs/CryptoFileSystemModule.java
@@ -39,7 +39,7 @@ public Optional<FileStore> provideNativeFileStore(@PathToVault Path pathToVault)
 		try {
 			return Optional.of(Files.getFileStore(pathToVault));
 		} catch (IOException e) {
-			LOG.warn("Failed to get file store for " + pathToVault, e);
+			LOG.warn("Failed to get file store for {}", pathToVault, e);
 			return Optional.empty();
 		}
 	}
@@ -52,7 +52,7 @@ public Consumer<FilesystemEvent> provideFilesystemEventConsumer(CryptoFileSystem
 			try {
 				eventConsumer.accept(event);
 			} catch (RuntimeException e) {
-				LOG.warn("Filesystem event consumer failed with exception when processing event {}", event, e);
+				LOG.warn("Filesystem event consumer failed with exception when processing event {}", event.getClass().getSimpleName(), e);
 			}
 		};
 	}
diff --git a/src/main/java/org/cryptomator/cryptofs/CryptoFileSystems.java b/src/main/java/org/cryptomator/cryptofs/CryptoFileSystems.java
@@ -97,7 +97,7 @@ private String readVaultConfigFile(Path pathToVault, CryptoFileSystemProperties
 			// TODO: remove this check and tell downstream users to check the vault dir structure before creating a CryptoFileSystemImpl
 			@SuppressWarnings("deprecation") var masterkeyFilename = properties.masterkeyFilename();
 			if (masterkeyFilename != null && Files.exists(pathToVault.resolve(masterkeyFilename))) {
-				LOG.warn("Failed to read {}, but found {}}", vaultConfigFile, masterkeyFilename);
+				LOG.warn("Failed to read {}, but found {}", vaultConfigFile, masterkeyFilename);
 				throw new FileSystemNeedsMigrationException(pathToVault);
 			} else {
 				throw e;
diff --git a/src/main/java/org/cryptomator/cryptofs/CryptoPathMapper.java b/src/main/java/org/cryptomator/cryptofs/CryptoPathMapper.java
@@ -105,7 +105,7 @@ public CiphertextFileType getCiphertextFileType(CryptoPath cleartextPath) throws
 					return CiphertextFileType.FILE;
 				} else {
 					eventConsumer.accept(new BrokenFileNodeEvent(cleartextPath, ciphertextPath.getRawPath()));
-					LOG.warn("Did not find valid content inside of {}", ciphertextPath.getRawPath());
+					LOG.warn("Ciphertext directory {} has no clear type. Missing id files for dir, symlink or shortened file.", ciphertextPath.getRawPath());
 					throw new InvalidFileNodeException(cleartextPath.toString(), ciphertextPath.getRawPath().toString());
 				}
 			} else {
diff --git a/src/main/java/org/cryptomator/cryptofs/common/BackupHelper.java b/src/main/java/org/cryptomator/cryptofs/common/BackupHelper.java
@@ -58,7 +58,7 @@ public static Path attemptBackup(Path path) throws IOException {
 		} catch (AccessDeniedException | FileAlreadyExistsException e) {
 			assertSameContent(backupFilePath, path);
 		} catch (IOException e) {
-			LOG.warn("Failed to backup valid {} file.", fileToBackup);
+			LOG.warn("Failed to backup {}.", fileToBackup);
 		}
 		return backupFilePath;
 	}
@@ -71,7 +71,7 @@ private static void assertSameContent(final Path backupFile, final Path original
 				LOG.warn("Corrupt {} backup for: {}. Please replace it manually or unlock the vault on a writable storage device.", backupFile.getFileName(), backupFile);
 			}
 		} catch (IOException e) {
-			LOG.warn("Failed to compare valid %s with backup file.".formatted(backupFile), e);
+			LOG.warn("Failed to compare backup {} to original {} .", backupFile, originalFile, e);
 		}
 	}
 }
diff --git a/src/main/java/org/cryptomator/cryptofs/dir/BrokenDirectoryFilter.java b/src/main/java/org/cryptomator/cryptofs/dir/BrokenDirectoryFilter.java
@@ -30,11 +30,11 @@ public Stream<Node> process(Node node) {
 			try {
 				dirPath = cryptoPathMapper.resolveDirectory(dirFile).path();
 			} catch (IOException e) {
-				LOG.warn("Broken directory file: " + dirFile, e);
+				LOG.warn("Broken directory: Exception reading dir file {}.", dirFile, e);
 				return Stream.empty();
 			}
 			if (!Files.isDirectory(dirPath)) {
-				LOG.warn("Broken directory file {}. Directory {} does not exist.", dirFile, dirPath);
+				LOG.warn("Broken directory: Dir file {} points to non existing content directory {}.", dirFile, dirPath);
 				return Stream.empty();
 			}
 		}
diff --git a/src/main/java/org/cryptomator/cryptofs/dir/C9rConflictResolver.java b/src/main/java/org/cryptomator/cryptofs/dir/C9rConflictResolver.java
@@ -70,7 +70,7 @@ public Stream<Node> process(Node node) {
 				return resolveConflict(node, canonicalPath);
 			} catch (IOException e) {
 				eventConsumer.accept(new ConflictResolutionFailedEvent(cleartextPath.resolve(node.cleartextName), node.ciphertextPath, e));
-				LOG.error("Failed to resolve conflict for {}", node.ciphertextPath, e);
+				LOG.warn("Failed to resolve conflict for {}", node.ciphertextPath, e);
 				return Stream.empty();
 			}
 		}
@@ -133,7 +133,7 @@ private Stream<Node> renameConflictingFile(Path canonicalPath, Node conflicting)
 
 		assert alternativeCiphertextName.length() <= maxC9rFileNameLength;
 		if (Files.exists(alternativePath)) {
-			LOG.warn("Failed finding alternative name for {}. Keeping original name.", conflicting.ciphertextPath);
+			LOG.warn("Failed finding alternative name for {}: Alternative name {} already exists. Keeping original name.", conflicting.ciphertextPath, alternativePath);
 			return Stream.empty();
 		}
 
diff --git a/src/main/java/org/cryptomator/cryptofs/health/dirid/DirIdCheck.java b/src/main/java/org/cryptomator/cryptofs/health/dirid/DirIdCheck.java
@@ -111,23 +111,23 @@ private FileVisitResult visitDirFile(Path dirFile, BasicFileAttributes attrs) th
 			var parentDirName = dirFile.getParent().getFileName().toString();
 
 			if (!(parentDirName.endsWith(Constants.CRYPTOMATOR_FILE_SUFFIX) || parentDirName.endsWith(Constants.DEFLATED_FILE_SUFFIX))) {
-				LOG.warn("Encountered loose dir.c9r file.");
+				LOG.debug("Encountered loose dir.c9r file.");
 				resultCollector.accept(new LooseDirFile(dirFile));
 				return FileVisitResult.CONTINUE;
 			}
 
 			if (attrs.size() > Constants.MAX_DIR_ID_LENGTH) {
-				LOG.warn("Encountered dir.c9r file of size {}", attrs.size());
+				LOG.debug("Encountered obese dir.c9r file of size {}", attrs.size());
 				resultCollector.accept(new ObeseDirFile(dirFile, attrs.size()));
 			} else if (attrs.size() == 0) {
-				LOG.warn("Empty dir.c9r file at {}.", dirFile);
+				LOG.debug("Encountered empty dir.c9r file at {}.", dirFile);
 				resultCollector.accept(new EmptyDirFile(dirFile));
 			} else {
 				byte[] bytes = Files.readAllBytes(dirFile);
 				String dirId = new String(bytes, StandardCharsets.UTF_8);
 				if (dirIds.containsKey(dirId)) {
 					var otherFile = dirIds.get(dirId);
-					LOG.warn("Same directory ID used by {} and {}", dirFile, otherFile);
+					LOG.debug("Encountered same directory ID twice: Used by {} and {}.", dirFile, otherFile);
 					resultCollector.accept(new DirIdCollision(dirId, dirFile, otherFile));
 				} else {
 					dirIds.put(dirId, dirFile);
diff --git a/src/main/java/org/cryptomator/cryptofs/inuse/RealUseToken.java b/src/main/java/org/cryptomator/cryptofs/inuse/RealUseToken.java
@@ -105,7 +105,7 @@ private void runRefresh(int count) {
 				CONCURRENT_WRITES_SEMAPHORE.release();
 			}
 		} catch (InterruptedException e) {
-			LOG.debug("Interrupt during refresh of {}. Closing token.", filePath);
+			LOG.warn("Interrupt during refresh of {}. Closing token.", filePath);
 			close();
 			Thread.currentThread().interrupt();
 			throw new RuntimeException(e); //mark the completion stage as failed
diff --git a/src/main/java/org/cryptomator/cryptofs/migration/v7/MigratingVisitor.java b/src/main/java/org/cryptomator/cryptofs/migration/v7/MigratingVisitor.java
@@ -55,7 +55,7 @@ public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOEx
 				Path migratedFile = migration.migrate();
 				LOG.info("MOVED {} to {}", migration.getOldPath(), migratedFile);
 			} catch (FileAlreadyExistsException e) {
-				LOG.warn("Failed to migrate " + migration.getOldPath() + " due to FileAlreadyExistsException. This can be caused either by sync conflicts or because this file has already been migrated on a different machine.", e);
+				LOG.warn("Failed to migrate {} due to FileAlreadyExistsException. This can be caused either by sync conflicts or because this file has already been migrated on a different machine.", migration.getOldPath(), e);
 			}
 		}
 		migrationsInCurrentDir.clear();

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public Optional<FileStore> provideNativeFileStore(@PathToVault Path pathToVault)`
`39`	`39`	`try {`
`40`	`40`	`return Optional.of(Files.getFileStore(pathToVault));`
`41`	`41`	`} catch (IOException e) {`
`42`		`- LOG.warn("Failed to get file store for " + pathToVault, e);`
	`42`	`+ LOG.warn("Failed to get file store for {}", pathToVault, e);`
`43`	`43`	`return Optional.empty();`
`44`	`44`	`}`
`45`	`45`	`}`
`@@ -52,7 +52,7 @@ public Consumer<FilesystemEvent> provideFilesystemEventConsumer(CryptoFileSystem`
`52`	`52`	`try {`
`53`	`53`	`eventConsumer.accept(event);`
`54`	`54`	`} catch (RuntimeException e) {`
`55`		`- LOG.warn("Filesystem event consumer failed with exception when processing event {}", event, e);`
	`55`	`+ LOG.warn("Filesystem event consumer failed with exception when processing event {}", event.getClass().getSimpleName(), e);`
`56`	`56`	`}`
`57`	`57`	`};`
`58`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ public CiphertextFileType getCiphertextFileType(CryptoPath cleartextPath) throws`
`105`	`105`	`return CiphertextFileType.FILE;`
`106`	`106`	`} else {`
`107`	`107`	`eventConsumer.accept(new BrokenFileNodeEvent(cleartextPath, ciphertextPath.getRawPath()));`
`108`		`- LOG.warn("Did not find valid content inside of {}", ciphertextPath.getRawPath());`
	`108`	`+ LOG.warn("Ciphertext directory {} has no clear type. Missing id files for dir, symlink or shortened file.", ciphertextPath.getRawPath());`
`109`	`109`	`throw new InvalidFileNodeException(cleartextPath.toString(), ciphertextPath.getRawPath().toString());`
`110`	`110`	`}`
`111`	`111`	`} else {`