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

pass challenge type to rate limit reset listeners

Browse Source
This commit is contained in:
Jonathan Klabunde Tomer
2023-08-29 15:19:49 -07:00
committed by GitHub
parent 093f17dce2
commit 9577d552c6
4 changed files with 20 additions and 7 deletions
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.metrics.UserAgentTagUtil;
import org.whispersystems.textsecuregcm.push.NotPushRegisteredException;
import org.whispersystems.textsecuregcm.spam.ChallengeType;
import org.whispersystems.textsecuregcm.spam.RateLimitChallengeListener;
import org.whispersystems.textsecuregcm.storage.Account;
import org.whispersystems.textsecuregcm.util.Util;
@@ -59,7 +60,7 @@ public class RateLimitChallengeManager {
if (challengeSuccess) {
rateLimiters.getPushChallengeSuccessLimiter().validate(account.getUuid());
resetRateLimits(account);
resetRateLimits(account, ChallengeType.PUSH);
}
}
@@ -80,12 +81,12 @@ public class RateLimitChallengeManager {
if (challengeSuccess) {
rateLimiters.getRecaptchaChallengeSuccessLimiter().validate(account.getUuid());
resetRateLimits(account);
resetRateLimits(account, ChallengeType.CAPTCHA);
}
return challengeSuccess;
}
private void resetRateLimits(final Account account) throws RateLimitExceededException {
private void resetRateLimits(final Account account, final ChallengeType type) throws RateLimitExceededException {
try {
rateLimiters.getRateLimitResetLimiter().validate(account.getUuid());
} catch (final RateLimitExceededException e) {
@@ -95,7 +96,7 @@ public class RateLimitChallengeManager {
throw e;
}
rateLimitChallengeListeners.forEach(listener -> listener.handleRateLimitChallengeAnswered(account));
rateLimitChallengeListeners.forEach(listener -> listener.handleRateLimitChallengeAnswered(account, type));
}
public void sendPushChallenge(final Account account) throws NotPushRegisteredException {