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

Add tests and metrics for parsing invalid keys

Browse Source
This commit is contained in:
Jon Chambers
2024-02-21 12:16:14 -05:00
committed by Jon Chambers
parent 106d5e54c7
commit 29ef3f0b41
3 changed files with 69 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
service/src/test/java/org/whispersystems/textsecuregcm/util/ECPublicKeyAdapterTest.java
View File

@@ -5,23 +5,30 @@
package org.whispersystems.textsecuregcm.util;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonMappingException;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import java.util.Base64;
import java.util.stream.Stream;
import javax.annotation.Nullable;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
import org.signal.libsignal.protocol.ecc.Curve;
import org.signal.libsignal.protocol.ecc.ECPublicKey;
import javax.annotation.Nullable;
import java.util.Base64;
import java.util.stream.Stream;
import static org.junit.jupiter.api.Assertions.assertEquals;
class ECPublicKeyAdapterTest {
private static final String JSON_TEMPLATE = """
{
"publicKey": %s
}
""";
private static final ECPublicKey EC_PUBLIC_KEY = Curve.generateKeyPair().getPublicKey();
private record ECPublicKeyCarrier(@JsonSerialize(using = ECPublicKeyAdapter.Serializer.class)
@@ -38,16 +45,24 @@ class ECPublicKeyAdapterTest {
}
private static Stream<Arguments> deserialize() {
final String template = """
{
"publicKey": %s
}
""";
return Stream.of(
Arguments.of(String.format(template, "null"), null),
Arguments.of(String.format(template, "\"\""), null),
Arguments.of(String.format(template, "\"" + Base64.getEncoder().encodeToString(EC_PUBLIC_KEY.serialize()) + "\""), EC_PUBLIC_KEY)
Arguments.of(String.format(JSON_TEMPLATE, "null"), null),
Arguments.of(String.format(JSON_TEMPLATE, "\"\""), null),
Arguments.of(String.format(JSON_TEMPLATE, "\"" + Base64.getEncoder().encodeToString(EC_PUBLIC_KEY.serialize()) + "\""), EC_PUBLIC_KEY)
);
}
@ParameterizedTest
@MethodSource
void deserializeInvalidKey(final String json) {
assertThrows(JsonMappingException.class,
() -> SystemMapper.jsonMapper().readValue(json, ECPublicKeyCarrier.class));
}
private static Stream<String> deserializeInvalidKey() {
return Stream.of(
String.format(JSON_TEMPLATE, "\"" + Base64.getEncoder().encodeToString(new byte[12]) + "\""),
String.format(JSON_TEMPLATE, "\"This is not a legal base64-encoded string\"")
);
}
}

46
service/src/test/java/org/whispersystems/textsecuregcm/util/KEMPublicKeyAdapterTest.java
View File

@@ -5,23 +5,31 @@
package org.whispersystems.textsecuregcm.util;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonMappingException;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import java.util.Base64;
import java.util.stream.Stream;
import javax.annotation.Nullable;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
import org.signal.libsignal.protocol.kem.KEMKeyPair;
import org.signal.libsignal.protocol.kem.KEMKeyType;
import org.signal.libsignal.protocol.kem.KEMPublicKey;
import javax.annotation.Nullable;
import java.util.Base64;
import java.util.stream.Stream;
import static org.junit.jupiter.api.Assertions.*;
class KEMPublicKeyAdapterTest {
private static final String JSON_TEMPLATE = """
{
"publicKey": %s
}
""";
private static final KEMPublicKey KEM_PUBLIC_KEY = KEMKeyPair.generate(KEMKeyType.KYBER_1024).getPublicKey();
private record KEMPublicKeyCarrier(@JsonSerialize(using = KEMPublicKeyAdapter.Serializer.class)
@@ -38,17 +46,25 @@ class KEMPublicKeyAdapterTest {
}
private static Stream<Arguments> deserialize() {
final String template = """
{
"publicKey": %s
}
""";
return Stream.of(
Arguments.of(String.format(template, "null"), null),
Arguments.of(String.format(template, "\"\""), null),
Arguments.of(String.format(template, "\"" + Base64.getEncoder().encodeToString(KEM_PUBLIC_KEY.serialize()) + "\""),
KEM_PUBLIC_KEY)
Arguments.of(String.format(JSON_TEMPLATE, "null"), null),
Arguments.of(String.format(JSON_TEMPLATE, "\"\""), null),
Arguments.of(String.format(JSON_TEMPLATE,
"\"" + Base64.getEncoder().encodeToString(KEM_PUBLIC_KEY.serialize()) + "\""), KEM_PUBLIC_KEY)
);
}
@ParameterizedTest
@MethodSource
void deserializeInvalidKey(final String json) {
assertThrows(JsonMappingException.class,
() -> SystemMapper.jsonMapper().readValue(json, KEMPublicKeyAdapterTest.KEMPublicKeyCarrier.class));
}
private static Stream<String> deserializeInvalidKey() {
return Stream.of(
String.format(JSON_TEMPLATE, "\"" + Base64.getEncoder().encodeToString(new byte[12]) + "\""),
String.format(JSON_TEMPLATE, "\"This is not a legal base64-encoded string\"")
);
}
}