Skip to content

fix: improve api key delete form validation and tests #5236

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

Merged
rjsparks merged 1 commit into from
Feb 28, 2023
Merged

fix: improve api key delete form validation and tests #5236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 13 additions & 1 deletion ietf/ietfauth/tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
from ietf.mailinglists.models import Subscribed
from ietf.meeting.factories import MeetingFactory
from ietf.nomcom.factories import NomComFactory
from ietf.person.factories import PersonFactory, EmailFactory, UserFactory
from ietf.person.factories import PersonFactory, EmailFactory, UserFactory, PersonalApiKeyFactory
from ietf.person.models import Person, Email, PersonalApiKey
from ietf.review.factories import ReviewRequestFactory, ReviewAssignmentFactory
from ietf.review.models import ReviewWish, UnavailablePeriod
Expand Down Expand Up @@ -723,8 +723,20 @@ def test_apikey_management(self):
url = urlreverse('ietf.ietfauth.views.apikey_disable')
r = self.client.get(url)

self.assertEqual(r.status_code, 200)
self.assertContains(r, 'Disable a personal API key')
self.assertContains(r, 'Key')

# Try to delete something that doesn't exist
r = self.client.post(url, {'hash': key.hash()+'bad'})
self.assertEqual(r.status_code, 200)
self.assertContains(r,"Key validation failed; key not disabled")

# Try to delete someone else's key
otherkey = PersonalApiKeyFactory()
r = self.client.post(url, {'hash': otherkey.hash()})
self.assertEqual(r.status_code, 200)
self.assertContains(r,"Key validation failed; key not disabled")

# Delete a key
r = self.client.post(url, {'hash': key.hash()})
Expand Down
4 changes: 2 additions & 2 deletions ietf/ietfauth/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -781,7 +781,7 @@ def apikey_disable(request):
#
class KeyDeleteForm(forms.Form):
hash = forms.ChoiceField(label='Key', choices=choices)
def clean_key(self):
def clean_hash(self):
hash = force_bytes(self.cleaned_data['hash'])
key = PersonalApiKey.validate_key(hash)
if key and key.person == request.user.person:
Expand All @@ -792,7 +792,7 @@ def clean_key(self):
if request.method == 'POST':
form = KeyDeleteForm(request.POST)
if form.is_valid():
hash = force_bytes(form.data['hash'])
hash = force_bytes(form.cleaned_data['hash'])
key = PersonalApiKey.validate_key(hash)
key.valid = False
key.save()
Expand Down