Signal/Signal-Server
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Server synced 2026-04-21 23:28:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Relax validation to allow null reporting tokens.

Browse Source
This commit is contained in:
erik-signal
2023-02-22 11:06:51 -05:00
committed by GitHub
parent 11c93c5f53
commit 95237a22a9
3 changed files with 50 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
service/src/test/java/org/whispersystems/textsecuregcm/controllers/MessageControllerTest.java
View File

@@ -7,6 +7,7 @@ package org.whispersystems.textsecuregcm.controllers;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -58,6 +59,8 @@ import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import org.glassfish.jersey.server.ServerProperties;
import org.glassfish.jersey.test.grizzly.GrizzlyWebTestContainerFactory;
import org.hamcrest.CoreMatchers;
import org.hamcrest.Matcher;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -759,6 +762,50 @@ class MessageControllerTest {
any());
}
@ParameterizedTest
@MethodSource
void testReportMessageByAciWithNullSpamReportToken(Entity<?> entity, boolean expectOk) {
final String senderNumber = "+12125550001";
final UUID senderAci = UUID.randomUUID();
final UUID senderPni = UUID.randomUUID();
UUID messageGuid = UUID.randomUUID();
final Account account = mock(Account.class);
when(account.getUuid()).thenReturn(senderAci);
when(account.getNumber()).thenReturn(senderNumber);
when(account.getPhoneNumberIdentifier()).thenReturn(senderPni);
when(accountsManager.getByAccountIdentifier(senderAci)).thenReturn(Optional.of(account));
when(deletedAccountsManager.findDeletedAccountE164(senderAci)).thenReturn(Optional.of(senderNumber));
when(accountsManager.getPhoneNumberIdentifier(senderNumber)).thenReturn(senderPni);
Response response =
resources.getJerseyTest()
.target(String.format("/v1/messages/report/%s/%s", senderAci, messageGuid))
.request()
.header("Authorization", AuthHelper.getAuthHeader(AuthHelper.VALID_UUID, AuthHelper.VALID_PASSWORD))
.post(entity);
Matcher<Integer> matcher = expectOk ? is(equalTo(202)) : not(equalTo(202));
assertThat(response.getStatus(), matcher);
}
private static Stream<Arguments> testReportMessageByAciWithNullSpamReportToken() {
return Stream.of(
Arguments.of(Entity.json(new SpamReport(new byte[5])), true),
Arguments.of(Entity.json("{\"token\":\"AAAAAAA\"}"), true),
Arguments.of(Entity.json(new SpamReport(new byte[0])), true),
Arguments.of(Entity.json(new SpamReport(null)), true),
Arguments.of(Entity.json("{\"token\": \"\"}"), true),
Arguments.of(Entity.json("{\"token\": null}"), true),
Arguments.of(Entity.json("null"), true),
Arguments.of(Entity.json("{\"weird\": 123}"), true),
Arguments.of(Entity.json("\"weirder\""), false),
Arguments.of(Entity.json("weirdest"), false)
);
}
@Test
void testValidateContentLength() throws Exception {
final int contentLength = Math.toIntExact(MessageController.MAX_MESSAGE_SIZE + 1);