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

Remove an old rate limiting feature flag

This commit is contained in:
Jon Chambers 2021-12-08 13:41:57 -05:00 committed by Jon Chambers
parent 3895871462
commit 616db337e1
2 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
service/src/main/java/org/whispersystems/textsecuregcm/configuration/dynamic/DynamicRateLimitChallengeConfiguration.java
View File

@ -11,9 +11,6 @@ import javax.validation.constraints.NotNull;
public class DynamicRateLimitChallengeConfiguration { public class DynamicRateLimitChallengeConfiguration {
@JsonProperty
boolean unsealedSenderLimitEnforced = false;
@JsonProperty @JsonProperty
@NotNull @NotNull
private Map<ClientPlatform, Semver> clientSupportedVersions = Collections.emptyMap(); private Map<ClientPlatform, Semver> clientSupportedVersions = Collections.emptyMap();
@ -26,8 +23,4 @@ public class DynamicRateLimitChallengeConfiguration {
public Optional<Semver> getMinimumSupportedVersion(final ClientPlatform platform) { public Optional<Semver> getMinimumSupportedVersion(final ClientPlatform platform) {
return Optional.ofNullable(clientSupportedVersions.get(platform)); return Optional.ofNullable(clientSupportedVersions.get(platform));
} }
public boolean isUnsealedSenderLimitEnforced() {
return unsealedSenderLimitEnforced;
}
} }

3
service/src/test/java/org/whispersystems/textsecuregcm/configuration/dynamic/DynamicConfigurationTest.java
View File

@ -355,13 +355,11 @@ class DynamicConfigurationTest {
DynamicConfigurationManager.parseConfiguration(emptyConfigYaml, DynamicConfiguration.class).orElseThrow(); DynamicConfigurationManager.parseConfiguration(emptyConfigYaml, DynamicConfiguration.class).orElseThrow();
assertThat(emptyConfig.getRateLimitChallengeConfiguration().getClientSupportedVersions()).isEmpty(); assertThat(emptyConfig.getRateLimitChallengeConfiguration().getClientSupportedVersions()).isEmpty();
assertThat(emptyConfig.getRateLimitChallengeConfiguration().isUnsealedSenderLimitEnforced()).isFalse();
} }
{ {
final String rateLimitChallengeConfig = """ final String rateLimitChallengeConfig = """
rateLimitChallenge: rateLimitChallenge:
unsealedSenderLimitEnforced: true
clientSupportedVersions: clientSupportedVersions:
IOS: 5.1.0 IOS: 5.1.0
ANDROID: 5.2.0 ANDROID: 5.2.0
@ -377,7 +375,6 @@ class DynamicConfigurationTest {
assertThat(clientSupportedVersions.get(ClientPlatform.IOS)).isEqualTo(new Semver("5.1.0")); assertThat(clientSupportedVersions.get(ClientPlatform.IOS)).isEqualTo(new Semver("5.1.0"));
assertThat(clientSupportedVersions.get(ClientPlatform.ANDROID)).isEqualTo(new Semver("5.2.0")); assertThat(clientSupportedVersions.get(ClientPlatform.ANDROID)).isEqualTo(new Semver("5.2.0"));
assertThat(clientSupportedVersions.get(ClientPlatform.DESKTOP)).isEqualTo(new Semver("5.0.0")); assertThat(clientSupportedVersions.get(ClientPlatform.DESKTOP)).isEqualTo(new Semver("5.0.0"));
assertThat(rateLimitChallengeConfiguration.isUnsealedSenderLimitEnforced()).isTrue();
} }
} }