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

optimize exception handling

Browse Source 
exclude only dir.c9r
This commit is contained in:
Jan-Peter Klein
2025-07-10 18:45:58 +02:00
parent fc5ed9ecc0
commit 2067c5a33b
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,20 +52,19 @@ public final class MasterkeyService {
try (Masterkey mk = load(masterkeyFileAccess, masterkeyFilePath, tmpPass)) {
return detect(mk, vault.getPath());
} catch (IOException | CryptoException e) {
LOG.info("Recovery key validation failed", e);
return Optional.empty();
}
} catch (IOException | CryptoException e) {
LOG.info("Recovery key validation failed");
return Optional.empty();
}
return Optional.empty();
}
public static Optional<CryptorProvider.Scheme> detect(Masterkey masterkey, Path vaultPath) {
try (Stream<Path> paths = Files.walk(vaultPath.resolve(DATA_DIR_NAME))) {
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();
Optional<Path> c9rFile = paths //
.filter(p -> p.toString().endsWith(".c9r")) //
.filter(p -> !p.toString().equals("dir.c9r")) //
.findFirst();
if (c9rFile.isEmpty()) {
LOG.info("Unable to detect Crypto scheme: No *.c9r file found in {}", vaultPath);
return Optional.empty();
@@ -92,7 +91,7 @@ public final class MasterkeyService {
cryptor.fileHeaderCryptor().decryptHeader(headerBuf.duplicate());
LOG.debug("Detected Crypto scheme: {}", scheme);
return true;
} catch (CryptoException e) {
} catch (IllegalArgumentException | CryptoException e) {
LOG.debug("Could not decrypt with scheme: {}", scheme);
return false;
} catch (IOException | NoSuchAlgorithmException e) {