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

Remove now-unused rate limiters

This commit is contained in:
Jon Chambers 2024-05-16 10:21:23 -05:00 committed by Jon Chambers
parent 4efba94662
commit 101ecf342f
3 changed files with 2 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
service/src/main/java/org/whispersystems/textsecuregcm/limits/RateLimiters.java
View File

@ -19,10 +19,6 @@ public class RateLimiters extends BaseRateLimiters<RateLimiters.For> {
public enum For implements RateLimiterDescriptor {
BACKUP_AUTH_CHECK("backupAuthCheck", false, new RateLimiterConfig(100, Duration.ofMinutes(15))),
SMS_DESTINATION("smsDestination", false, new RateLimiterConfig(2, Duration.ofSeconds(30))),
VOICE_DESTINATION("voxDestination", false, new RateLimiterConfig(2, Duration.ofMinutes(2))),
VOICE_DESTINATION_DAILY("voxDestinationDaily", false, new RateLimiterConfig(10, Duration.ofMinutes(144))),
SMS_VOICE_IP("smsVoiceIp", false, new RateLimiterConfig(1000, Duration.ofMillis(60))),
SMS_VOICE_PREFIX("smsVoicePrefix", false, new RateLimiterConfig(1000, Duration.ofMillis(60))),
VERIFY("verify", false, new RateLimiterConfig(6, Duration.ofSeconds(30))),
PIN("pin", false, new RateLimiterConfig(10, Duration.ofDays(1))),
ATTACHMENT("attachmentCreate", false, new RateLimiterConfig(50, Duration.ofMillis(1200))),
@ -126,22 +122,6 @@ public class RateLimiters extends BaseRateLimiters<RateLimiters.For> {
return forDescriptor(For.SMS_DESTINATION);
}
public RateLimiter getSmsVoiceIpLimiter() {
return forDescriptor(For.SMS_VOICE_IP);
}
public RateLimiter getSmsVoicePrefixLimiter() {
return forDescriptor(For.SMS_VOICE_PREFIX);
}
public RateLimiter getVoiceDestinationLimiter() {
return forDescriptor(For.VOICE_DESTINATION);
}
public RateLimiter getVoiceDestinationDailyLimiter() {
return forDescriptor(For.VOICE_DESTINATION_DAILY);
}
public RateLimiter getVerifyLimiter() {
return forDescriptor(For.VERIFY);
}

1
service/src/test/java/org/whispersystems/textsecuregcm/controllers/DeviceControllerTest.java
View File

@ -133,7 +133,6 @@ class DeviceControllerTest {
@BeforeEach
void setup() {
when(rateLimiters.getSmsDestinationLimiter()).thenReturn(rateLimiter);
when(rateLimiters.getVoiceDestinationLimiter()).thenReturn(rateLimiter);
when(rateLimiters.getVerifyLimiter()).thenReturn(rateLimiter);
when(rateLimiters.getAllocateDeviceLimiter()).thenReturn(rateLimiter);
when(rateLimiters.getVerifyDeviceLimiter()).thenReturn(rateLimiter);

4
service/src/test/java/org/whispersystems/textsecuregcm/limits/RateLimitersTest.java
View File

@ -43,7 +43,7 @@ public class RateLimitersTest {
private static final String BAD_YAML = """
limits:
smsVoicePrefix:
prekeys:
bucketSize: 150
permitRegenerationDuration: PT6S
unexpected:
@ -53,7 +53,7 @@ public class RateLimitersTest {
private static final String GOOD_YAML = """
limits:
smsVoicePrefix:
prekeys:
bucketSize: 150
permitRegenerationDuration: PT6S
attachmentCreate: