Browse Source

Fix order of password check and kezs fetching

pull/42/head
Kristijan Mitrovic 4 years ago
parent
commit
a5938bc844
1 changed files with 2 additions and 2 deletions
  1. +2
    -2
      bubble-server/src/main/java/bubble/resources/cloud/NetworkBackupKeysResource.java

+ 2
- 2
bubble-server/src/main/java/bubble/resources/cloud/NetworkBackupKeysResource.java View File

@@ -74,8 +74,8 @@ public class NetworkBackupKeysResource {
@NonNull @Context final ContainerRequest ctx, @NonNull @Context final ContainerRequest ctx,
@NonNull @PathParam("keysCode") final String keysCode, @NonNull @PathParam("keysCode") final String keysCode,
@Nullable final NameAndValue enc) { @Nullable final NameAndValue enc) {
final var networkKeys = keysService.retrieveKeys(keysCode);
final var encryptionKey = fetchAndCheckEncryptionKey(enc); final var encryptionKey = fetchAndCheckEncryptionKey(enc);
final var networkKeys = keysService.retrieveKeys(keysCode);
return ok(networkKeys.encrypt(encryptionKey)); return ok(networkKeys.encrypt(encryptionKey));
} }


@@ -84,8 +84,8 @@ public class NetworkBackupKeysResource {
@NonNull @PathParam("keysCode") final String keysCode, @NonNull @PathParam("keysCode") final String keysCode,
@NonNull @QueryParam("backupId") final String backupId, @NonNull @QueryParam("backupId") final String backupId,
@Nullable final NameAndValue enc) { @Nullable final NameAndValue enc) {
keysService.retrieveKeys(keysCode);
final var passphrase = fetchAndCheckEncryptionKey(enc); final var passphrase = fetchAndCheckEncryptionKey(enc);
keysService.retrieveKeys(keysCode);


final var backup = backupDAO.findByNetworkAndId(thisNetwork.getUuid(), backupId); final var backup = backupDAO.findByNetworkAndId(thisNetwork.getUuid(), backupId);
if (backup == null) throw notFoundEx(backupId); if (backup == null) throw notFoundEx(backupId);


Loading…
Cancel
Save