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

Conclude `ReportMessageManager` ACI migration

This commit is contained in:
Chris Eager 2022-03-25 18:16:00 -07:00 committed by Chris Eager
parent c45ff61954
commit 0445adcac3
2 changed files with 9 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
service/src/main/java/org/whispersystems/textsecuregcm/storage/ReportMessageManager.java
View File

@ -1,9 +1,11 @@
/*
* Copyright 2021-2022 Signal Messenger, LLC
* SPDX-License-Identifier: AGPL-3.0-only
*/
package org.whispersystems.textsecuregcm.storage; package org.whispersystems.textsecuregcm.storage;
import static org.whispersystems.textsecuregcm.metrics.MetricsUtil.name;
import io.lettuce.core.RedisException; import io.lettuce.core.RedisException;
import io.micrometer.core.instrument.Metrics;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.security.MessageDigest; import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
@ -20,8 +22,6 @@ import org.whispersystems.textsecuregcm.util.UUIDUtil;
public class ReportMessageManager { public class ReportMessageManager {
private static final String MIGRATION_COUNTER_NAME = name(ReportMessageManager.class, "migration");
private final ReportMessageDynamoDb reportMessageDynamoDb; private final ReportMessageDynamoDb reportMessageDynamoDb;
private final FaultTolerantRedisCluster rateLimitCluster; private final FaultTolerantRedisCluster rateLimitCluster;
@ -59,21 +59,11 @@ public class ReportMessageManager {
public void report(Optional<String> sourceNumber, Optional<UUID> sourceAci, Optional<UUID> sourcePni, public void report(Optional<String> sourceNumber, Optional<UUID> sourceAci, Optional<UUID> sourcePni,
UUID messageGuid, UUID reporterUuid) { UUID messageGuid, UUID reporterUuid) {
// TODO sourceNumber can be removed after 2022-04-15 final boolean found = sourceAci.map(uuid -> reportMessageDynamoDb.remove(hash(messageGuid, uuid.toString())))
final boolean foundByNumber = sourceNumber.map(number -> reportMessageDynamoDb.remove(hash(messageGuid, number)))
.orElse(false); .orElse(false);
final boolean foundByAci = sourceAci.map(uuid -> reportMessageDynamoDb.remove(hash(messageGuid, uuid.toString()))). if (found) {
orElse(false);
if (foundByNumber || foundByAci) {
rateLimitCluster.useCluster(connection -> { rateLimitCluster.useCluster(connection -> {
sourceNumber.ifPresent(number -> {
final String reportedSenderKey = getReportedSenderKey(number);
connection.sync().pfadd(reportedSenderKey, reporterUuid.toString());
connection.sync().expire(reportedSenderKey, counterTtl.toSeconds());
});
sourcePni.ifPresent(pni -> { sourcePni.ifPresent(pni -> {
final String reportedSenderKey = getReportedSenderPniKey(pni); final String reportedSenderKey = getReportedSenderPniKey(pni);
connection.sync().pfadd(reportedSenderKey, reporterUuid.toString()); connection.sync().pfadd(reportedSenderKey, reporterUuid.toString());
@ -96,15 +86,6 @@ public class ReportMessageManager {
} }
})); }));
} }
Metrics.counter(
MIGRATION_COUNTER_NAME,
"foundByNumber", String.valueOf(foundByNumber),
"foundByAci", String.valueOf(foundByAci),
"sourceAciPresent", String.valueOf(sourceAci.isPresent()),
"sourcePniPresent", String.valueOf(sourcePni.isPresent()),
"sourceNumberPresent", String.valueOf(sourceNumber.isPresent())
).increment();
} }
/** /**
@ -120,11 +101,7 @@ public class ReportMessageManager {
return rateLimitCluster.withCluster( return rateLimitCluster.withCluster(
connection -> connection ->
Math.max( Math.max(
Math.max( connection.sync().pfcount(getReportedSenderPniKey(account.getPhoneNumberIdentifier())).intValue(),
// TODO number can be removed after 2022-04-15
connection.sync().pfcount(getReportedSenderKey(account.getNumber())).intValue(),
connection.sync().pfcount(getReportedSenderPniKey(account.getPhoneNumberIdentifier()))
.intValue()),
connection.sync().pfcount(getReportedSenderAciKey(account.getUuid())).intValue())); connection.sync().pfcount(getReportedSenderAciKey(account.getUuid())).intValue()));
} catch (final RedisException e) { } catch (final RedisException e) {
return 0; return 0;
@ -145,10 +122,6 @@ public class ReportMessageManager {
return sha256.digest(); return sha256.digest();
} }
private static String getReportedSenderKey(final String senderNumber) {
return "reported_number::" + senderNumber;
}
private static String getReportedSenderAciKey(final UUID aci) { private static String getReportedSenderAciKey(final UUID aci) {
return "reported_account::" + aci.toString(); return "reported_account::" + aci.toString();
} }

2
service/src/test/java/org/whispersystems/textsecuregcm/storage/ReportMessageManagerTest.java
View File

@ -126,7 +126,7 @@ class ReportMessageManagerTest {
assertEquals(0, reportMessageManager.getRecentReportCount(sourceAccount)); assertEquals(0, reportMessageManager.getRecentReportCount(sourceAccount));
for (int i = 0; i < 100; i++) { for (int i = 0; i < 100; i++) {
reportMessageManager.report(Optional.of(sourceNumber), Optional.empty(), Optional.of(sourcePni), reportMessageManager.report(Optional.empty(), Optional.of(sourceAci), Optional.of(sourcePni),
messageGuid, UUID.randomUUID()); messageGuid, UUID.randomUUID());
} }