diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/storage/Accounts.java b/service/src/main/java/org/whispersystems/textsecuregcm/storage/Accounts.java index 507946a79..e26d62076 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/storage/Accounts.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/storage/Accounts.java @@ -10,7 +10,6 @@ import static java.util.Objects.requireNonNull; import com.fasterxml.jackson.core.JsonProcessingException; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Throwables; -import io.micrometer.core.instrument.Counter; import io.micrometer.core.instrument.Metrics; import io.micrometer.core.instrument.Timer; import java.io.IOException; @@ -18,7 +17,6 @@ import java.nio.ByteBuffer; import java.time.Clock; import java.time.Duration; import java.util.ArrayList; -import java.util.Base64; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -32,8 +30,6 @@ import java.util.function.Predicate; import java.util.function.Supplier; import java.util.stream.Collectors; import javax.annotation.Nonnull; - -import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.whispersystems.textsecuregcm.util.AttributeValues; @@ -78,9 +74,6 @@ public class Accounts extends AbstractDynamoDbStore { private static final Timer GET_ALL_FROM_OFFSET_TIMER = Metrics.timer(name(Accounts.class, "getAllFromOffset")); private static final Timer DELETE_TIMER = Metrics.timer(name(Accounts.class, "delete")); - private static final Counter INVALID_ACI_IDENTITY_KEY_COUNTER = Metrics.counter(name(Accounts.class, "invalidIdentityKey"), "identity", "aci"); - private static final Counter INVALID_PNI_IDENTITY_KEY_COUNTER = Metrics.counter(name(Accounts.class, "invalidIdentityKey"), "identity", "pni"); - private static final String CONDITIONAL_CHECK_FAILED = "ConditionalCheckFailed"; private static final String TRANSACTION_CONFLICT = "TransactionConflict"; @@ -866,9 +859,6 @@ public class Accounts extends AbstractDynamoDbStore { .map(AttributeValue::bool) .orElse(false)); - checkIdentityKey(account.getIdentityKey(), INVALID_ACI_IDENTITY_KEY_COUNTER); - checkIdentityKey(account.getPhoneNumberIdentityKey(), INVALID_PNI_IDENTITY_KEY_COUNTER); - return account; } catch (final IOException e) { @@ -876,16 +866,6 @@ public class Accounts extends AbstractDynamoDbStore { } } - private static void checkIdentityKey(final String identityKey, final Counter invalidIdentityKeyCounter) { - if (StringUtils.isNotBlank(identityKey)) { - try { - Base64.getDecoder().decode(identityKey); - } catch (final IllegalArgumentException e) { - invalidIdentityKeyCounter.increment(); - } - } - } - private static boolean conditionalCheckFailed(final CancellationReason reason) { return CONDITIONAL_CHECK_FAILED.equals(reason.code()); }