From a5938bc8449b876d29963bcd7b0437e72318057d Mon Sep 17 00:00:00 2001 From: Kristijan Mitrovic Date: Sun, 16 Aug 2020 01:08:54 +0200 Subject: [PATCH] Fix order of password check and kezs fetching --- .../bubble/resources/cloud/NetworkBackupKeysResource.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bubble-server/src/main/java/bubble/resources/cloud/NetworkBackupKeysResource.java b/bubble-server/src/main/java/bubble/resources/cloud/NetworkBackupKeysResource.java index 59c0a45c..db032024 100644 --- a/bubble-server/src/main/java/bubble/resources/cloud/NetworkBackupKeysResource.java +++ b/bubble-server/src/main/java/bubble/resources/cloud/NetworkBackupKeysResource.java @@ -74,8 +74,8 @@ public class NetworkBackupKeysResource { @NonNull @Context final ContainerRequest ctx, @NonNull @PathParam("keysCode") final String keysCode, @Nullable final NameAndValue enc) { - final var networkKeys = keysService.retrieveKeys(keysCode); final var encryptionKey = fetchAndCheckEncryptionKey(enc); + final var networkKeys = keysService.retrieveKeys(keysCode); return ok(networkKeys.encrypt(encryptionKey)); } @@ -84,8 +84,8 @@ public class NetworkBackupKeysResource { @NonNull @PathParam("keysCode") final String keysCode, @NonNull @QueryParam("backupId") final String backupId, @Nullable final NameAndValue enc) { - keysService.retrieveKeys(keysCode); final var passphrase = fetchAndCheckEncryptionKey(enc); + keysService.retrieveKeys(keysCode); final var backup = backupDAO.findByNetworkAndId(thisNetwork.getUuid(), backupId); if (backup == null) throw notFoundEx(backupId);