From 6ac2460eb0d1604e5f43139b0fe61e315a65b535 Mon Sep 17 00:00:00 2001 From: Jon Chambers Date: Wed, 21 Feb 2024 11:52:38 -0500 Subject: [PATCH] Drop the "key without version byte" counter --- .../textsecuregcm/util/ECPublicKeyAdapter.java | 11 ----------- .../textsecuregcm/util/ECPublicKeyAdapterTest.java | 3 +-- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/util/ECPublicKeyAdapter.java b/service/src/main/java/org/whispersystems/textsecuregcm/util/ECPublicKeyAdapter.java index c89e0b77d..b6437f9c7 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/util/ECPublicKeyAdapter.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/util/ECPublicKeyAdapter.java @@ -14,17 +14,11 @@ import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import java.io.IOException; import java.util.Base64; -import io.micrometer.core.instrument.Counter; -import io.micrometer.core.instrument.Metrics; import org.signal.libsignal.protocol.InvalidKeyException; import org.signal.libsignal.protocol.ecc.ECPublicKey; -import org.whispersystems.textsecuregcm.metrics.MetricsUtil; public class ECPublicKeyAdapter { - private static final Counter EC_PUBLIC_KEY_WITHOUT_VERSION_BYTE_COUNTER = - Metrics.counter(MetricsUtil.name(ECPublicKeyAdapter.class, "keyWithoutVersionByte")); - public static class Serializer extends JsonSerializer { @Override @@ -55,11 +49,6 @@ public class ECPublicKeyAdapter { try { return new ECPublicKey(ecPublicKeyBytes); } catch (final InvalidKeyException e) { - if (ecPublicKeyBytes.length == ECPublicKey.KEY_SIZE - 1) { - EC_PUBLIC_KEY_WITHOUT_VERSION_BYTE_COUNTER.increment(); - return ECPublicKey.fromPublicKeyBytes(ecPublicKeyBytes); - } - throw new JsonParseException(parser, "Could not interpret identity key bytes as an EC public key", e); } } diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/util/ECPublicKeyAdapterTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/util/ECPublicKeyAdapterTest.java index ce17dd633..868971f65 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/util/ECPublicKeyAdapterTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/util/ECPublicKeyAdapterTest.java @@ -47,8 +47,7 @@ class ECPublicKeyAdapterTest { 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(template, "\"" + Base64.getEncoder().encodeToString(EC_PUBLIC_KEY.getPublicKeyBytes()) + "\""), EC_PUBLIC_KEY) + Arguments.of(String.format(template, "\"" + Base64.getEncoder().encodeToString(EC_PUBLIC_KEY.serialize()) + "\""), EC_PUBLIC_KEY) ); } }