Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Skip ratelimits for admin recovery code burns #17766

Merged
merged 2 commits into from
Mar 12, 2025
Merged

Skip ratelimits for admin recovery code burns #17766

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc11f34
Skip ratelimts for admin recovery code burns
di Mar 12, 2025
95083ab
Merge branch 'main' into skip-ratelimits
di Mar 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion tests/unit/admin/views/test_users.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1477,12 +1477,15 @@ class TestUserBurnRecoveryCodes:
def test_burns_recovery_codes(self, db_request, monkeypatch, user_service):
user = UserFactory.create()
codes = user_service.generate_recovery_codes(user.id)
user_service._check_ratelimits = pretend.call_recorder(
user_service._check_ratelimits
)

# Burn one code in advance
user.recovery_codes[0].burned = datetime.datetime.now(datetime.UTC)

# Provide all the codes, plus one invalid code
db_request.POST["to_burn"] = f"{'\n'.join(codes)}\ninvalid"
db_request.POST["to_burn"] = "\n".join(codes) + "\ninvalid"
db_request.route_path = pretend.call_recorder(lambda *a, **kw: "/foobar")
db_request.session = pretend.stub(
flash=pretend.call_recorder(lambda *a, **kw: None)
Expand All @@ -1501,6 +1504,7 @@ def test_burns_recovery_codes(self, db_request, monkeypatch, user_service):
]
assert result.status_code == 303
assert result.location == "/foobar"
assert user_service._check_ratelimits.calls == []

def test_no_recovery_codes_provided(self, db_request, monkeypatch, user_service):
user = UserFactory.create()
Expand Down
11 changes: 6 additions & 5 deletions warehouse/accounts/services.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -606,13 +606,14 @@ def generate_recovery_codes(self, user_id):

return recovery_codes

def check_recovery_code(self, user_id, code):
def check_recovery_code(self, user_id, code, skip_ratelimits=False):
self._metrics.increment("warehouse.authentication.recovery_code.start")

self._check_ratelimits(
userid=user_id,
tags=["mechanism:check_recovery_code"],
)
if not skip_ratelimits:
self._check_ratelimits(
userid=user_id,
tags=["mechanism:check_recovery_code"],
)

user = self.get_user(user_id)
stored_recovery_code = self.get_recovery_code(user.id, code)
Expand Down
2 changes: 1 addition & 1 deletion warehouse/admin/views/users.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -619,7 +619,7 @@ def user_burn_recovery_codes(user, request):

for code in codes:
try:
user_service.check_recovery_code(user.id, code)
user_service.check_recovery_code(user.id, code, skip_ratelimits=True)
n_burned += 1
except (BurnedRecoveryCode, InvalidRecoveryCode):
pass
Expand Down