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

Support "captcha" rename in AnswerChallengeRequest.type

This commit is contained in:
Chris Eager 2024-03-11 14:07:58 -05:00 committed by Chris Eager
parent a4d4a9c686
commit 8574494573
3 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
service/src/main/java/org/whispersystems/textsecuregcm/entities/AnswerChallengeRequest.java
View File

@ -11,6 +11,7 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo;
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type")
@JsonSubTypes({
@JsonSubTypes.Type(value = AnswerPushChallengeRequest.class, name = "rateLimitPushChallenge"),
@JsonSubTypes.Type(value = AnswerRecaptchaChallengeRequest.class, name = "captcha"),
@JsonSubTypes.Type(value = AnswerRecaptchaChallengeRequest.class, name = "recaptcha")
})
public abstract class AnswerChallengeRequest {

18
service/src/test/java/org/whispersystems/textsecuregcm/controllers/ChallengeControllerTest.java
View File

@ -115,9 +115,9 @@ class ChallengeControllerTest {
@ParameterizedTest
@ValueSource(booleans = { true, false } )
void testHandleRecaptcha(boolean hasThreshold) throws RateLimitExceededException, IOException {
final String recaptchaChallengeJson = """
final String captchaChallengeJson = """
{
"type": "recaptcha",
"type": "captcha",
"token": "A server-generated token",
"captcha": "The value of the solved captcha token"
}
@ -134,7 +134,7 @@ class ChallengeControllerTest {
final Response response = EXTENSION.target("/v1/challenge")
.request()
.header("Authorization", AuthHelper.getAuthHeader(AuthHelper.VALID_UUID, AuthHelper.VALID_PASSWORD))
.put(Entity.json(recaptchaChallengeJson));
.put(Entity.json(captchaChallengeJson));
assertEquals(200, response.getStatus());
@ -145,9 +145,9 @@ class ChallengeControllerTest {
@Test
void testHandleInvalidCaptcha() throws RateLimitExceededException, IOException {
final String recaptchaChallengeJson = """
final String captchaChallengeJson = """
{
"type": "recaptcha",
"type": "captcha",
"token": "A server-generated token",
"captcha": "The value of the solved captcha token"
}
@ -159,16 +159,16 @@ class ChallengeControllerTest {
final Response response = EXTENSION.target("/v1/challenge")
.request()
.header("Authorization", AuthHelper.getAuthHeader(AuthHelper.VALID_UUID, AuthHelper.VALID_PASSWORD))
.put(Entity.json(recaptchaChallengeJson));
.put(Entity.json(captchaChallengeJson));
assertEquals(428, response.getStatus());
}
@Test
void testHandleRecaptchaRateLimited() throws RateLimitExceededException, IOException {
final String recaptchaChallengeJson = """
final String captchaChallengeJson = """
{
"type": "recaptcha",
"type": "captcha",
"token": "A server-generated token",
"captcha": "The value of the solved captcha token"
}
@ -181,7 +181,7 @@ class ChallengeControllerTest {
final Response response = EXTENSION.target("/v1/challenge")
.request()
.header("Authorization", AuthHelper.getAuthHeader(AuthHelper.VALID_UUID, AuthHelper.VALID_PASSWORD))
.put(Entity.json(recaptchaChallengeJson));
.put(Entity.json(captchaChallengeJson));
assertEquals(413, response.getStatus());
assertEquals(String.valueOf(retryAfter.toSeconds()), response.getHeaderString("Retry-After"));

16
service/src/test/java/org/whispersystems/textsecuregcm/entities/AnswerChallengeRequestTest.java
View File

@ -11,13 +11,15 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.exc.InvalidTypeIdException;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
import org.whispersystems.textsecuregcm.util.SystemMapper;
class AnswerChallengeRequestTest {
@Test
void parse() throws JsonProcessingException {
@ParameterizedTest
@ValueSource(strings = {"captcha", "recaptcha"})
void parse(final String type) throws JsonProcessingException {
{
final String pushChallengeJson = """
{
@ -35,16 +37,16 @@ class AnswerChallengeRequestTest {
}
{
final String recaptchaChallengeJson = """
final String captchaChallengeJson = """
{
"type": "recaptcha",
"type": "%s",
"token": "A server-generated token",
"captcha": "The value of the solved captcha token"
}
""";
""".formatted(type);
final AnswerChallengeRequest answerChallengeRequest =
SystemMapper.jsonMapper().readValue(recaptchaChallengeJson, AnswerChallengeRequest.class);
SystemMapper.jsonMapper().readValue(captchaChallengeJson, AnswerChallengeRequest.class);
assertTrue(answerChallengeRequest instanceof AnswerRecaptchaChallengeRequest);