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

Break down rate limit overruns by country.

This commit is contained in:
Jon Chambers 2021-05-13 16:20:40 -04:00 committed by Jon Chambers
parent 730303567f
commit 03dac2bf7e
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,6 +32,7 @@ public class RateLimitChallengeManager {
public static final String OPTION_PUSH_CHALLENGE = "pushChallenge"; public static final String OPTION_PUSH_CHALLENGE = "pushChallenge";
private static final String RECAPTCHA_ATTEMPT_COUNTER_NAME = name(RateLimitChallengeManager.class, "recaptcha", "attempt"); private static final String RECAPTCHA_ATTEMPT_COUNTER_NAME = name(RateLimitChallengeManager.class, "recaptcha", "attempt");
private static final String RESET_RATE_LIMIT_EXCEEDED_COUNTER_NAME = name(RateLimitChallengeManager.class, "resetRateLimitExceeded");
private static final String SOURCE_COUNTRY_TAG_NAME = "sourceCountry"; private static final String SOURCE_COUNTRY_TAG_NAME = "sourceCountry";
private static final String SUCCESS_TAG_NAME = "success"; private static final String SUCCESS_TAG_NAME = "success";
@ -81,7 +82,14 @@ public class RateLimitChallengeManager {
} }
private void resetRateLimits(final Account account) throws RateLimitExceededException { private void resetRateLimits(final Account account) throws RateLimitExceededException {
rateLimiters.getRateLimitResetLimiter().validate(account.getNumber()); try {
rateLimiters.getRateLimitResetLimiter().validate(account.getNumber());
} catch (final RateLimitExceededException e) {
Metrics.counter(RESET_RATE_LIMIT_EXCEEDED_COUNTER_NAME,
SOURCE_COUNTRY_TAG_NAME, Util.getCountryCode(account.getNumber())).increment();
throw e;
}
preKeyRateLimiter.handleRateLimitReset(account); preKeyRateLimiter.handleRateLimitReset(account);
unsealedSenderRateLimiter.handleRateLimitReset(account); unsealedSenderRateLimiter.handleRateLimitReset(account);