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