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

pass challenge type to rate limit reset listeners

This commit is contained in:
Jonathan Klabunde Tomer 2023-08-29 15:19:49 -07:00 committed by GitHub
parent 093f17dce2
commit 9577d552c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
service/src/main/java/org/whispersystems/textsecuregcm/limits/RateLimitChallengeManager.java
View File

@ -19,6 +19,7 @@ import org.whispersystems.textsecuregcm.captcha.CaptchaChecker;
import org.whispersystems.textsecuregcm.controllers.RateLimitExceededException; import org.whispersystems.textsecuregcm.controllers.RateLimitExceededException;
import org.whispersystems.textsecuregcm.metrics.UserAgentTagUtil; import org.whispersystems.textsecuregcm.metrics.UserAgentTagUtil;
import org.whispersystems.textsecuregcm.push.NotPushRegisteredException; import org.whispersystems.textsecuregcm.push.NotPushRegisteredException;
import org.whispersystems.textsecuregcm.spam.ChallengeType;
import org.whispersystems.textsecuregcm.spam.RateLimitChallengeListener; import org.whispersystems.textsecuregcm.spam.RateLimitChallengeListener;
import org.whispersystems.textsecuregcm.storage.Account; import org.whispersystems.textsecuregcm.storage.Account;
import org.whispersystems.textsecuregcm.util.Util; import org.whispersystems.textsecuregcm.util.Util;
@ -59,7 +60,7 @@ public class RateLimitChallengeManager {
if (challengeSuccess) { if (challengeSuccess) {
rateLimiters.getPushChallengeSuccessLimiter().validate(account.getUuid()); rateLimiters.getPushChallengeSuccessLimiter().validate(account.getUuid());
resetRateLimits(account); resetRateLimits(account, ChallengeType.PUSH);
} }
} }
@ -80,12 +81,12 @@ public class RateLimitChallengeManager {
if (challengeSuccess) { if (challengeSuccess) {
rateLimiters.getRecaptchaChallengeSuccessLimiter().validate(account.getUuid()); rateLimiters.getRecaptchaChallengeSuccessLimiter().validate(account.getUuid());
resetRateLimits(account); resetRateLimits(account, ChallengeType.CAPTCHA);
} }
return challengeSuccess; return challengeSuccess;
} }
private void resetRateLimits(final Account account) throws RateLimitExceededException { private void resetRateLimits(final Account account, final ChallengeType type) throws RateLimitExceededException {
try { try {
rateLimiters.getRateLimitResetLimiter().validate(account.getUuid()); rateLimiters.getRateLimitResetLimiter().validate(account.getUuid());
} catch (final RateLimitExceededException e) { } catch (final RateLimitExceededException e) {
@ -95,7 +96,7 @@ public class RateLimitChallengeManager {
throw e; throw e;
} }
rateLimitChallengeListeners.forEach(listener -> listener.handleRateLimitChallengeAnswered(account)); rateLimitChallengeListeners.forEach(listener -> listener.handleRateLimitChallengeAnswered(account, type));
} }
public void sendPushChallenge(final Account account) throws NotPushRegisteredException { public void sendPushChallenge(final Account account) throws NotPushRegisteredException {

11
service/src/main/java/org/whispersystems/textsecuregcm/spam/ChallengeType.java Normal file
View File

@ -0,0 +1,11 @@
/*
* Copyright 2013-2021 Signal Messenger, LLC
* SPDX-License-Identifier: AGPL-3.0-only
*/
package org.whispersystems.textsecuregcm.spam;
public enum ChallengeType {
PUSH,
CAPTCHA
}

2
service/src/main/java/org/whispersystems/textsecuregcm/spam/RateLimitChallengeListener.java
View File

@ -11,7 +11,7 @@ import java.io.IOException;
public interface RateLimitChallengeListener { public interface RateLimitChallengeListener {
void handleRateLimitChallengeAnswered(Account account); void handleRateLimitChallengeAnswered(Account account, ChallengeType type);
/** /**
* Configures this rate limit challenge listener. This method will be called before the service begins processing any * Configures this rate limit challenge listener. This method will be called before the service begins processing any

5
service/src/test/java/org/whispersystems/textsecuregcm/limits/RateLimitChallengeManagerTest.java
View File

@ -21,6 +21,7 @@ import org.whispersystems.textsecuregcm.captcha.Action;
import org.whispersystems.textsecuregcm.captcha.AssessmentResult; import org.whispersystems.textsecuregcm.captcha.AssessmentResult;
import org.whispersystems.textsecuregcm.captcha.CaptchaChecker; import org.whispersystems.textsecuregcm.captcha.CaptchaChecker;
import org.whispersystems.textsecuregcm.controllers.RateLimitExceededException; import org.whispersystems.textsecuregcm.controllers.RateLimitExceededException;
import org.whispersystems.textsecuregcm.spam.ChallengeType;
import org.whispersystems.textsecuregcm.spam.RateLimitChallengeListener; import org.whispersystems.textsecuregcm.spam.RateLimitChallengeListener;
import org.whispersystems.textsecuregcm.storage.Account; import org.whispersystems.textsecuregcm.storage.Account;
@ -63,7 +64,7 @@ class RateLimitChallengeManagerTest {
rateLimitChallengeManager.answerPushChallenge(account, "challenge"); rateLimitChallengeManager.answerPushChallenge(account, "challenge");
if (successfulChallenge) { if (successfulChallenge) {
verify(rateLimitChallengeListener).handleRateLimitChallengeAnswered(account); verify(rateLimitChallengeListener).handleRateLimitChallengeAnswered(account, ChallengeType.PUSH);
} else { } else {
verifyNoInteractions(rateLimitChallengeListener); verifyNoInteractions(rateLimitChallengeListener);
} }
@ -88,7 +89,7 @@ class RateLimitChallengeManagerTest {
rateLimitChallengeManager.answerRecaptchaChallenge(account, "captcha", "10.0.0.1", "Test User-Agent"); rateLimitChallengeManager.answerRecaptchaChallenge(account, "captcha", "10.0.0.1", "Test User-Agent");
if (successfulChallenge) { if (successfulChallenge) {
verify(rateLimitChallengeListener).handleRateLimitChallengeAnswered(account); verify(rateLimitChallengeListener).handleRateLimitChallengeAnswered(account, ChallengeType.CAPTCHA);
} else { } else {
verifyNoInteractions(rateLimitChallengeListener); verifyNoInteractions(rateLimitChallengeListener);
} }