MirrorMirror
/
Signal-Server
mirror of https://github.com/signalapp/Signal-Server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix casing in `GET /v1/archives/auth`

This commit is contained in:
Ravi Khadiwala 2024-10-30 12:42:06 -05:00 committed by Jon Chambers
parent 4af576668c
commit 3bb1eab48c
2 changed files with 38 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
service/src/main/java/org/whispersystems/textsecuregcm/controllers/ArchiveController.java
View File

@ -5,11 +5,14 @@
package org.whispersystems.textsecuregcm.controllers;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.JsonDeserializer;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.google.common.annotations.VisibleForTesting;
import io.dropwizard.auth.Auth;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
@ -26,11 +29,13 @@ import java.time.Instant;
import java.util.Arrays;
import java.util.Base64;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Optional;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionStage;
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import javax.validation.Valid;
import javax.validation.constraints.Max;
@ -131,7 +136,8 @@ public class ArchiveController {
@Valid @NotNull final SetBackupIdRequest setBackupIdRequest) throws RateLimitExceededException {
return this.backupAuthManager
.commitBackupId(account.getAccount(), setBackupIdRequest.messagesBackupAuthCredentialRequest, setBackupIdRequest.mediaBackupAuthCredentialRequest)
.commitBackupId(account.getAccount(), setBackupIdRequest.messagesBackupAuthCredentialRequest,
setBackupIdRequest.mediaBackupAuthCredentialRequest)
.thenApply(Util.ASYNC_EMPTY_RESPONSE);
}
@ -182,7 +188,30 @@ public class ArchiveController {
public record BackupAuthCredentialsResponse(
@Schema(description = "A map of credential types to lists of BackupAuthCredentials and their validity periods")
Map<BackupCredentialType, List<BackupAuthCredential>> credentials) {
Map<CredentialType, List<BackupAuthCredential>> credentials) {
public enum CredentialType {
MESSAGES,
MEDIA;
@JsonValue
public String toValue() {
return this.name().toLowerCase(Locale.ROOT);
}
@JsonCreator
public static CredentialType fromValue(String v) {
return v == null ? null : CredentialType.valueOf(v.toUpperCase(Locale.ROOT));
}
@VisibleForTesting
static CredentialType fromLibsignalType(BackupCredentialType backupCredentialType) {
return switch (backupCredentialType) {
case MESSAGES -> BackupAuthCredentialsResponse.CredentialType.MESSAGES;
case MEDIA -> BackupAuthCredentialsResponse.CredentialType.MEDIA;
};
}
}
public record BackupAuthCredential(
@Schema(description = "A BackupAuthCredential, encoded in standard padded base64")
@ -231,7 +260,10 @@ public class ArchiveController {
credential.redemptionTime().getEpochSecond()))
.toList())))
.toArray(CompletableFuture[]::new))
.thenApply(ignored -> new BackupAuthCredentialsResponse(credentialsByType));
.thenApply(ignored -> new BackupAuthCredentialsResponse(credentialsByType.entrySet().stream()
.collect(Collectors.toMap(
e -> BackupAuthCredentialsResponse.CredentialType.fromLibsignalType(e.getKey()),
Map.Entry::getValue))));
}

4
service/src/test/java/org/whispersystems/textsecuregcm/controllers/ArchiveControllerTest.java
View File

@ -310,7 +310,9 @@ public class ArchiveControllerTest {
.header("Authorization", AuthHelper.getAuthHeader(AuthHelper.VALID_UUID, AuthHelper.VALID_PASSWORD))
.get(ArchiveController.BackupAuthCredentialsResponse.class);
expectedCredentialsByType.forEach((credentialType, expectedCredentials) -> {
expectedCredentialsByType.forEach((libsignalCredentialType, expectedCredentials) -> {
final ArchiveController.BackupAuthCredentialsResponse.CredentialType credentialType =
ArchiveController.BackupAuthCredentialsResponse.CredentialType.fromLibsignalType(libsignalCredentialType);
assertThat(credentialResponse.credentials().get(credentialType)).size().isEqualTo(expectedCredentials.size());
assertThat(credentialResponse.credentials().get(credentialType).getFirst().redemptionTime())
.isEqualTo(start.getEpochSecond());