Estimate message byte limit exceeded error count
This commit is contained in:
parent
e003197f77
commit
888879dfb2
|
@ -35,6 +35,7 @@ import org.whispersystems.textsecuregcm.configuration.GcpAttachmentsConfiguratio
|
||||||
import org.whispersystems.textsecuregcm.configuration.GenericZkConfig;
|
import org.whispersystems.textsecuregcm.configuration.GenericZkConfig;
|
||||||
import org.whispersystems.textsecuregcm.configuration.HCaptchaConfiguration;
|
import org.whispersystems.textsecuregcm.configuration.HCaptchaConfiguration;
|
||||||
import org.whispersystems.textsecuregcm.configuration.MaxDeviceConfiguration;
|
import org.whispersystems.textsecuregcm.configuration.MaxDeviceConfiguration;
|
||||||
|
import org.whispersystems.textsecuregcm.configuration.MessageByteLimitCardinalityEstimatorConfiguration;
|
||||||
import org.whispersystems.textsecuregcm.configuration.MessageCacheConfiguration;
|
import org.whispersystems.textsecuregcm.configuration.MessageCacheConfiguration;
|
||||||
import org.whispersystems.textsecuregcm.configuration.OneTimeDonationConfiguration;
|
import org.whispersystems.textsecuregcm.configuration.OneTimeDonationConfiguration;
|
||||||
import org.whispersystems.textsecuregcm.configuration.PaymentsServiceConfiguration;
|
import org.whispersystems.textsecuregcm.configuration.PaymentsServiceConfiguration;
|
||||||
|
@ -288,6 +289,11 @@ public class WhisperServerConfiguration extends Configuration {
|
||||||
@JsonProperty
|
@JsonProperty
|
||||||
private ClientReleaseConfiguration clientRelease = new ClientReleaseConfiguration(Duration.ofHours(4));
|
private ClientReleaseConfiguration clientRelease = new ClientReleaseConfiguration(Duration.ofHours(4));
|
||||||
|
|
||||||
|
@Valid
|
||||||
|
@NotNull
|
||||||
|
@JsonProperty
|
||||||
|
private MessageByteLimitCardinalityEstimatorConfiguration messageByteLimitCardinalityEstimator = new MessageByteLimitCardinalityEstimatorConfiguration(Duration.ofDays(1));
|
||||||
|
|
||||||
public AdminEventLoggingConfiguration getAdminEventLoggingConfiguration() {
|
public AdminEventLoggingConfiguration getAdminEventLoggingConfiguration() {
|
||||||
return adminEventLoggingConfiguration;
|
return adminEventLoggingConfiguration;
|
||||||
}
|
}
|
||||||
|
@ -478,4 +484,8 @@ public class WhisperServerConfiguration extends Configuration {
|
||||||
public ClientReleaseConfiguration getClientReleaseConfiguration() {
|
public ClientReleaseConfiguration getClientReleaseConfiguration() {
|
||||||
return clientRelease;
|
return clientRelease;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public MessageByteLimitCardinalityEstimatorConfiguration getMessageByteLimitCardinalityEstimator() {
|
||||||
|
return messageByteLimitCardinalityEstimator;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -123,6 +123,7 @@ import org.whispersystems.textsecuregcm.filters.RequestStatisticsFilter;
|
||||||
import org.whispersystems.textsecuregcm.filters.TimestampResponseFilter;
|
import org.whispersystems.textsecuregcm.filters.TimestampResponseFilter;
|
||||||
import org.whispersystems.textsecuregcm.grpc.KeysGrpcService;
|
import org.whispersystems.textsecuregcm.grpc.KeysGrpcService;
|
||||||
import org.whispersystems.textsecuregcm.grpc.KeysAnonymousGrpcService;
|
import org.whispersystems.textsecuregcm.grpc.KeysAnonymousGrpcService;
|
||||||
|
import org.whispersystems.textsecuregcm.limits.CardinalityEstimator;
|
||||||
import org.whispersystems.textsecuregcm.limits.PushChallengeManager;
|
import org.whispersystems.textsecuregcm.limits.PushChallengeManager;
|
||||||
import org.whispersystems.textsecuregcm.limits.RateLimitChallengeManager;
|
import org.whispersystems.textsecuregcm.limits.RateLimitChallengeManager;
|
||||||
import org.whispersystems.textsecuregcm.limits.RateLimiters;
|
import org.whispersystems.textsecuregcm.limits.RateLimiters;
|
||||||
|
@ -571,6 +572,11 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
|
||||||
final TurnTokenGenerator turnTokenGenerator = new TurnTokenGenerator(dynamicConfigurationManager,
|
final TurnTokenGenerator turnTokenGenerator = new TurnTokenGenerator(dynamicConfigurationManager,
|
||||||
config.getTurnSecretConfiguration().secret().value());
|
config.getTurnSecretConfiguration().secret().value());
|
||||||
|
|
||||||
|
final CardinalityEstimator messageByteLimitCardinalityEstimator = new CardinalityEstimator(
|
||||||
|
rateLimitersCluster,
|
||||||
|
"message_byte_limit",
|
||||||
|
config.getMessageByteLimitCardinalityEstimator().period());
|
||||||
|
|
||||||
RecaptchaClient recaptchaClient = new RecaptchaClient(
|
RecaptchaClient recaptchaClient = new RecaptchaClient(
|
||||||
config.getRecaptchaConfiguration().projectPath(),
|
config.getRecaptchaConfiguration().projectPath(),
|
||||||
useSecondaryCredentialsJson
|
useSecondaryCredentialsJson
|
||||||
|
@ -755,9 +761,10 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
|
||||||
new DirectoryV2Controller(directoryV2CredentialsGenerator),
|
new DirectoryV2Controller(directoryV2CredentialsGenerator),
|
||||||
new DonationController(clock, zkReceiptOperations, redeemedReceiptsManager, accountsManager, config.getBadges(),
|
new DonationController(clock, zkReceiptOperations, redeemedReceiptsManager, accountsManager, config.getBadges(),
|
||||||
ReceiptCredentialPresentation::new),
|
ReceiptCredentialPresentation::new),
|
||||||
new MessageController(rateLimiters, messageSender, receiptSender, accountsManager, deletedAccounts,
|
new MessageController(rateLimiters, messageByteLimitCardinalityEstimator, messageSender, receiptSender,
|
||||||
messagesManager, pushNotificationManager, reportMessageManager, multiRecipientMessageExecutor,
|
accountsManager, deletedAccounts, messagesManager, pushNotificationManager, reportMessageManager,
|
||||||
messageDeliveryScheduler, reportSpamTokenProvider, clientReleaseManager, dynamicConfigurationManager),
|
multiRecipientMessageExecutor, messageDeliveryScheduler, reportSpamTokenProvider, clientReleaseManager,
|
||||||
|
dynamicConfigurationManager),
|
||||||
new PaymentsController(currencyManager, paymentsCredentialsGenerator),
|
new PaymentsController(currencyManager, paymentsCredentialsGenerator),
|
||||||
new ProfileController(clock, rateLimiters, accountsManager, profilesManager, dynamicConfigurationManager,
|
new ProfileController(clock, rateLimiters, accountsManager, profilesManager, dynamicConfigurationManager,
|
||||||
profileBadgeConverter, config.getBadges(), cdnS3Client, profileCdnPolicyGenerator, profileCdnPolicySigner,
|
profileBadgeConverter, config.getBadges(), cdnS3Client, profileCdnPolicyGenerator, profileCdnPolicySigner,
|
||||||
|
|
|
@ -0,0 +1,11 @@
|
||||||
|
/*
|
||||||
|
* Copyright 2023 Signal Messenger, LLC
|
||||||
|
* SPDX-License-Identifier: AGPL-3.0-only
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.whispersystems.textsecuregcm.configuration;
|
||||||
|
|
||||||
|
import javax.validation.constraints.NotNull;
|
||||||
|
import java.time.Duration;
|
||||||
|
|
||||||
|
public record MessageByteLimitCardinalityEstimatorConfiguration(@NotNull Duration period) {}
|
|
@ -85,6 +85,7 @@ import org.whispersystems.textsecuregcm.entities.SpamReport;
|
||||||
import org.whispersystems.textsecuregcm.entities.StaleDevices;
|
import org.whispersystems.textsecuregcm.entities.StaleDevices;
|
||||||
import org.whispersystems.textsecuregcm.identity.AciServiceIdentifier;
|
import org.whispersystems.textsecuregcm.identity.AciServiceIdentifier;
|
||||||
import org.whispersystems.textsecuregcm.identity.ServiceIdentifier;
|
import org.whispersystems.textsecuregcm.identity.ServiceIdentifier;
|
||||||
|
import org.whispersystems.textsecuregcm.limits.CardinalityEstimator;
|
||||||
import org.whispersystems.textsecuregcm.limits.RateLimiters;
|
import org.whispersystems.textsecuregcm.limits.RateLimiters;
|
||||||
import org.whispersystems.textsecuregcm.metrics.MessageMetrics;
|
import org.whispersystems.textsecuregcm.metrics.MessageMetrics;
|
||||||
import org.whispersystems.textsecuregcm.metrics.UserAgentTagUtil;
|
import org.whispersystems.textsecuregcm.metrics.UserAgentTagUtil;
|
||||||
|
@ -118,6 +119,7 @@ public class MessageController {
|
||||||
private static final Logger logger = LoggerFactory.getLogger(MessageController.class);
|
private static final Logger logger = LoggerFactory.getLogger(MessageController.class);
|
||||||
|
|
||||||
private final RateLimiters rateLimiters;
|
private final RateLimiters rateLimiters;
|
||||||
|
private final CardinalityEstimator messageByteLimitEstimator;
|
||||||
private final MessageSender messageSender;
|
private final MessageSender messageSender;
|
||||||
private final ReceiptSender receiptSender;
|
private final ReceiptSender receiptSender;
|
||||||
private final AccountsManager accountsManager;
|
private final AccountsManager accountsManager;
|
||||||
|
@ -153,6 +155,7 @@ public class MessageController {
|
||||||
|
|
||||||
public MessageController(
|
public MessageController(
|
||||||
RateLimiters rateLimiters,
|
RateLimiters rateLimiters,
|
||||||
|
CardinalityEstimator messageByteLimitEstimator,
|
||||||
MessageSender messageSender,
|
MessageSender messageSender,
|
||||||
ReceiptSender receiptSender,
|
ReceiptSender receiptSender,
|
||||||
AccountsManager accountsManager,
|
AccountsManager accountsManager,
|
||||||
|
@ -166,6 +169,7 @@ public class MessageController {
|
||||||
final ClientReleaseManager clientReleaseManager,
|
final ClientReleaseManager clientReleaseManager,
|
||||||
final DynamicConfigurationManager<DynamicConfiguration> dynamicConfigurationManager) {
|
final DynamicConfigurationManager<DynamicConfiguration> dynamicConfigurationManager) {
|
||||||
this.rateLimiters = rateLimiters;
|
this.rateLimiters = rateLimiters;
|
||||||
|
this.messageByteLimitEstimator = messageByteLimitEstimator;
|
||||||
this.messageSender = messageSender;
|
this.messageSender = messageSender;
|
||||||
this.receiptSender = receiptSender;
|
this.receiptSender = receiptSender;
|
||||||
this.accountsManager = accountsManager;
|
this.accountsManager = accountsManager;
|
||||||
|
@ -237,6 +241,7 @@ public class MessageController {
|
||||||
rateLimiters.getInboundMessageBytes().validate(destinationIdentifier.uuid(), totalContentLength);
|
rateLimiters.getInboundMessageBytes().validate(destinationIdentifier.uuid(), totalContentLength);
|
||||||
} catch (final RateLimitExceededException e) {
|
} catch (final RateLimitExceededException e) {
|
||||||
if (dynamicConfigurationManager.getConfiguration().getInboundMessageByteLimitConfiguration().enforceInboundLimit()) {
|
if (dynamicConfigurationManager.getConfiguration().getInboundMessageByteLimitConfiguration().enforceInboundLimit()) {
|
||||||
|
messageByteLimitEstimator.add(destinationIdentifier.uuid().toString());
|
||||||
throw e;
|
throw e;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,76 @@
|
||||||
|
/*
|
||||||
|
* Copyright 2023 Signal Messenger, LLC
|
||||||
|
* SPDX-License-Identifier: AGPL-3.0-only
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.whispersystems.textsecuregcm.limits;
|
||||||
|
|
||||||
|
import com.google.common.annotations.VisibleForTesting;
|
||||||
|
import io.micrometer.core.instrument.Metrics;
|
||||||
|
import io.micrometer.core.instrument.Tags;
|
||||||
|
import java.time.Duration;
|
||||||
|
import java.util.concurrent.CompletableFuture;
|
||||||
|
import java.util.concurrent.CompletionStage;
|
||||||
|
import org.whispersystems.textsecuregcm.metrics.MetricsUtil;
|
||||||
|
import org.whispersystems.textsecuregcm.redis.FaultTolerantRedisCluster;
|
||||||
|
import org.whispersystems.textsecuregcm.util.Util;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Estimate the number of unique items seen over a configurable period and update a metric
|
||||||
|
*/
|
||||||
|
public class CardinalityEstimator {
|
||||||
|
|
||||||
|
private volatile double uniqueElementCount;
|
||||||
|
private final FaultTolerantRedisCluster redisCluster;
|
||||||
|
private final String hllName;
|
||||||
|
private final Duration period;
|
||||||
|
|
||||||
|
public CardinalityEstimator(final FaultTolerantRedisCluster redisCluster, final String name, final Duration period) {
|
||||||
|
this.redisCluster = redisCluster;
|
||||||
|
this.hllName = "cardinality_estimator::" + name;
|
||||||
|
this.period = period;
|
||||||
|
Metrics.gauge(
|
||||||
|
MetricsUtil.name(getClass(), "unique"),
|
||||||
|
Tags.of("name", name),
|
||||||
|
this,
|
||||||
|
obj -> obj.uniqueElementCount);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void add(String element) {
|
||||||
|
addAsync(element).toCompletableFuture().join();
|
||||||
|
}
|
||||||
|
|
||||||
|
public CompletionStage<Void> addAsync(String element) {
|
||||||
|
return redisCluster.withCluster(connection -> connection.async()
|
||||||
|
.pfadd(hllName, element)
|
||||||
|
.thenCompose(modCount -> {
|
||||||
|
if (modCount == 0) {
|
||||||
|
return CompletableFuture.completedFuture(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
// The hll changed - update our local view of the cardinality, and
|
||||||
|
// initialize the TTL if required
|
||||||
|
return connection.async()
|
||||||
|
.pfcount(hllName)
|
||||||
|
.thenCompose(count -> {
|
||||||
|
uniqueElementCount = count;
|
||||||
|
// check if this is a new hll with no TTL set
|
||||||
|
return connection.async().ttl(hllName).thenApply(ttl -> ttl == -1);
|
||||||
|
});
|
||||||
|
})
|
||||||
|
.thenCompose(isNewHll -> {
|
||||||
|
if (!isNewHll) {
|
||||||
|
return CompletableFuture.completedFuture(null);
|
||||||
|
}
|
||||||
|
|
||||||
|
// If this is a new hll, we need to set the TTL. This could be
|
||||||
|
// a single atomic op in redis 7.x with EXPIRE NX
|
||||||
|
return connection.async().expire(hllName, period).thenRun(Util.NOOP);
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
|
@VisibleForTesting
|
||||||
|
long estimate() {
|
||||||
|
return (long) this.uniqueElementCount;
|
||||||
|
}
|
||||||
|
}
|
|
@ -100,6 +100,7 @@ import org.whispersystems.textsecuregcm.entities.StaleDevices;
|
||||||
import org.whispersystems.textsecuregcm.identity.AciServiceIdentifier;
|
import org.whispersystems.textsecuregcm.identity.AciServiceIdentifier;
|
||||||
import org.whispersystems.textsecuregcm.identity.PniServiceIdentifier;
|
import org.whispersystems.textsecuregcm.identity.PniServiceIdentifier;
|
||||||
import org.whispersystems.textsecuregcm.identity.ServiceIdentifier;
|
import org.whispersystems.textsecuregcm.identity.ServiceIdentifier;
|
||||||
|
import org.whispersystems.textsecuregcm.limits.CardinalityEstimator;
|
||||||
import org.whispersystems.textsecuregcm.limits.RateLimiter;
|
import org.whispersystems.textsecuregcm.limits.RateLimiter;
|
||||||
import org.whispersystems.textsecuregcm.limits.RateLimiters;
|
import org.whispersystems.textsecuregcm.limits.RateLimiters;
|
||||||
import org.whispersystems.textsecuregcm.mappers.RateLimitExceededExceptionMapper;
|
import org.whispersystems.textsecuregcm.mappers.RateLimitExceededExceptionMapper;
|
||||||
|
@ -161,6 +162,7 @@ class MessageControllerTest {
|
||||||
private static final DeletedAccounts deletedAccounts = mock(DeletedAccounts.class);
|
private static final DeletedAccounts deletedAccounts = mock(DeletedAccounts.class);
|
||||||
private static final MessagesManager messagesManager = mock(MessagesManager.class);
|
private static final MessagesManager messagesManager = mock(MessagesManager.class);
|
||||||
private static final RateLimiters rateLimiters = mock(RateLimiters.class);
|
private static final RateLimiters rateLimiters = mock(RateLimiters.class);
|
||||||
|
private static final CardinalityEstimator cardinalityEstimator = mock(CardinalityEstimator.class);
|
||||||
private static final RateLimiter rateLimiter = mock(RateLimiter.class);
|
private static final RateLimiter rateLimiter = mock(RateLimiter.class);
|
||||||
private static final PushNotificationManager pushNotificationManager = mock(PushNotificationManager.class);
|
private static final PushNotificationManager pushNotificationManager = mock(PushNotificationManager.class);
|
||||||
private static final ReportMessageManager reportMessageManager = mock(ReportMessageManager.class);
|
private static final ReportMessageManager reportMessageManager = mock(ReportMessageManager.class);
|
||||||
|
@ -177,7 +179,7 @@ class MessageControllerTest {
|
||||||
.addProvider(MultiRecipientMessageProvider.class)
|
.addProvider(MultiRecipientMessageProvider.class)
|
||||||
.setTestContainerFactory(new GrizzlyWebTestContainerFactory())
|
.setTestContainerFactory(new GrizzlyWebTestContainerFactory())
|
||||||
.addResource(
|
.addResource(
|
||||||
new MessageController(rateLimiters, messageSender, receiptSender, accountsManager, deletedAccounts,
|
new MessageController(rateLimiters, cardinalityEstimator, messageSender, receiptSender, accountsManager, deletedAccounts,
|
||||||
messagesManager, pushNotificationManager, reportMessageManager, multiRecipientMessageExecutor,
|
messagesManager, pushNotificationManager, reportMessageManager, multiRecipientMessageExecutor,
|
||||||
messageDeliveryScheduler, ReportSpamTokenProvider.noop(), mock(ClientReleaseManager.class), dynamicConfigurationManager))
|
messageDeliveryScheduler, ReportSpamTokenProvider.noop(), mock(ClientReleaseManager.class), dynamicConfigurationManager))
|
||||||
.build();
|
.build();
|
||||||
|
@ -247,6 +249,7 @@ class MessageControllerTest {
|
||||||
messagesManager,
|
messagesManager,
|
||||||
rateLimiters,
|
rateLimiters,
|
||||||
rateLimiter,
|
rateLimiter,
|
||||||
|
cardinalityEstimator,
|
||||||
pushNotificationManager,
|
pushNotificationManager,
|
||||||
reportMessageManager,
|
reportMessageManager,
|
||||||
multiRecipientMessageExecutor
|
multiRecipientMessageExecutor
|
||||||
|
|
|
@ -0,0 +1,53 @@
|
||||||
|
/*
|
||||||
|
* Copyright 2023 Signal Messenger, LLC
|
||||||
|
* SPDX-License-Identifier: AGPL-3.0-only
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.whispersystems.textsecuregcm.limits;
|
||||||
|
|
||||||
|
import static org.assertj.core.api.Assertions.assertThat;
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
import org.junit.jupiter.api.Timeout;
|
||||||
|
import org.junit.jupiter.api.extension.RegisterExtension;
|
||||||
|
import org.whispersystems.textsecuregcm.redis.FaultTolerantRedisCluster;
|
||||||
|
import org.whispersystems.textsecuregcm.redis.RedisClusterExtension;
|
||||||
|
import java.time.Duration;
|
||||||
|
|
||||||
|
public class CardinalityEstimatorTest {
|
||||||
|
|
||||||
|
@RegisterExtension
|
||||||
|
private static final RedisClusterExtension REDIS_CLUSTER_EXTENSION = RedisClusterExtension.builder().build();
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testAdd() throws Exception {
|
||||||
|
final FaultTolerantRedisCluster redisCluster = REDIS_CLUSTER_EXTENSION.getRedisCluster();
|
||||||
|
final CardinalityEstimator estimator = new CardinalityEstimator(redisCluster, "test", Duration.ofSeconds(1));
|
||||||
|
|
||||||
|
estimator.add("1");
|
||||||
|
|
||||||
|
long count = redisCluster.withCluster(conn -> conn.sync().pfcount("cardinality_estimator::test"));
|
||||||
|
assertThat(count).isEqualTo(1).isEqualTo(estimator.estimate());
|
||||||
|
|
||||||
|
estimator.add("2");
|
||||||
|
count = redisCluster.withCluster(conn -> conn.sync().pfcount("cardinality_estimator::test"));
|
||||||
|
assertThat(count).isEqualTo(2).isEqualTo(estimator.estimate());
|
||||||
|
|
||||||
|
estimator.add("1");
|
||||||
|
count = redisCluster.withCluster(conn -> conn.sync().pfcount("cardinality_estimator::test"));
|
||||||
|
assertThat(count).isEqualTo(2).isEqualTo(estimator.estimate());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@Timeout(5)
|
||||||
|
public void testEventuallyExpires() throws InterruptedException {
|
||||||
|
final FaultTolerantRedisCluster redisCluster = REDIS_CLUSTER_EXTENSION.getRedisCluster();
|
||||||
|
final CardinalityEstimator estimator = new CardinalityEstimator(redisCluster, "test", Duration.ofMillis(100));
|
||||||
|
estimator.add("1");
|
||||||
|
long count;
|
||||||
|
do {
|
||||||
|
count = redisCluster.withCluster(conn -> conn.sync().pfcount("cardinality_estimator::test"));
|
||||||
|
Thread.sleep(1);
|
||||||
|
} while (count != 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
Loading…
Reference in New Issue