+ {% blocktrans %}
+ Your account has expired, please contact the administrator.
+ {% endblocktrans %}
+
+
+ {% elif request.user.will_expired %}
+
+ {% trans 'Your account will at' %} {{ request.user.date_expired }} {% trans 'expired. ' %}
+
+
+ {% endif %}
+{% endblock %}
+
{% block password_expired_message %}
{% url 'users:user-password-update' as user_password_update_url %}
- {% if request.user.password_has_expired %}
+ {% if request.user.password_has_expired %}
{% blocktrans %}
Your password has expired, please click
this link update password.
diff --git a/apps/terminal/serializers/v1.py b/apps/terminal/serializers/v1.py
index 10898ebd6..e2807731c 100644
--- a/apps/terminal/serializers/v1.py
+++ b/apps/terminal/serializers/v1.py
@@ -27,6 +27,7 @@ class TerminalSerializer(serializers.ModelSerializer):
class SessionSerializer(BulkOrgResourceModelSerializer):
command_amount = serializers.IntegerField(read_only=True)
+ org_id = serializers.CharField(allow_blank=True)
class Meta:
model = Session
diff --git a/apps/users/models/user.py b/apps/users/models/user.py
index a6cdf9f0e..c2a568c34 100644
--- a/apps/users/models/user.py
+++ b/apps/users/models/user.py
@@ -402,6 +402,18 @@ class User(AuthMixin, TokenMixin, RoleMixin, MFAMixin, AbstractUser):
else:
return False
+ @property
+ def expired_remain_days(self):
+ date_remain = self.date_expired - timezone.now()
+ return date_remain.days
+
+ @property
+ def will_expired(self):
+ if 0 <= self.expired_remain_days < 5:
+ return True
+ else:
+ return False
+
@property
def is_valid(self):
if self.is_active and not self.is_expired:
@@ -411,7 +423,7 @@ class User(AuthMixin, TokenMixin, RoleMixin, MFAMixin, AbstractUser):
@property
def is_local(self):
return self.source == self.SOURCE_LOCAL
-
+
def save(self, *args, **kwargs):
if not self.name:
self.name = self.username
diff --git a/apps/users/tasks.py b/apps/users/tasks.py
index ab025cae3..cbdfd4848 100644
--- a/apps/users/tasks.py
+++ b/apps/users/tasks.py
@@ -1,16 +1,15 @@
# -*- coding: utf-8 -*-
#
-import datetime
-from django.utils import timezone
-from django.conf import settings
from celery import shared_task
from ops.celery.utils import create_or_update_celery_periodic_tasks
-from ops.celery.decorator import after_app_ready_start, register_as_period_task
+from ops.celery.decorator import after_app_ready_start
from common.utils import get_logger
from .models import User
-from .utils import send_password_expiration_reminder_mail
+from .utils import (
+ send_password_expiration_reminder_mail, send_user_expiration_reminder_mail
+)
logger = get_logger(__file__)
@@ -43,4 +42,27 @@ def check_password_expired_periodic():
create_or_update_celery_periodic_tasks(tasks)
+@shared_task
+def check_user_expired():
+ users = User.objects.exclude(role=User.ROLE_APP)
+ for user in users:
+ if not user.is_valid:
+ continue
+ if not user.will_expired:
+ continue
+ send_user_expiration_reminder_mail(user)
+
+
+@shared_task
+@after_app_ready_start
+def check_user_expired_periodic():
+ tasks = {
+ 'check_user_expired_periodic': {
+ 'task': check_user_expired.name,
+ 'interval': None,
+ 'crontab': '0 14 * * *',
+ 'enabled': True,
+ }
+ }
+ create_or_update_celery_periodic_tasks(tasks)
diff --git a/apps/users/utils.py b/apps/users/utils.py
index 88564c2d3..f076e8df7 100644
--- a/apps/users/utils.py
+++ b/apps/users/utils.py
@@ -89,20 +89,20 @@ def send_reset_password_mail(user):
recipient_list = [user.email]
message = _("""
Hello %(name)s:
-
+
Please click the link below to reset your password, if not your request, concern your account security
-
+
Click here reset password
-
+
This link is valid for 1 hour. After it expires,
request new one
-
+
---
-
+
Login direct
-
+
""") % {
'name': user.name,
'rest_password_url': reverse('users:reset-password', external=True),
@@ -122,24 +122,24 @@ def send_password_expiration_reminder_mail(user):
recipient_list = [user.email]
message = _("""
Hello %(name)s:
-
+
Your password will expire in %(date_password_expired)s,
-
+
For your account security, please click on the link below to update your password in time
-
+
Click here update password
-
+
If your password has expired, please click
Password expired
to apply for a password reset email.
-
+
---
-
+
Login direct
-
+
""") % {
'name': user.name,
'date_password_expired': datetime.fromtimestamp(datetime.timestamp(
@@ -155,18 +155,39 @@ def send_password_expiration_reminder_mail(user):
send_mail_async.delay(subject, message, recipient_list, html_message=message)
+def send_user_expiration_reminder_mail(user):
+ subject = _('Expiration notice')
+ recipient_list = [user.email]
+ message = _("""
+ Hello %(name)s:
+
+ Your account will expire in %(date_expired)s,
+
+ In order not to affect your normal work, please contact the administrator for confirmation.
+
+ """) % {
+ 'name': user.name,
+ 'date_expired': datetime.fromtimestamp(datetime.timestamp(
+ user.date_expired)).strftime('%Y-%m-%d %H:%M'),
+ }
+ if settings.DEBUG:
+ logger.debug(message)
+
+ send_mail_async.delay(subject, message, recipient_list, html_message=message)
+
+
def send_reset_ssh_key_mail(user):
subject = _('SSH Key Reset')
recipient_list = [user.email]
message = _("""
Hello %(name)s:
-
+
Your ssh public key has been reset by site administrator.
Please login and reset your ssh public key.
-
+
Login direct
-
+
""") % {
'name': user.name,
'login_url': reverse('authentication:login', external=True),
@@ -299,6 +320,12 @@ def increase_login_failed_count(username, ip):
cache.set(key_limit, count, int(limit_time)*60)
+def get_login_failed_count(username, ip):
+ key_limit = key_prefix_limit.format(username, ip)
+ count = cache.get(key_limit, 0)
+ return count
+
+
def clean_failed_count(username, ip):
key_limit = key_prefix_limit.format(username, ip)
key_block = key_prefix_block.format(username)
@@ -307,9 +334,8 @@ def clean_failed_count(username, ip):
def is_block_login(username, ip):
- key_limit = key_prefix_limit.format(username, ip)
+ count = get_login_failed_count(username, ip)
key_block = key_prefix_block.format(username)
- count = cache.get(key_limit, 0)
limit_count = settings.SECURITY_LOGIN_LIMIT_COUNT
limit_time = settings.SECURITY_LOGIN_LIMIT_TIME