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

Remove test references to legacy ratelimit HTTP status code

This commit is contained in:
Katherine 2024-10-28 15:20:08 -04:00 committed by GitHub
parent 17dfd914d5
commit 3287085ef9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
service/src/test/java/org/whispersystems/textsecuregcm/controllers/AccountControllerTest.java
View File

@ -357,7 +357,7 @@ class AccountControllerTest {
rateLimiters, RateLimiters.For.USERNAME_LINK_OPERATION, AuthHelper.VALID_UUID); rateLimiters, RateLimiters.For.USERNAME_LINK_OPERATION, AuthHelper.VALID_UUID);
} else { } else {
MockUtils.updateRateLimiterResponseToFail( MockUtils.updateRateLimiterResponseToFail(
rateLimiters, RateLimiters.For.USERNAME_LINK_OPERATION, AuthHelper.VALID_UUID, Duration.ofMinutes(10), false); rateLimiters, RateLimiters.For.USERNAME_LINK_OPERATION, AuthHelper.VALID_UUID, Duration.ofMinutes(10));
} }
// checking if username is to be set for this test // checking if username is to be set for this test
@ -407,7 +407,7 @@ class AccountControllerTest {
rateLimiters, RateLimiters.For.USERNAME_LINK_OPERATION, AuthHelper.VALID_UUID); rateLimiters, RateLimiters.For.USERNAME_LINK_OPERATION, AuthHelper.VALID_UUID);
} else { } else {
MockUtils.updateRateLimiterResponseToFail( MockUtils.updateRateLimiterResponseToFail(
rateLimiters, RateLimiters.For.USERNAME_LINK_OPERATION, AuthHelper.VALID_UUID, Duration.ofMinutes(10), false); rateLimiters, RateLimiters.For.USERNAME_LINK_OPERATION, AuthHelper.VALID_UUID, Duration.ofMinutes(10));
} }
final Invocation.Builder builder = resources.getJerseyTest() final Invocation.Builder builder = resources.getJerseyTest()
@ -451,7 +451,7 @@ class AccountControllerTest {
rateLimiters, RateLimiters.For.USERNAME_LINK_LOOKUP_PER_IP, "127.0.0.1"); rateLimiters, RateLimiters.For.USERNAME_LINK_LOOKUP_PER_IP, "127.0.0.1");
} else { } else {
MockUtils.updateRateLimiterResponseToFail( MockUtils.updateRateLimiterResponseToFail(
rateLimiters, RateLimiters.For.USERNAME_LINK_LOOKUP_PER_IP, "127.0.0.1", Duration.ofMinutes(10), false); rateLimiters, RateLimiters.For.USERNAME_LINK_LOOKUP_PER_IP, "127.0.0.1", Duration.ofMinutes(10));
} }
when(accountsManager.getByUsernameLinkHandle(any())).thenReturn(CompletableFuture.completedFuture(Optional.empty())); when(accountsManager.getByUsernameLinkHandle(any())).thenReturn(CompletableFuture.completedFuture(Optional.empty()));
@ -887,7 +887,7 @@ class AccountControllerTest {
when(accountsManager.getByAccountIdentifier(accountIdentifier)).thenReturn(Optional.of(account)); when(accountsManager.getByAccountIdentifier(accountIdentifier)).thenReturn(Optional.of(account));
MockUtils.updateRateLimiterResponseToFail( MockUtils.updateRateLimiterResponseToFail(
rateLimiters, RateLimiters.For.CHECK_ACCOUNT_EXISTENCE, "127.0.0.1", expectedRetryAfter, true); rateLimiters, RateLimiters.For.CHECK_ACCOUNT_EXISTENCE, "127.0.0.1", expectedRetryAfter);
try (final Response response = resources.getJerseyTest() try (final Response response = resources.getJerseyTest()
.target(String.format("/v1/accounts/account/%s", accountIdentifier)) .target(String.format("/v1/accounts/account/%s", accountIdentifier))
@ -939,7 +939,7 @@ class AccountControllerTest {
void testLookupUsernameRateLimited() { void testLookupUsernameRateLimited() {
final Duration expectedRetryAfter = Duration.ofSeconds(13); final Duration expectedRetryAfter = Duration.ofSeconds(13);
MockUtils.updateRateLimiterResponseToFail( MockUtils.updateRateLimiterResponseToFail(
rateLimiters, RateLimiters.For.USERNAME_LOOKUP, "127.0.0.1", expectedRetryAfter, true); rateLimiters, RateLimiters.For.USERNAME_LOOKUP, "127.0.0.1", expectedRetryAfter);
final Response response = resources.getJerseyTest() final Response response = resources.getJerseyTest()
.target(String.format("v1/accounts/username_hash/%s", BASE_64_URL_USERNAME_HASH_1)) .target(String.format("v1/accounts/username_hash/%s", BASE_64_URL_USERNAME_HASH_1))
.request() .request()

8
service/src/test/java/org/whispersystems/textsecuregcm/controllers/KeyTransparencyControllerTest.java
View File

@ -289,7 +289,7 @@ public class KeyTransparencyControllerTest {
@Test @Test
void searchRateLimited() { void searchRateLimited() {
MockUtils.updateRateLimiterResponseToFail( MockUtils.updateRateLimiterResponseToFail(
rateLimiters, RateLimiters.For.KEY_TRANSPARENCY_SEARCH_PER_IP, "127.0.0.1", Duration.ofMinutes(10), true); rateLimiters, RateLimiters.For.KEY_TRANSPARENCY_SEARCH_PER_IP, "127.0.0.1", Duration.ofMinutes(10));
final Invocation.Builder request = resources.getJerseyTest() final Invocation.Builder request = resources.getJerseyTest()
.target("/v1/key-transparency/search") .target("/v1/key-transparency/search")
.request(); .request();
@ -506,7 +506,7 @@ public class KeyTransparencyControllerTest {
@Test @Test
void monitorRateLimited() { void monitorRateLimited() {
MockUtils.updateRateLimiterResponseToFail( MockUtils.updateRateLimiterResponseToFail(
rateLimiters, RateLimiters.For.KEY_TRANSPARENCY_MONITOR_PER_IP, "127.0.0.1", Duration.ofMinutes(10), true); rateLimiters, RateLimiters.For.KEY_TRANSPARENCY_MONITOR_PER_IP, "127.0.0.1", Duration.ofMinutes(10));
final Invocation.Builder request = resources.getJerseyTest() final Invocation.Builder request = resources.getJerseyTest()
.target("/v1/key-transparency/monitor") .target("/v1/key-transparency/monitor")
.request(); .request();
@ -602,8 +602,8 @@ public class KeyTransparencyControllerTest {
@Test @Test
void distinguishedRateLimited() { void distinguishedRateLimited() {
MockUtils.updateRateLimiterResponseToFail( MockUtils.updateRateLimiterResponseToFail(
rateLimiters, RateLimiters.For.KEY_TRANSPARENCY_DISTINGUISHED_PER_IP, "127.0.0.1", Duration.ofMinutes(10), rateLimiters, RateLimiters.For.KEY_TRANSPARENCY_DISTINGUISHED_PER_IP, "127.0.0.1", Duration.ofMinutes(10)
true); );
final Invocation.Builder request = resources.getJerseyTest() final Invocation.Builder request = resources.getJerseyTest()
.target("/v1/key-transparency/distinguished") .target("/v1/key-transparency/distinguished")
.request(); .request();

2
service/src/test/java/org/whispersystems/textsecuregcm/grpc/CallingGrpcServiceTest.java
View File

@ -67,7 +67,7 @@ class CallingGrpcServiceTest extends SimpleBaseGrpcTest<CallingGrpcService, Call
@Test @Test
void getTurnCredentialsRateLimited() { void getTurnCredentialsRateLimited() {
final Duration retryAfter = MockUtils.updateRateLimiterResponseToFail( final Duration retryAfter = MockUtils.updateRateLimiterResponseToFail(
turnCredentialRateLimiter, AUTHENTICATED_ACI, Duration.ofMinutes(19), false); turnCredentialRateLimiter, AUTHENTICATED_ACI, Duration.ofMinutes(19));
assertRateLimitExceeded(retryAfter, () -> authenticatedServiceStub().getTurnCredentials(GetTurnCredentialsRequest.newBuilder().build())); assertRateLimitExceeded(retryAfter, () -> authenticatedServiceStub().getTurnCredentials(GetTurnCredentialsRequest.newBuilder().build()));
verify(turnTokenGenerator, never()).generate(any()); verify(turnTokenGenerator, never()).generate(any());
verifyNoInteractions(turnTokenGenerator); verifyNoInteractions(turnTokenGenerator);

2
service/src/test/java/org/whispersystems/textsecuregcm/grpc/ExternalServiceCredentialsGrpcServiceTest.java
View File

@ -110,7 +110,7 @@ public class ExternalServiceCredentialsGrpcServiceTest
@Test @Test
public void testRateLimitExceeded() throws Exception { public void testRateLimitExceeded() throws Exception {
final Duration retryAfter = MockUtils.updateRateLimiterResponseToFail( final Duration retryAfter = MockUtils.updateRateLimiterResponseToFail(
rateLimiters, RateLimiters.For.EXTERNAL_SERVICE_CREDENTIALS, AUTHENTICATED_ACI, Duration.ofSeconds(100), false); rateLimiters, RateLimiters.For.EXTERNAL_SERVICE_CREDENTIALS, AUTHENTICATED_ACI, Duration.ofSeconds(100));
Mockito.reset(ART_CREDENTIALS_GENERATOR); Mockito.reset(ART_CREDENTIALS_GENERATOR);
assertRateLimitExceeded( assertRateLimitExceeded(
retryAfter, retryAfter,

4
service/src/test/java/org/whispersystems/textsecuregcm/grpc/ProfileGrpcServiceTest.java
View File

@ -564,7 +564,7 @@ public class ProfileGrpcServiceTest extends SimpleBaseGrpcTest<ProfileGrpcServic
@Test @Test
void getVersionedProfileRatelimited() { void getVersionedProfileRatelimited() {
final Duration retryAfterDuration = MockUtils.updateRateLimiterResponseToFail(rateLimiter, AUTHENTICATED_ACI, Duration.ofMinutes(7), false); final Duration retryAfterDuration = MockUtils.updateRateLimiterResponseToFail(rateLimiter, AUTHENTICATED_ACI, Duration.ofMinutes(7));
final GetVersionedProfileRequest request = GetVersionedProfileRequest.newBuilder() final GetVersionedProfileRequest request = GetVersionedProfileRequest.newBuilder()
.setAccountIdentifier(ServiceIdentifier.newBuilder() .setAccountIdentifier(ServiceIdentifier.newBuilder()
@ -646,7 +646,7 @@ public class ProfileGrpcServiceTest extends SimpleBaseGrpcTest<ProfileGrpcServic
@Test @Test
void getExpiringProfileKeyCredentialRateLimited() { void getExpiringProfileKeyCredentialRateLimited() {
final Duration retryAfterDuration = MockUtils.updateRateLimiterResponseToFail( final Duration retryAfterDuration = MockUtils.updateRateLimiterResponseToFail(
rateLimiter, AUTHENTICATED_ACI, Duration.ofMinutes(5), false); rateLimiter, AUTHENTICATED_ACI, Duration.ofMinutes(5));
when(accountsManager.getByServiceIdentifierAsync(any())).thenReturn(CompletableFuture.completedFuture(Optional.of(account))); when(accountsManager.getByServiceIdentifierAsync(any())).thenReturn(CompletableFuture.completedFuture(Optional.of(account)));
final GetExpiringProfileKeyCredentialRequest request = GetExpiringProfileKeyCredentialRequest.newBuilder() final GetExpiringProfileKeyCredentialRequest request = GetExpiringProfileKeyCredentialRequest.newBuilder()

16
service/src/test/java/org/whispersystems/textsecuregcm/util/MockUtils.java
View File

@ -98,8 +98,7 @@ public final class MockUtils {
public static Duration updateRateLimiterResponseToFail( public static Duration updateRateLimiterResponseToFail(
final RateLimiter mockRateLimiter, final RateLimiter mockRateLimiter,
final String input, final String input,
final Duration retryAfter, final Duration retryAfter) {
final boolean legacyStatusCode) {
try { try {
final RateLimitExceededException exception = new RateLimitExceededException(retryAfter); final RateLimitExceededException exception = new RateLimitExceededException(retryAfter);
doThrow(exception).when(mockRateLimiter).validate(eq(input)); doThrow(exception).when(mockRateLimiter).validate(eq(input));
@ -114,8 +113,7 @@ public final class MockUtils {
public static Duration updateRateLimiterResponseToFail( public static Duration updateRateLimiterResponseToFail(
final RateLimiter mockRateLimiter, final RateLimiter mockRateLimiter,
final UUID input, final UUID input,
final Duration retryAfter, final Duration retryAfter) {
final boolean legacyStatusCode) {
try { try {
final RateLimitExceededException exception = new RateLimitExceededException(retryAfter); final RateLimitExceededException exception = new RateLimitExceededException(retryAfter);
doThrow(exception).when(mockRateLimiter).validate(eq(input)); doThrow(exception).when(mockRateLimiter).validate(eq(input));
@ -131,22 +129,20 @@ public final class MockUtils {
final RateLimiters rateLimitersMock, final RateLimiters rateLimitersMock,
final RateLimiters.For handle, final RateLimiters.For handle,
final String input, final String input,
final Duration retryAfter, final Duration retryAfter) {
final boolean legacyStatusCode) {
final RateLimiter mockRateLimiter = Mockito.mock(RateLimiter.class); final RateLimiter mockRateLimiter = Mockito.mock(RateLimiter.class);
doReturn(mockRateLimiter).when(rateLimitersMock).forDescriptor(eq(handle)); doReturn(mockRateLimiter).when(rateLimitersMock).forDescriptor(eq(handle));
return updateRateLimiterResponseToFail(mockRateLimiter, input, retryAfter, legacyStatusCode); return updateRateLimiterResponseToFail(mockRateLimiter, input, retryAfter);
} }
public static Duration updateRateLimiterResponseToFail( public static Duration updateRateLimiterResponseToFail(
final RateLimiters rateLimitersMock, final RateLimiters rateLimitersMock,
final RateLimiters.For handle, final RateLimiters.For handle,
final UUID input, final UUID input,
final Duration retryAfter, final Duration retryAfter) {
final boolean legacyStatusCode) {
final RateLimiter mockRateLimiter = Mockito.mock(RateLimiter.class); final RateLimiter mockRateLimiter = Mockito.mock(RateLimiter.class);
doReturn(mockRateLimiter).when(rateLimitersMock).forDescriptor(eq(handle)); doReturn(mockRateLimiter).when(rateLimitersMock).forDescriptor(eq(handle));
return updateRateLimiterResponseToFail(mockRateLimiter, input, retryAfter, legacyStatusCode); return updateRateLimiterResponseToFail(mockRateLimiter, input, retryAfter);
} }
public static SecretBytes randomSecretBytes(final int size) { public static SecretBytes randomSecretBytes(final int size) {