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

[fix] Fix has_password_expired when password_update is None #374

Merged
merged 1 commit into from
Apr 3, 2024
Merged

[fix] Fix has_password_expired when password_update is None #374

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
2 changes: 1 addition & 1 deletion openwisp_users/base/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ def set_password(self, *args, **kwargs):
return super().set_password(*args, **kwargs)

def has_password_expired(self):
if not self.has_usable_password():
if not self.has_usable_password() or self.password_updated is None:
return False
if self.is_staff and app_settings.STAFF_USER_PASSWORD_EXPIRATION:
expiry_date = self.password_updated + timezone.timedelta(
Expand Down
18 changes: 11 additions & 7 deletions openwisp_users/tests/test_models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,25 +358,21 @@ def test_has_password_expired(self):
staff_user.refresh_from_db()
end_user.refresh_from_db()

with self.subTest('Test password expiration disabled'):
with self.subTest('Test password expiration feature disabled'):
with patch.object(
app_settings, 'USER_PASSWORD_EXPIRATION', 0
), patch.object(app_settings, 'STAFF_USER_PASSWORD_EXPIRATION', 0):
self.assertEqual(staff_user.has_password_expired(), False)
self.assertEqual(end_user.has_password_expired(), False)

with self.subTest(
'Test password expiration enabled, but user password not expired'
):
with self.subTest('Test password is not expired'):
with patch.object(
app_settings, 'USER_PASSWORD_EXPIRATION', 10
), patch.object(app_settings, 'STAFF_USER_PASSWORD_EXPIRATION', 10):
self.assertEqual(staff_user.has_password_expired(), False)
self.assertEqual(end_user.has_password_expired(), False)

with self.subTest(
'Test password expiration enabled, but user password is expired'
):
with self.subTest('Test password is expired'):
User.objects.update(password_updated=now().date() - timedelta(days=180))
staff_user.refresh_from_db()
end_user.refresh_from_db()
Expand All @@ -386,6 +382,14 @@ def test_has_password_expired(self):
self.assertEqual(staff_user.has_password_expired(), True)
self.assertEqual(end_user.has_password_expired(), True)

with self.subTest('Test password_updated is None'):
User.objects.update(password_updated=None)
end_user.refresh_from_db()
with patch.object(
app_settings, 'USER_PASSWORD_EXPIRATION', 10
), patch.object(app_settings, 'STAFF_USER_PASSWORD_EXPIRATION', 10):
self.assertEqual(end_user.has_password_expired(), False)

@patch.object(app_settings, 'USER_PASSWORD_EXPIRATION', 30)
@patch.object(app_settings, 'STAFF_USER_PASSWORD_EXPIRATION', 90)
def test_password_expiration_mail(self):
Expand Down
Loading