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

Continue to verify rate limiters by e164 during UUID migration period

This commit is contained in:
Jon Chambers 2021-08-02 14:52:31 -04:00 committed by Jon Chambers
parent a680639718
commit ce5edbb7fc
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
service/src/main/java/org/whispersystems/textsecuregcm/limits/PreKeyRateLimiter.java
View File

@ -50,6 +50,9 @@ public class PreKeyRateLimiter {
try { try {
rateLimiters.getDailyPreKeysLimiter().validate(account.getUuid()); rateLimiters.getDailyPreKeysLimiter().validate(account.getUuid());
// TODO Remove after migration period
rateLimiters.getDailyPreKeysLimiter().validate(account.getNumber());
} catch (final RateLimitExceededException e) { } catch (final RateLimitExceededException e) {
final boolean enforceLimit = dynamicConfigurationManager.getConfiguration() final boolean enforceLimit = dynamicConfigurationManager.getConfiguration()

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

@ -56,10 +56,17 @@ public class RateLimitChallengeManager {
public void answerPushChallenge(final Account account, final String challenge) throws RateLimitExceededException { public void answerPushChallenge(final Account account, final String challenge) throws RateLimitExceededException {
rateLimiters.getPushChallengeAttemptLimiter().validate(account.getUuid()); rateLimiters.getPushChallengeAttemptLimiter().validate(account.getUuid());
// TODO Remove after migration period
rateLimiters.getPushChallengeAttemptLimiter().validate(account.getNumber());
final boolean challengeSuccess = pushChallengeManager.answerChallenge(account, challenge); final boolean challengeSuccess = pushChallengeManager.answerChallenge(account, challenge);
if (challengeSuccess) { if (challengeSuccess) {
rateLimiters.getPushChallengeSuccessLimiter().validate(account.getUuid()); rateLimiters.getPushChallengeSuccessLimiter().validate(account.getUuid());
// TODO Remove after migration period
rateLimiters.getPushChallengeSuccessLimiter().validate(account.getNumber());
resetRateLimits(account); resetRateLimits(account);
} }
} }
@ -69,6 +76,9 @@ public class RateLimitChallengeManager {
rateLimiters.getRecaptchaChallengeAttemptLimiter().validate(account.getUuid()); rateLimiters.getRecaptchaChallengeAttemptLimiter().validate(account.getUuid());
// TODO Remove after migration period
rateLimiters.getRecaptchaChallengeAttemptLimiter().validate(account.getNumber());
final boolean challengeSuccess = recaptchaClient.verify(captcha, mostRecentProxyIp); final boolean challengeSuccess = recaptchaClient.verify(captcha, mostRecentProxyIp);
Metrics.counter(RECAPTCHA_ATTEMPT_COUNTER_NAME, Metrics.counter(RECAPTCHA_ATTEMPT_COUNTER_NAME,
@ -77,6 +87,10 @@ public class RateLimitChallengeManager {
if (challengeSuccess) { if (challengeSuccess) {
rateLimiters.getRecaptchaChallengeSuccessLimiter().validate(account.getUuid()); rateLimiters.getRecaptchaChallengeSuccessLimiter().validate(account.getUuid());
// TODO Remove after migration period
rateLimiters.getRecaptchaChallengeSuccessLimiter().validate(account.getNumber());
resetRateLimits(account); resetRateLimits(account);
} }
} }
@ -84,6 +98,9 @@ public class RateLimitChallengeManager {
private void resetRateLimits(final Account account) throws RateLimitExceededException { private void resetRateLimits(final Account account) throws RateLimitExceededException {
try { try {
rateLimiters.getRateLimitResetLimiter().validate(account.getUuid()); rateLimiters.getRateLimitResetLimiter().validate(account.getUuid());
// TODO Remove after migration period
rateLimiters.getRateLimitResetLimiter().validate(account.getNumber());
} catch (final RateLimitExceededException e) { } catch (final RateLimitExceededException e) {
Metrics.counter(RESET_RATE_LIMIT_EXCEEDED_COUNTER_NAME, Metrics.counter(RESET_RATE_LIMIT_EXCEEDED_COUNTER_NAME,
SOURCE_COUNTRY_TAG_NAME, Util.getCountryCode(account.getNumber())).increment(); SOURCE_COUNTRY_TAG_NAME, Util.getCountryCode(account.getNumber())).increment();