github-jwinterm/modoboa
1
0
Fork 0
mirror of https://github.com/jwinterm/modoboa.git synced 2026-10-17 05:41:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed TFA tests v1

Browse Source
This commit is contained in:
Spitap
2023-06-30 16:28:10 +02:00
parent b03af24338
commit 30fd755492
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modoboa/core/api/v1/viewsets.py
+4 -4
View File
@@ -67,8 +67,8 @@ class AccountViewSet(GetThrottleViewsetMixin, viewsets.ViewSet):
serializer.is_valid(raise_exception=True)
if not request.user.tfa_enabled:
# We include it as "password" to display the error
return response.Response({"password": _("2FA is not enabled")},
status=400)
return response.Response({"error": _("2FA is not enabled")},
status=403)
request.user.totpdevice_set.all().delete()
request.user.staticdevice_set.all().delete()
request.user.tfa_enabled = False
@@ -89,8 +89,8 @@ class AccountViewSet(GetThrottleViewsetMixin, viewsets.ViewSet):
serializer.is_valid(raise_exception=True)
device = request.user.staticdevice_set.first()
if device is None:
return response.Response({"password": _("2FA is not enabled")},
status=400)
return response.Response({"error": _("2FA is not enabled")},
status=403)
device.token_set.all().delete()
for cpt in range(10):
token = StaticToken.random_token()
modoboa/core/tests/test_viewsets.py
+7 -5
View File
@@ -19,7 +19,7 @@ class AccountViewSetTestCase(ModoAPITestCase):
admin_factories.populate_database()
@mock.patch("django_otp.plugins.otp_totp.models.TOTPDevice.verify_token")
def test_tfa_setup_process(self, verify_mock):
def test_tfa_setup_process(self, verify_mock, password_ok="password"):
admin = models.User.objects.get(username="admin")
self.client.force_login(admin)
@@ -58,18 +58,20 @@ class AccountViewSetTestCase(ModoAPITestCase):
# Try to disable TFA auth
url = reverse("api:account-tfa-disable")
response = self.client.post(url)
data = {"password": password_ok}
response = self.client.post(url, data, format="json")
self.assertEqual(response.status_code, 200)
self.assertFalse(admin.totpdevice_set.exists())
def test_tfa_reset_codes(self):
def test_tfa_reset_codes(self, password_ok="password"):
admin = models.User.objects.get(username="admin")
self.client.force_login(admin)
url = reverse("api:account-tfa-reset-codes")
response = self.client.post(url)
data = {"password": password_ok}
response = self.client.post(url, data, format="json")
self.assertEqual(response.status_code, 403)
device = admin.staticdevice_set.create(name="Device")
response = self.client.post(url)
response = self.client.post(url, data, format="json")
self.assertEqual(response.status_code, 200)
self.assertEqual(device.token_set.count(), 10)