Quellcode durchsuchen

Fix order of password check and kezs fetching

pull/42/head
Kristijan Mitrovic vor 4 Jahren
Ursprung
Commit
a5938bc844
1 geänderte Dateien mit 2 neuen und 2 gelöschten Zeilen
  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 Datei anzeigen

@@ -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);


Laden…
Abbrechen
Speichern