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

optimised imports and some pr mentioned changes

Browse Source
This commit is contained in:
Jan-Peter Klein
2025-06-11 13:49:12 +02:00
parent 6d47f28634
commit d00d77b747
2 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,25 +1,27 @@
package org.cryptomator.common.recovery;
import java.io.IOException;
import java.nio.ByteBuffer;
import java.nio.file.Files;
import java.nio.file.Path;
import java.security.SecureRandom;
import java.util.Arrays;
import java.util.NoSuchElementException;
import java.util.Optional;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.stream.Stream;
import org.cryptomator.common.vaults.Vault;
import org.cryptomator.cryptolib.api.*;
import org.cryptomator.cryptolib.api.AuthenticationFailedException;
import org.cryptomator.cryptolib.api.CryptoException;
import org.cryptomator.cryptolib.api.Cryptor;
import org.cryptomator.cryptolib.api.CryptorProvider;
import org.cryptomator.cryptolib.api.Masterkey;
import org.cryptomator.cryptolib.common.MasterkeyFileAccess;
import org.cryptomator.ui.recoverykey.RecoveryKeyFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javafx.beans.property.StringProperty;
import java.io.IOException;
import java.nio.ByteBuffer;
import java.nio.file.Files;
import java.nio.file.Path;
import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom;
import java.util.Arrays;
import java.util.Optional;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.stream.Stream;
import static org.cryptomator.common.Constants.MASTERKEY_FILENAME;
import static org.cryptomator.cryptofs.common.Constants.DATA_DIR_NAME;
@@ -38,13 +40,13 @@ public final class MasterkeyService {
return masterkeyFileAccess.load(masterkeyFilePath, password);
}
public static Optional<CryptorProvider.Scheme> validateRecoveryKeyAndDetectCombo(RecoveryKeyFactory recoveryKeyFactory, Vault vault, StringProperty recoveryKey, MasterkeyFileAccess masterkeyFileAccess, AtomicBoolean illegalArgumentExceptionOccurred) {
public static Optional<CryptorProvider.Scheme> validateRecoveryKeyAndDetectCombo(RecoveryKeyFactory recoveryKeyFactory, Vault vault, String recoveryKey, MasterkeyFileAccess masterkeyFileAccess, AtomicBoolean illegalArgumentExceptionOccurred) {
var tmpPass = UUID.randomUUID().toString();
try(RecoveryDirectory recoveryDirectory = RecoveryDirectory.create(vault.getPath())) {
var tempRecoveryPath = recoveryDirectory.getRecoveryPath();
recoverFromRecoveryKey(recoveryKey.get(), recoveryKeyFactory, tempRecoveryPath, tmpPass);
var masterkeyFilePath = tempRecoveryPath.resolve(MASTERKEY_FILENAME);
String tmpPass = UUID.randomUUID().toString();
try (RecoveryDirectory recoveryDirectory = RecoveryDirectory.create(vault.getPath())) {
Path tempRecoveryPath = recoveryDirectory.getRecoveryPath();
recoverFromRecoveryKey(recoveryKey, recoveryKeyFactory, tempRecoveryPath, tmpPass);
Path masterkeyFilePath = tempRecoveryPath.resolve(MASTERKEY_FILENAME);
try (Masterkey mk = load(masterkeyFileAccess, masterkeyFilePath, tmpPass)) {
return detect(mk.getEncoded(), vault.getPath());
@@ -62,17 +64,16 @@ public final class MasterkeyService {
illegalArgumentExceptionOccurred.set(true);
}
return Optional.empty();
}
public static Optional<CryptorProvider.Scheme> detect(byte[] masterkey, Path vaultPath) {
try (Stream<Path> paths = Files.walk(vaultPath.resolve(DATA_DIR_NAME))) {
Path c9rFile = paths.filter(p -> p.toString().endsWith(".c9r"))
.findFirst().orElse(null);
if (c9rFile == null) {
Optional<Path> c9rFile = paths.filter(p -> p.toString().endsWith(".c9r")).findFirst();
if (c9rFile.isEmpty()) {
LOG.info("No *.c9r file found in {}", vaultPath);
return Optional.empty();
}
return determineScheme(c9rFile, masterkey); // jetzt auch ein Optional
return determineScheme(c9rFile.get(), masterkey); //
} catch (IOException e) {
LOG.debug("Failed to inspect vault", e);
return Optional.empty();
@@ -83,19 +84,18 @@ public final class MasterkeyService {
try {
ByteBuffer header = ByteBuffer.wrap(Files.readAllBytes(c9rFile));
return Arrays.stream(CryptorProvider.Scheme.values())
.filter(s -> tryDecrypt(header, new Masterkey(masterkey), s))
.filter(s -> isDecryptable(header, new Masterkey(masterkey), s))
.findFirst();
} catch (IOException e) {
LOG.info("Failed to decrypt .c9r file", e);
return Optional.empty();
}
}
private static boolean tryDecrypt(ByteBuffer header, Masterkey masterkey, CryptorProvider.Scheme scheme) {
private static boolean isDecryptable(ByteBuffer header, Masterkey masterkey, CryptorProvider.Scheme scheme) {
try (Cryptor cryptor = CryptorProvider.forScheme(scheme).provide(masterkey, SecureRandom.getInstanceStrong())) {
cryptor.fileHeaderCryptor().decryptHeader(header.duplicate());
return true;
} catch (Exception e) {
} catch (AuthenticationFailedException | NoSuchAlgorithmException e) {
return false;
}
}

2
src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyValidateController.java
View File

@@ -140,7 +140,7 @@ public class RecoveryKeyValidateController implements FxController {
case RESTORE_VAULT_CONFIG -> {
AtomicBoolean illegalArgumentExceptionOccurred = new AtomicBoolean(false);
var combo = MasterkeyService.validateRecoveryKeyAndDetectCombo(
recoveryKeyFactory, vault, recoveryKey, masterkeyFileAccess, illegalArgumentExceptionOccurred);
recoveryKeyFactory, vault, recoveryKey.get(), masterkeyFileAccess, illegalArgumentExceptionOccurred);
combo.ifPresent(cipherCombo::set);
if (illegalArgumentExceptionOccurred.get()) {
recoveryKeyState.set(RecoveryKeyState.INVALID);