瀏覽代碼

Fix order of password check and kezs fetching

pull/42/head
Kristijan Mitrovic 4 年之前
父節點
當前提交
a5938bc844
共有 1 個檔案被更改,包括 2 行新增2 行删除
  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 查看文件

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


Loading…
取消
儲存