Don't rate limit null pin submissions
This commit is contained in:
parent
d7140eac35
commit
86389a5fb3
|
@ -175,13 +175,18 @@ public class AccountController {
|
||||||
System.currentTimeMillis() - existingAccount.get().getLastSeen() < TimeUnit.DAYS.toMillis(7))
|
System.currentTimeMillis() - existingAccount.get().getLastSeen() < TimeUnit.DAYS.toMillis(7))
|
||||||
{
|
{
|
||||||
rateLimiters.getVerifyLimiter().clear(number);
|
rateLimiters.getVerifyLimiter().clear(number);
|
||||||
|
|
||||||
|
long timeRemaining = TimeUnit.DAYS.toMillis(7) - (System.currentTimeMillis() - existingAccount.get().getLastSeen());
|
||||||
|
|
||||||
|
if (accountAttributes.getPin() == null) {
|
||||||
|
throw new WebApplicationException(Response.status(423)
|
||||||
|
.entity(new RegistrationLockFailure(timeRemaining))
|
||||||
|
.build());
|
||||||
|
}
|
||||||
|
|
||||||
rateLimiters.getPinLimiter().validate(number);
|
rateLimiters.getPinLimiter().validate(number);
|
||||||
|
|
||||||
if (accountAttributes.getPin() == null ||
|
if (!MessageDigest.isEqual(existingAccount.get().getPin().get().getBytes(), accountAttributes.getPin().getBytes())) {
|
||||||
!MessageDigest.isEqual(existingAccount.get().getPin().get().getBytes(), accountAttributes.getPin().getBytes()))
|
|
||||||
{
|
|
||||||
long timeRemaining = TimeUnit.DAYS.toMillis(7) - (System.currentTimeMillis() - existingAccount.get().getLastSeen());
|
|
||||||
|
|
||||||
throw new WebApplicationException(Response.status(423)
|
throw new WebApplicationException(Response.status(423)
|
||||||
.entity(new RegistrationLockFailure(timeRemaining))
|
.entity(new RegistrationLockFailure(timeRemaining))
|
||||||
.build());
|
.build());
|
||||||
|
|
|
@ -213,7 +213,7 @@ public class AccountControllerTest {
|
||||||
|
|
||||||
RegistrationLockFailure failure = response.readEntity(RegistrationLockFailure.class);
|
RegistrationLockFailure failure = response.readEntity(RegistrationLockFailure.class);
|
||||||
|
|
||||||
verify(pinLimiter).validate(eq(SENDER_PIN));
|
verifyNoMoreInteractions(pinLimiter);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
|
Loading…
Reference in New Issue