Signal/Signal-Server
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Server synced 2026-04-22 07:58:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Key transparency search and monitor endpoints

Browse Source
This commit is contained in:
Katherine
2024-08-12 13:14:42 -07:00
committed by GitHub
parent 4349ceaf0e
commit 84c329e911
24 changed files with 1525 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
service/src/test/java/org/whispersystems/textsecuregcm/util/E164Test.java
View File

@@ -9,6 +9,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
import java.lang.reflect.Method;
import java.util.Optional;
import java.util.Set;
import javax.validation.ConstraintViolation;
import javax.validation.Validation;
@@ -31,14 +32,18 @@ public class E164Test {
@E164
private final String number;
private Data(final String number) {
@E164
private final Optional<String> optionalNumber;
private Data(final String number, final Optional<String> optionalNumber) {
this.number = number;
this.optionalNumber = optionalNumber;
}
}
private static class Methods {
public void foo(@E164 final String number) {
public void foo(@E164 final String number, @E164 final Optional<String> optionalNumber) {
// noop
}
@@ -46,36 +51,41 @@ public class E164Test {
public String bar() {
return "nevermind";
}
@E164
public Optional<String> barOptionalString() {
return Optional.of("nevermind");
}
}
private record Rec(@E164 String number) {
private record Rec(@E164 String number, @E164 Optional<String> optionalNumber) {
}
@Test
public void testRecord() throws Exception {
checkNoViolations(new Rec(E164_VALID));
checkHasViolations(new Rec(E164_INVALID));
checkHasViolations(new Rec(EMPTY));
public void testRecord() {
checkNoViolations(new Rec(E164_VALID, Optional.of(E164_VALID)));
checkHasViolations(new Rec(E164_INVALID, Optional.of(E164_INVALID)));
checkHasViolations(new Rec(EMPTY, Optional.of(EMPTY)));
}
@Test
public void testClassField() throws Exception {
checkNoViolations(new Data(E164_VALID));
checkHasViolations(new Data(E164_INVALID));
checkHasViolations(new Data(EMPTY));
public void testClassField() {
checkNoViolations(new Data(E164_VALID, Optional.of(E164_VALID)));
checkHasViolations(new Data(E164_INVALID, Optional.of(E164_INVALID)));
checkHasViolations(new Data(EMPTY, Optional.of(EMPTY)));
}
@Test
public void testParameters() throws Exception {
final Methods m = new Methods();
final Method foo = Methods.class.getMethod("foo", String.class);
final Method foo = Methods.class.getMethod("foo", String.class, Optional.class);
final Set<ConstraintViolation<Methods>> violations1 =
VALIDATOR.forExecutables().validateParameters(m, foo, new Object[] {E164_VALID});
VALIDATOR.forExecutables().validateParameters(m, foo, new Object[] {E164_VALID, Optional.of(E164_VALID)});
final Set<ConstraintViolation<Methods>> violations2 =
VALIDATOR.forExecutables().validateParameters(m, foo, new Object[] {E164_INVALID});
VALIDATOR.forExecutables().validateParameters(m, foo, new Object[] {E164_INVALID, Optional.of(E164_INVALID)});
final Set<ConstraintViolation<Methods>> violations3 =
VALIDATOR.forExecutables().validateParameters(m, foo, new Object[] {EMPTY});
VALIDATOR.forExecutables().validateParameters(m, foo, new Object[] {EMPTY, Optional.of(EMPTY)});
assertTrue(violations1.isEmpty());
assertFalse(violations2.isEmpty());
@@ -99,6 +109,23 @@ public class E164Test {
assertFalse(violations3.isEmpty());
}
@Test
public void testOptionalReturnValue() throws Exception {
final Methods m = new Methods();
final Method bar = Methods.class.getMethod("barOptionalString");
final Set<ConstraintViolation<Methods>> violations1 =
VALIDATOR.forExecutables().validateReturnValue(m, bar, Optional.of(E164_VALID));
final Set<ConstraintViolation<Methods>> violations2 =
VALIDATOR.forExecutables().validateReturnValue(m, bar, Optional.of(E164_INVALID));
final Set<ConstraintViolation<Methods>> violations3 =
VALIDATOR.forExecutables().validateReturnValue(m, bar, Optional.of(EMPTY));
assertTrue(violations1.isEmpty());
assertFalse(violations2.isEmpty());
assertFalse(violations3.isEmpty());
}
private static <T> void checkNoViolations(final T object) {
final Set<ConstraintViolation<T>> violations = VALIDATOR.validate(object);
assertTrue(violations.isEmpty());

55
service/src/test/java/org/whispersystems/textsecuregcm/util/ProtobufAdapterTest.java Normal file
View File

@@ -0,0 +1,55 @@
/*
* Copyright 2024 Signal Messenger, LLC
* SPDX-License-Identifier: AGPL-3.0-only
*/
package org.whispersystems.textsecuregcm.util;
import com.fasterxml.jackson.core.JsonParseException;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.google.protobuf.ByteString;
import katie.FullTreeHead;
import katie.TreeHead;
import org.junit.jupiter.api.Test;
import java.util.List;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
public class ProtobufAdapterTest {
private record FullTreeHeadTestRecord(@JsonSerialize(using = FullTreeHeadProtobufAdapter.Serializer.class)
@JsonDeserialize(using = FullTreeHeadProtobufAdapter.Deserializer.class)
FullTreeHead fullTreeHead) {
}
@Test
void serializeDeserialize() throws JsonProcessingException {
final TreeHead treeHead = TreeHead.newBuilder()
.setTreeSize(10)
.setTimestamp(12345)
.setSignature(ByteString.copyFrom(TestRandomUtil.nextBytes(16)))
.build();
final FullTreeHead fullTreeHead = FullTreeHead.newBuilder()
.setTreeHead(treeHead)
.addAllConsistency(List.of(ByteString.copyFrom(TestRandomUtil.nextBytes(20))))
.build();
final FullTreeHeadTestRecord expectedTestRecord = new FullTreeHeadTestRecord(fullTreeHead);
// Serialize to JSON
final String json = SystemMapper.jsonMapper().writeValueAsString(expectedTestRecord);
// Deserialize back to record
assertEquals(expectedTestRecord, SystemMapper.jsonMapper().readValue(json, FullTreeHeadTestRecord.class));
}
@Test
void deserializeFailure() {
assertThrows(JsonParseException.class,
() -> SystemMapper.jsonMapper().readValue("this is not valid json", FullTreeHeadTestRecord.class));
}
}