mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-22 12:41:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

filter excluded filenames

Browse Source
This commit is contained in:
Jan-Peter Klein
2025-06-12 14:46:15 +02:00
parent d00d77b747
commit 8c9d75fe57
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/org/cryptomator/common/recovery/MasterkeyService.java
View File

@@ -18,6 +18,7 @@ import java.nio.file.Path;
import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom;
import java.util.Arrays;
import java.util.List;
import java.util.Optional;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -68,7 +69,11 @@ public final class MasterkeyService {
public static Optional<CryptorProvider.Scheme> detect(byte[] masterkey, Path vaultPath) {
try (Stream<Path> paths = Files.walk(vaultPath.resolve(DATA_DIR_NAME))) {
Optional<Path> c9rFile = paths.filter(p -> p.toString().endsWith(".c9r")).findFirst();
List<String> excludedFilenames = List.of("dirid.c9r", "dir.c9r");
Optional<Path> c9rFile = paths
.filter(p -> p.toString().endsWith(".c9r"))
.filter(p -> excludedFilenames.stream().noneMatch(p.toString()::endsWith))
.findFirst();
if (c9rFile.isEmpty()) {
LOG.info("No *.c9r file found in {}", vaultPath);
return Optional.empty();