github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #3051 from jumpserver/dev_bai 

[Update] 密码过期邮件发送（密码未过期用户&有效用户）
pull/3052/head
BaiJiangJie 2019-07-30 12:57:55 +08:00 committed by GitHub
parent b5aa69db61 637fc91413
commit 4fe74e9e25
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/users/models/user.py
View File

@ -111,7 +111,7 @@ class AuthMixin:
@property @property
def password_will_expired(self): def password_will_expired(self):
if self.is_local and self.password_expired_remain_days < 5: if self.is_local and 0 <= self.password_expired_remain_days < 5:
return True return True
return False return False

8
apps/users/tasks.py
View File

@ -20,13 +20,13 @@ logger = get_logger(__file__)
def check_password_expired(): def check_password_expired():
users = User.objects.exclude(role=User.ROLE_APP) users = User.objects.exclude(role=User.ROLE_APP)
for user in users: for user in users:
if not user.is_valid:
continue
if not user.password_will_expired: if not user.password_will_expired:
continue continue
send_password_expiration_reminder_mail(user) send_password_expiration_reminder_mail(user)
logger.info("The user {} password expires in {} days".format( msg = "The user {} password expires in {} days"
user, user.password_expired_remain_days) logger.info(msg.format(user, user.password_expired_remain_days))
)
@shared_task @shared_task