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

fixes #23

Browse Source
This commit is contained in:
Sebastian Stenzel
2015-02-19 19:50:03 +01:00
parent 19bc1ed569
commit 5569ecbfc7
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
main/crypto-aes/src/main/java/org/cryptomator/crypto/aes256/FileNamingConventions.java
View File

@@ -21,6 +21,11 @@ interface FileNamingConventions {
*/
String MASTERKEY_FILE_EXT = ".masterkey.json";
/**
* Additional extension for masterkey backup files.
*/
String MASTERKEY_BACKUP_FILE_EXT = ".bkup";
/**
* How to encode the encrypted file names safely. Base32 uses only alphanumeric characters and is case-insensitive.
*/

7
main/ui/src/main/java/org/cryptomator/ui/UnlockController.java
View File

@@ -14,6 +14,7 @@ import java.net.URL;
import java.nio.file.DirectoryStream;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.StandardCopyOption;
import java.nio.file.StandardOpenOption;
import java.util.ResourceBundle;
import java.util.concurrent.ExecutorService;
@@ -39,9 +40,9 @@ import org.cryptomator.crypto.exceptions.UnsupportedKeyLengthException;
import org.cryptomator.crypto.exceptions.WrongPasswordException;
import org.cryptomator.ui.controls.SecPasswordField;
import org.cryptomator.ui.model.Vault;
import org.cryptomator.ui.util.DeferredCloser;
import org.cryptomator.ui.util.FXThreads;
import org.cryptomator.ui.util.MasterKeyFilter;
import org.cryptomator.ui.util.DeferredCloser;
import org.cryptomator.webdav.WebDavServer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -118,7 +119,9 @@ public class UnlockController implements Initializable {
private void didClickUnlockButton(ActionEvent event) {
setControlsDisabled(true);
final String masterKeyFileName = usernameBox.getValue() + Aes256Cryptor.MASTERKEY_FILE_EXT;
final String masterKeyBackupFileName = masterKeyFileName + Aes256Cryptor.MASTERKEY_BACKUP_FILE_EXT;
final Path masterKeyPath = directory.getPath().resolve(masterKeyFileName);
final Path masterKeyBackupPath = directory.getPath().resolve(masterKeyBackupFileName);
final CharSequence password = passwordField.getCharacters();
InputStream masterKeyInputStream = null;
try {
@@ -131,6 +134,8 @@ public class UnlockController implements Initializable {
directory.getCryptor().swipeSensitiveData();
return;
}
// at this point we know for sure, that the masterkey can be decrypted, so lets make a backup:
Files.copy(masterKeyPath, masterKeyBackupPath, StandardCopyOption.REPLACE_EXISTING);
directory.setUnlocked(true);
final Future<Boolean> futureMount = exec.submit(() -> directory.mount(closer));
FXThreads.runOnMainThreadWhenFinished(exec, futureMount, this::didUnlockAndMount);