From 0f7c8c25700bdc4f39cf12adf28f4aaf7e900575 Mon Sep 17 00:00:00 2001
From: feng626 <1304903146@qq.com>
Date: Thu, 16 Sep 2021 10:14:34 +0800
Subject: [PATCH 01/15] =?UTF-8?q?fix:=20=E5=B7=A5=E5=8D=95=E5=A4=8D?=
 =?UTF-8?q?=E6=A0=B8bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/authentication/login_wait_confirm.html            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/authentication/templates/authentication/login_wait_confirm.html b/apps/authentication/templates/authentication/login_wait_confirm.html
index 36584f26b..e72a44738 100644
--- a/apps/authentication/templates/authentication/login_wait_confirm.html
+++ b/apps/authentication/templates/authentication/login_wait_confirm.html
@@ -134,7 +134,6 @@ function cancelTicket() {
 }
 
 function cancelCloseConfirm() {
-    cancelTicket();
     window.onbeforeunload = function() {};
     window.onunload = function(){};
 }
@@ -158,6 +157,7 @@ $(document).ready(function () {
     cancelCloseConfirm();
     window.location.reload();
 }).on('click', '.btn-return', function () {
+    cancelTicket();
     cancelCloseConfirm();
     window.location = "{% url 'authentication:login' %}"
 })

From 2030cbd19dabc8bbc948a9acc4e78a286325d0c7 Mon Sep 17 00:00:00 2001
From: fit2bot <68588906+fit2bot@users.noreply.github.com>
Date: Thu, 16 Sep 2021 10:36:24 +0800
Subject: [PATCH 02/15] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dauthbook?=
 =?UTF-8?q?=E4=BF=A1=E5=8F=B7=E7=9B=91=E5=90=AC=EF=BC=9B=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E7=BF=BB=E8=AF=91=E6=96=87=E4=BB=B6.mo=20(#6882)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Michael Bai <baijiangjie@gmail.com>
Co-authored-by: Jiangjie.Bai <32935519+BaiJiangJie@users.noreply.github.com>
---
 apps/assets/signals_handler/authbook.py |   4 ++--
 apps/locale/zh/LC_MESSAGES/django.mo    | Bin 94985 -> 95490 bytes
 apps/locale/zh/LC_MESSAGES/django.po    |  12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/assets/signals_handler/authbook.py b/apps/assets/signals_handler/authbook.py
index 7564e738d..55abf5c55 100644
--- a/apps/assets/signals_handler/authbook.py
+++ b/apps/assets/signals_handler/authbook.py
@@ -1,7 +1,7 @@
 from django.dispatch import receiver
 from django.apps import apps
 from simple_history.signals import pre_create_historical_record
-from django.db.models.signals import post_save, pre_save, post_delete
+from django.db.models.signals import post_save, pre_save, pre_delete
 
 from common.utils import get_logger
 from ..models import AuthBook, SystemUser
@@ -28,7 +28,7 @@ def pre_create_historical_record_callback(sender, history_instance=None, **kwarg
             setattr(history_instance, attr, system_user_attr_value)
 
 
-@receiver(post_delete, sender=AuthBook)
+@receiver(pre_delete, sender=AuthBook)
 def on_authbook_post_delete(sender, instance, **kwargs):
     instance.remove_asset_admin_user_if_need()
 
diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo
index fbb686b2476c87d37e7185dc5defde8a4a82e00b..73b723b66aaab9bbca45fd21389a69ac57d8e7fa 100644
GIT binary patch
delta 27640
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
YuO1b>a?Nl1rn;@&;O_BFJfqY956)tMSpWb4

delta 27193
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
QsS~h1dgO@40VC4<A7$3bV*mgE

diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po
index 507c4781a..240e3dc30 100644
--- a/apps/locale/zh/LC_MESSAGES/django.po
+++ b/apps/locale/zh/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: JumpServer 0.3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-15 20:51+0800\n"
+"POT-Creation-Date: 2021-09-16 10:31+0800\n"
 "PO-Revision-Date: 2021-05-20 10:54+0800\n"
 "Last-Translator: ibuler <ibuler@qq.com>\n"
 "Language-Team: JumpServer team<ibuler@qq.com>\n"
@@ -5678,7 +5678,7 @@ msgstr "* 新密码不能是最近 {} 次的密码"
 msgid "Reset password success, return to login page"
 msgstr "重置密码成功，返回到登录页面"
 
-#: xpack/plugins/change_auth_plan/api/app.py:112
+#: xpack/plugins/change_auth_plan/api/app.py:113
 #: xpack/plugins/change_auth_plan/api/asset.py:100
 msgid "The parameter 'action' must be [{}]"
 msgstr "参数 'action' 必须是 [{}]"
@@ -6126,16 +6126,16 @@ msgstr "租户 ID"
 msgid "Subscription ID"
 msgstr "订阅 ID"
 
-#: xpack/plugins/cloud/serializers/account_attrs.py:81
-#: xpack/plugins/cloud/serializers/account_attrs.py:86
+#: xpack/plugins/cloud/serializers/account_attrs.py:87
+#: xpack/plugins/cloud/serializers/account_attrs.py:92
 msgid "API Endpoint"
 msgstr "API 端点"
 
-#: xpack/plugins/cloud/serializers/account_attrs.py:92
+#: xpack/plugins/cloud/serializers/account_attrs.py:98
 msgid "Service account key"
 msgstr "账户密钥"
 
-#: xpack/plugins/cloud/serializers/account_attrs.py:93
+#: xpack/plugins/cloud/serializers/account_attrs.py:99
 msgid "The file is in JSON format"
 msgstr "JSON 格式的文件"
 

From 7890e43f5a182e5f96896cb92471742561637598 Mon Sep 17 00:00:00 2001
From: Michael Bai <baijiangjie@gmail.com>
Date: Thu, 16 Sep 2021 10:59:01 +0800
Subject: [PATCH 03/15] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E7=BD=91?=
 =?UTF-8?q?=E5=85=B3=E6=B5=8B=E8=AF=95=E5=8F=AF=E8=BF=9E=E6=8E=A5=E6=80=A7?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/assets/models/domain.py         |  13 ++++++++++---
 apps/locale/zh/LC_MESSAGES/django.mo | Bin 95490 -> 95665 bytes
 apps/locale/zh/LC_MESSAGES/django.po |   6 +++---
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/apps/assets/models/domain.py b/apps/assets/models/domain.py
index 7aafab504..7fcb02c3c 100644
--- a/apps/assets/models/domain.py
+++ b/apps/assets/models/domain.py
@@ -144,10 +144,17 @@ class Gateway(BaseUser):
                            key_filename=self.private_key_file,
                            sock=sock,
                            timeout=5)
-        except (paramiko.SSHException, paramiko.ssh_exception.SSHException,
-                paramiko.AuthenticationException, TimeoutError) as e:
+        except (paramiko.SSHException,
+                paramiko.ssh_exception.SSHException,
+                paramiko.ChannelException,
+                paramiko.AuthenticationException,
+                TimeoutError) as e:
+
+            err = getattr(e, 'text', str(e))
+            if err == 'Connect failed':
+                err = _('Connect failed')
             self.is_connective = False
-            return False, str(e)
+            return False, err
         finally:
             client.close()
         self.is_connective = True
diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo
index 73b723b66aaab9bbca45fd21389a69ac57d8e7fa..50d8518503fbd7f1b8701755bcd010f7d83aaf4b 100644
GIT binary patch
delta 27195
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
Q_2LH$w?=Lp@HOTC0E1Jz9smFU

delta 27096
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
F`acdVg*N~I

diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po
index 240e3dc30..eb0be9db3 100644
--- a/apps/locale/zh/LC_MESSAGES/django.po
+++ b/apps/locale/zh/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: JumpServer 0.3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-16 10:31+0800\n"
+"POT-Creation-Date: 2021-09-16 10:57+0800\n"
 "PO-Revision-Date: 2021-05-20 10:54+0800\n"
 "Last-Translator: ibuler <ibuler@qq.com>\n"
 "Language-Team: JumpServer team<ibuler@qq.com>\n"
@@ -687,7 +687,7 @@ msgstr "无法连接到 {ip} 上的端口 {port}"
 msgid "Authentication failed"
 msgstr "认证失败"
 
-#: assets/models/domain.py:133
+#: assets/models/domain.py:133 assets/models/domain.py:155
 msgid "Connect failed"
 msgstr "连接失败"
 
@@ -1433,7 +1433,7 @@ msgstr "{ApplicationPermission} 添加 {SystemUser}"
 msgid "{ApplicationPermission} REMOVE {SystemUser}"
 msgstr "{ApplicationPermission} 移除 {SystemUser}"
 
-#: authentication/api/connection_token.py:226
+#: authentication/api/connection_token.py:230
 msgid "Invalid token"
 msgstr "无效的令牌"
 

From ef8a027849e68d9d72e571ed14dd61cc90bd1bde Mon Sep 17 00:00:00 2001
From: Michael Bai <baijiangjie@gmail.com>
Date: Thu, 16 Sep 2021 11:15:28 +0800
Subject: [PATCH 04/15] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E7=BF=BB?=
 =?UTF-8?q?=E8=AF=91=EF=BC=8C=E9=93=BE=E6=8E=A5=E8=BF=87=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/locale/zh/LC_MESSAGES/django.mo | Bin 95665 -> 95665 bytes
 apps/locale/zh/LC_MESSAGES/django.po |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo
index 50d8518503fbd7f1b8701755bcd010f7d83aaf4b..26741a205f8b0dd8985259568eba7b5ac523acaf 100644
GIT binary patch
delta 24
gcmdn^nswuA)`l&Nd8TYHC+~aKw{&}nDWk0e0GIX)QUCw|

delta 24
gcmdn^nswuA)`l&Nd8Ta7W~_fYVcGT)Q$||{0GELaM*si-

diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po
index eb0be9db3..3f2bd2211 100644
--- a/apps/locale/zh/LC_MESSAGES/django.po
+++ b/apps/locale/zh/LC_MESSAGES/django.po
@@ -3980,7 +3980,7 @@ msgstr "链接失效"
 
 #: terminal/models/sharing.py:50
 msgid "Link expired"
-msgstr "是否过期"
+msgstr "链接过期"
 
 #: terminal/models/sharing.py:63
 msgid "Session sharing"

From 1ab247ac22f304c40d17130b2c997b0c605d1b7a Mon Sep 17 00:00:00 2001
From: xinwen <coderWen@126.com>
Date: Thu, 16 Sep 2021 13:28:43 +0800
Subject: [PATCH 05/15] =?UTF-8?q?fix:=20=E7=94=A8=E6=88=B7=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81=E8=BF=87=E6=9C=9F=E6=8F=90=E9=86=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/users/notifications.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/apps/users/notifications.py b/apps/users/notifications.py
index 87eae3b42..57b2c9308 100644
--- a/apps/users/notifications.py
+++ b/apps/users/notifications.py
@@ -1,6 +1,8 @@
 from datetime import datetime
+from urllib.parse import urljoin
 
 from django.utils.translation import ugettext as _
+from django.conf import settings
 
 from common.utils import reverse, get_request_ip_or_data, get_request_user_agent, lazyproperty
 from notifications.notifications import UserMessage
@@ -160,6 +162,8 @@ Browser: %(browser)s
 
 
 class PasswordExpirationReminderMsg(UserMessage):
+    update_password_url = urljoin(settings.SITE_URL, '/ui/#/users/profile/?activeTab=PasswordUpdate')
+
     def get_text_msg(self) -> dict:
         user = self.user
 
@@ -186,7 +190,7 @@ Login direct 👇
             'name': user.name,
             'date_password_expired': datetime.fromtimestamp(datetime.timestamp(
                 user.date_password_expired)).strftime('%Y-%m-%d %H:%M'),
-            'update_password_url': reverse('users:user-password-update', external=True),
+            'update_password_url': self.update_password_url,
             'forget_password_url': reverse('authentication:forgot-password', external=True),
             'email': user.email,
             'login_url': reverse('authentication:login', external=True),
@@ -224,7 +228,7 @@ Login direct 👇
             'name': user.name,
             'date_password_expired': datetime.fromtimestamp(datetime.timestamp(
                 user.date_password_expired)).strftime('%Y-%m-%d %H:%M'),
-            'update_password_url': reverse('users:user-password-update', external=True),
+            'update_password_url': self.update_password_url,
             'forget_password_url': reverse('authentication:forgot-password', external=True),
             'email': user.email,
             'login_url': reverse('authentication:login', external=True),

From ef7b2b79808cacb8e762ba8338b42bed589d5da8 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Thu, 16 Sep 2021 14:04:57 +0800
Subject: [PATCH 06/15] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/authentication/login.html          | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/apps/authentication/templates/authentication/login.html b/apps/authentication/templates/authentication/login.html
index c54f792c7..3dafafe51 100644
--- a/apps/authentication/templates/authentication/login.html
+++ b/apps/authentication/templates/authentication/login.html
@@ -147,7 +147,7 @@
                     {% csrf_token %}
                     <div style="line-height: 17px;margin-bottom: 20px;color: #999999;">
                     {% if form.errors %}
-                        <p class="red-fonts" style="color: red">
+                        <p class="help-block">
                             {% if form.non_field_errors %}
                                 {{ form.non_field_errors.as_text }}
                             {% endif %}
@@ -160,9 +160,15 @@
                     </div>
 
                     {% bootstrap_field form.username show_label=False %}
-                    <div class="form-group">
-                        <input type="password" class="form-control" id="password" placeholder="{% trans 'Password' %}" required="">
+
+                    <div class="form-group {% if form.password.errors %} has-error {% endif %}">
+                        <input type="password" class="form-control" id="password" placeholder="{% trans 'Password' %}" required>
                         <input id="password-hidden" type="text" style="display:none" name="{{ form.password.html_name }}">
+                        {% if form.password.errors %}
+                        <p class="help-block" style="text-align: left">
+                            {{ form.password.errors.as_text }}
+                        </p>
+                        {% endif %}
                     </div>
                     {% if form.challenge %}
                         {% bootstrap_field form.challenge show_label=False %}
@@ -220,7 +226,6 @@
                                     <i class="fa"><img src="{{ LOGIN_FEISHU_LOGO_URL }}" height="13" width="13"></i> {% trans 'FeiShu' %}
                                 </a>
                                 {% endif %}
-
                             </div>
                         {% else %}
                             <div class="text-center" style="display: inline-block;">
@@ -236,6 +241,9 @@
 <script type="text/javascript" src="/static/js/plugins/jsencrypt/jsencrypt.min.js"></script>
 <script>
     function encryptLoginPassword(password, rsaPublicKey) {
+        if (!password) {
+            return ''
+        }
         var jsencrypt = new JSEncrypt(); //加密对象
         jsencrypt.setPublicKey(rsaPublicKey); // 设置密钥
         return jsencrypt.encrypt(password); //加密

From 3cba8648cb430c4bd202e326cdf1bee1881216b9 Mon Sep 17 00:00:00 2001
From: feng626 <1304903146@qq.com>
Date: Thu, 16 Sep 2021 15:35:26 +0800
Subject: [PATCH 07/15] =?UTF-8?q?fix:=20=E5=B7=A5=E5=8D=95=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9Fbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ticket/meta/ticket_type/apply_application.py    | 13 +++++++++----
 .../ticket/meta/ticket_type/apply_asset.py          | 13 +++++++++----
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/apps/tickets/serializers/ticket/meta/ticket_type/apply_application.py b/apps/tickets/serializers/ticket/meta/ticket_type/apply_application.py
index dd3be12a7..8ea1075d2 100644
--- a/apps/tickets/serializers/ticket/meta/ticket_type/apply_application.py
+++ b/apps/tickets/serializers/ticket/meta/ticket_type/apply_application.py
@@ -1,3 +1,5 @@
+from datetime import datetime
+
 from rest_framework import serializers
 from django.utils.translation import ugettext_lazy as _
 from perms.models import ApplicationPermission
@@ -69,9 +71,12 @@ class ApplySerializer(serializers.Serializer):
             'Permission named `{}` already exists'.format(permission_name)
         ))
 
-    def validate_apply_date_expired(self, apply_date_expired):
-        apply_date_start = self.root.initial_data['meta'].get('apply_date_start')
-        if str(apply_date_expired) <= apply_date_start:
+    def validate_apply_date_expired(self, value):
+        date_start = self.root.initial_data['meta'].get('apply_date_start')
+        date_start = datetime.strptime(date_start, '%Y-%m-%dT%H:%M:%S.%fZ')
+        date_expired = self.root.initial_data['meta'].get('apply_date_expired')
+        date_expired = datetime.strptime(date_expired, '%Y-%m-%dT%H:%M:%S.%fZ')
+        if date_expired <= date_start:
             error = _('The expiration date should be greater than the start date')
             raise serializers.ValidationError(error)
-        return apply_date_expired
+        return value
diff --git a/apps/tickets/serializers/ticket/meta/ticket_type/apply_asset.py b/apps/tickets/serializers/ticket/meta/ticket_type/apply_asset.py
index 294ecd1ab..2be6da2a7 100644
--- a/apps/tickets/serializers/ticket/meta/ticket_type/apply_asset.py
+++ b/apps/tickets/serializers/ticket/meta/ticket_type/apply_asset.py
@@ -1,3 +1,5 @@
+from datetime import datetime
+
 from django.utils.translation import ugettext_lazy as _
 from rest_framework import serializers
 from perms.serializers import ActionsField
@@ -61,9 +63,12 @@ class ApplySerializer(serializers.Serializer):
             'Permission named `{}` already exists'.format(permission_name)
         ))
 
-    def validate_apply_date_expired(self, apply_date_expired):
-        apply_date_start = self.root.initial_data['meta'].get('apply_date_start')
-        if str(apply_date_expired) <= apply_date_start:
+    def validate_apply_date_expired(self, value):
+        date_start = self.root.initial_data['meta'].get('apply_date_start')
+        date_start = datetime.strptime(date_start, '%Y-%m-%dT%H:%M:%S.%fZ')
+        date_expired = self.root.initial_data['meta'].get('apply_date_expired')
+        date_expired = datetime.strptime(date_expired, '%Y-%m-%dT%H:%M:%S.%fZ')
+        if date_expired <= date_start:
             error = _('The expiration date should be greater than the start date')
             raise serializers.ValidationError(error)
-        return apply_date_expired
+        return value

From b7a62879255039728c0aa93fbd074b0a48b250a3 Mon Sep 17 00:00:00 2001
From: Michael Bai <baijiangjie@gmail.com>
Date: Thu, 16 Sep 2021 14:33:05 +0800
Subject: [PATCH 08/15] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E7=A3=81?=
 =?UTF-8?q?=E7=9B=98=E4=BD=BF=E7=94=A8=E7=AD=89key=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/ops/notifications.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/apps/ops/notifications.py b/apps/ops/notifications.py
index ac5973596..a0ed17b94 100644
--- a/apps/ops/notifications.py
+++ b/apps/ops/notifications.py
@@ -39,14 +39,14 @@ class ServerPerformanceCheckUtil(object):
             'max_threshold': False,
             'alarm_msg_format': _('The terminal is offline: {name}')
         },
-        'disk_usage': {
+        'disk_used': {
             'default': 0,
             'max_threshold': 80,
             'alarm_msg_format': _(
                 '[Disk] Disk used more than {max_threshold}%: => {value} ({name})'
             )
         },
-        'memory_usage': {
+        'memory_used': {
             'default': 0,
             'max_threshold': 85,
             'alarm_msg_format': _(
@@ -82,7 +82,6 @@ class ServerPerformanceCheckUtil(object):
         default = data['default']
         max_threshold = data['max_threshold']
         value = getattr(self._terminal.stat, item, default)
-        print(value, max_threshold, self._terminal.name, self._terminal.id)
         if isinstance(value, bool) and value != max_threshold:
             return
         elif isinstance(value, (int, float)) and value < max_threshold:

From a452f3307f78bb32aad4a94c68664b1d3f57c7af Mon Sep 17 00:00:00 2001
From: xinwen <coderWen@126.com>
Date: Thu, 16 Sep 2021 14:28:39 +0800
Subject: [PATCH 09/15] =?UTF-8?q?fix:=20=E7=BB=84=E4=BB=B6=E7=9B=91?=
 =?UTF-8?q?=E6=8E=A7=E7=9A=84=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/ops/notifications.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/apps/ops/notifications.py b/apps/ops/notifications.py
index a0ed17b94..18cb9bf61 100644
--- a/apps/ops/notifications.py
+++ b/apps/ops/notifications.py
@@ -17,13 +17,20 @@ class ServerPerformanceMessage(SystemMessage):
     def __init__(self, msg):
         self._msg = msg
 
-    def get_common_msg(self):
+    def get_html_msg(self) -> dict:
         subject = self._msg[:80]
         return {
             'subject': subject.replace('<br>', '; '),
             'message': self._msg
         }
 
+    def get_text_msg(self) -> dict:
+        subject = self._msg[:80]
+        return {
+            'subject': subject.replace('<br>', '; '),
+            'message': self._msg.replace('<br>', '\n')
+        }
+
     @classmethod
     def post_insert_to_db(cls, subscription: SystemMsgSubscription):
         admins = User.objects.filter(role=User.ROLE.ADMIN)

From a784a3320347f55dc099b24e6d43fe6e1c2bbde3 Mon Sep 17 00:00:00 2001
From: xinwen <coderWen@126.com>
Date: Thu, 16 Sep 2021 16:44:37 +0800
Subject: [PATCH 10/15] =?UTF-8?q?fix:=20=E5=8E=BB=E6=8E=89=E6=89=8B?=
 =?UTF-8?q?=E5=8A=A8=E7=B3=BB=E7=BB=9F=E7=94=A8=E6=88=B7=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5=E5=AF=86=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/authentication/api/connection_token.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/apps/authentication/api/connection_token.py b/apps/authentication/api/connection_token.py
index b53a379e7..a4b36ac3b 100644
--- a/apps/authentication/api/connection_token.py
+++ b/apps/authentication/api/connection_token.py
@@ -89,9 +89,6 @@ class ClientProtocolMixin:
         drives_redirect = is_true(self.request.query_params.get('drives_redirect'))
         token = self.create_token(user, asset, application, system_user)
 
-        if system_user.login_mode == SystemUser.LOGIN_MANUAL:
-            options['prompt for credentials on client:i'] = '1'
-
         if drives_redirect:
             options['drivestoredirect:s'] = '*'
         options['screen mode id:i'] = '2' if full_screen else '1'

From c26ca20ad82cc6d1716be37f0c01c9a4c34ddfba Mon Sep 17 00:00:00 2001
From: fit2bot <68588906+fit2bot@users.noreply.github.com>
Date: Thu, 16 Sep 2021 18:57:09 +0800
Subject: [PATCH 11/15] =?UTF-8?q?fix:=20=E6=9B=B4=E6=96=B0OIDC=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=97=B6=EF=BC=8C=E5=B0=86keycloak=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E8=BD=AC=E6=8D=A2=E4=B8=BAopenid=20(#6893)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: 修改磁盘使用等key值

* fix: 更新OIDC配置时，将keycloak配置转换为openid

Co-authored-by: Michael Bai <baijiangjie@gmail.com>
---
 apps/jumpserver/conf.py | 114 ++++++++++++++++++++++------------------
 apps/settings/models.py |  36 +++++++++++++
 2 files changed, 98 insertions(+), 52 deletions(-)

diff --git a/apps/jumpserver/conf.py b/apps/jumpserver/conf.py
index 7a807dd5d..fff8f8ff2 100644
--- a/apps/jumpserver/conf.py
+++ b/apps/jumpserver/conf.py
@@ -14,6 +14,7 @@ import types
 import errno
 import json
 import yaml
+import copy
 from importlib import import_module
 from django.urls import reverse_lazy
 from urllib.parse import urljoin, urlparse
@@ -348,7 +349,8 @@ class Config(dict):
         'HEALTH_CHECK_TOKEN': '',
     }
 
-    def compatible_auth_openid_of_key(self):
+    @staticmethod
+    def convert_keycloak_to_openid(keycloak_config):
         """
         兼容OpenID旧配置 (即 version <= 1.5.8)
         因为旧配置只支持OpenID协议的Keycloak实现,
@@ -356,65 +358,79 @@ class Config(dict):
         构造出新配置中标准OpenID协议中所需的Endpoint即可
         (Keycloak说明文档参考: https://www.keycloak.org/docs/latest/securing_apps/)
         """
-        if self.AUTH_OPENID and not self.AUTH_OPENID_REALM_NAME:
-            self['AUTH_OPENID_KEYCLOAK'] = False
 
-        if not self.AUTH_OPENID:
+        openid_config = copy.deepcopy(keycloak_config)
+
+        auth_openid = openid_config.get('AUTH_OPENID')
+        auth_openid_realm_name = openid_config.get('AUTH_OPENID_REALM_NAME')
+        auth_openid_server_url = openid_config.get('AUTH_OPENID_SERVER_URL')
+
+        if not auth_openid:
             return
 
-        realm_name = self.AUTH_OPENID_REALM_NAME
-        if realm_name is None:
+        if auth_openid and not auth_openid_realm_name:
+            # 开启的是标准 OpenID 配置，关掉 Keycloak 配置
+            openid_config.update({
+                'AUTH_OPENID_KEYCLOAK': False
+            })
+
+        if auth_openid_realm_name is None:
             return
 
-        compatible_keycloak_config = [
-            (
-                'AUTH_OPENID_PROVIDER_ENDPOINT',
-                self.AUTH_OPENID_SERVER_URL
-            ),
-            (
-                'AUTH_OPENID_PROVIDER_AUTHORIZATION_ENDPOINT',
-                '/realms/{}/protocol/openid-connect/auth'.format(realm_name)
-            ),
-            (
-                'AUTH_OPENID_PROVIDER_TOKEN_ENDPOINT',
-                '/realms/{}/protocol/openid-connect/token'.format(realm_name)
-            ),
-            (
-                'AUTH_OPENID_PROVIDER_JWKS_ENDPOINT',
-                '/realms/{}/protocol/openid-connect/certs'.format(realm_name)
-            ),
-            (
-                'AUTH_OPENID_PROVIDER_USERINFO_ENDPOINT',
-                '/realms/{}/protocol/openid-connect/userinfo'.format(realm_name)
-            ),
-            (
-                'AUTH_OPENID_PROVIDER_END_SESSION_ENDPOINT',
-                '/realms/{}/protocol/openid-connect/logout'.format(realm_name)
-            )
-        ]
-        for key, value in compatible_keycloak_config:
-            self[key] = value
+        # # convert key # #
+        compatible_config = {
+            'AUTH_OPENID_PROVIDER_ENDPOINT': auth_openid_server_url,
 
-    def compatible_auth_openid_of_value(self):
-        """
-        兼容值的绝对路径、相对路径
-        (key 为 AUTH_OPENID_PROVIDER_*_ENDPOINT 的配置)
-        """
-        if not self.AUTH_OPENID:
-            return
+            'AUTH_OPENID_PROVIDER_AUTHORIZATION_ENDPOINT': '/realms/{}/protocol/openid-connect/auth'
+                                                           ''.format(auth_openid_realm_name),
+            'AUTH_OPENID_PROVIDER_TOKEN_ENDPOINT': '/realms/{}/protocol/openid-connect/token'
+                                                   ''.format(auth_openid_realm_name),
+            'AUTH_OPENID_PROVIDER_JWKS_ENDPOINT': '/realms/{}/protocol/openid-connect/certs'
+                                                  ''.format(auth_openid_realm_name),
+            'AUTH_OPENID_PROVIDER_USERINFO_ENDPOINT': '/realms/{}/protocol/openid-connect/userinfo'
+                                                      ''.format(auth_openid_realm_name),
+            'AUTH_OPENID_PROVIDER_END_SESSION_ENDPOINT': '/realms/{}/protocol/openid-connect/logout'
+                                                         ''.format(auth_openid_realm_name)
+        }
+        for key, value in compatible_config.items():
+            openid_config[key] = value
 
-        base = self.AUTH_OPENID_PROVIDER_ENDPOINT
-        config = list(self.items())
-        for key, value in config:
+        # # convert value # #
+        """ 兼容值的绝对路径、相对路径 (key 为 AUTH_OPENID_PROVIDER_*_ENDPOINT 的配置) """
+        base = openid_config.get('AUTH_OPENID_PROVIDER_ENDPOINT')
+        for key, value in openid_config.items():
             result = re.match(r'^AUTH_OPENID_PROVIDER_.*_ENDPOINT$', key)
             if result is None:
                 continue
             if value is None:
                 # None 在 url 中有特殊含义 (比如对于: end_session_endpoint)
                 continue
+
             value = build_absolute_uri(base, value)
+            openid_config[key] = value
+
+        return openid_config
+
+    def get_keycloak_config(self):
+        keycloak_config = {
+            'AUTH_OPENID': self.AUTH_OPENID,
+            'AUTH_OPENID_REALM_NAME': self.AUTH_OPENID_REALM_NAME,
+            'AUTH_OPENID_SERVER_URL': self.AUTH_OPENID_SERVER_URL,
+            'AUTH_OPENID_PROVIDER_ENDPOINT': self.AUTH_OPENID_PROVIDER_ENDPOINT
+        }
+        return keycloak_config
+
+    def set_openid_config(self, openid_config):
+        for key, value in openid_config.items():
             self[key] = value
 
+    def compatible_auth_openid(self, keycloak_config=None):
+        if keycloak_config is None:
+            keycloak_config = self.get_keycloak_config()
+        openid_config = self.convert_keycloak_to_openid(keycloak_config)
+        if openid_config:
+            self.set_openid_config(openid_config)
+
     def compatible(self):
         """
         对配置做兼容处理
@@ -424,14 +440,8 @@ class Config(dict):
         处理顺序要保持先对key做处理, 再对value做处理,
         因为处理value的时候，只根据最新版本支持的key进行
         """
-        parts = ['key', 'value']
-        targets = ['auth_openid']
-        for part in parts:
-            for target in targets:
-                method_name = 'compatible_{}_of_{}'.format(target, part)
-                method = getattr(self, method_name, None)
-                if method is not None:
-                    method()
+        # 兼容 OpenID 配置
+        self.compatible_auth_openid()
 
     def convert_type(self, k, v):
         default_value = self.defaults.get(k)
diff --git a/apps/settings/models.py b/apps/settings/models.py
index d6dc601ee..128693bb9 100644
--- a/apps/settings/models.py
+++ b/apps/settings/models.py
@@ -84,6 +84,7 @@ class Setting(models.Model):
             getattr(self.__class__, f'refresh_{self.name}')()
         else:
             setattr(settings, self.name, self.cleaned_value)
+        self.refresh_keycloak_to_openid_if_need()
 
     @classmethod
     def refresh_authentications(cls, name):
@@ -129,6 +130,41 @@ class Setting(models.Model):
     def refresh_AUTH_OPENID(cls):
         cls.refresh_authentications('AUTH_OPENID')
 
+    def refresh_keycloak_to_openid_if_need(self):
+        watch_config_names = [
+            'AUTH_OPENID', 'AUTH_OPENID_REALM_NAME', 'AUTH_OPENID_SERVER_URL',
+            'AUTH_OPENID_PROVIDER_ENDPOINT', 'AUTH_OPENID_KEYCLOAK'
+        ]
+        if self.name not in watch_config_names:
+            # 不在监听的配置中, 不需要刷新
+            return
+        auth_keycloak = self.__class__.objects.filter(name='AUTH_OPENID_KEYCLOAK').first()
+        if not auth_keycloak or not auth_keycloak.cleaned_value:
+            # 关闭 Keycloak 方式的配置, 不需要刷新
+            return
+
+        from jumpserver.conf import Config
+        config_names = [
+            'AUTH_OPENID', 'AUTH_OPENID_REALM_NAME',
+            'AUTH_OPENID_SERVER_URL', 'AUTH_OPENID_PROVIDER_ENDPOINT'
+        ]
+        # 获取当前 keycloak 配置
+        keycloak_config = {}
+        for name in config_names:
+            setting = self.__class__.objects.filter(name=name).first()
+            if not setting:
+                continue
+            value = setting.cleaned_value
+            keycloak_config[name] = value
+
+        # 转化 keycloak 配置为 openid 配置
+        openid_config = Config.convert_keycloak_to_openid(keycloak_config)
+        if not openid_config:
+            return
+        # 刷新 settings
+        for key, value in openid_config.items():
+            setattr(settings, key, value)
+
     @classmethod
     def refresh_AUTH_RADIUS(cls):
         cls.refresh_authentications('AUTH_RADIUS')

From b375cd3e758174128c9edb45d641cc4768d88945 Mon Sep 17 00:00:00 2001
From: xinwen <coderWen@126.com>
Date: Thu, 16 Sep 2021 18:59:15 +0800
Subject: [PATCH 12/15] =?UTF-8?q?fix:=20otp=20=E7=BB=91=E5=AE=9A=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/locale/zh/LC_MESSAGES/django.po | 144 ++++++++++++++-------------
 apps/users/models/user.py            |   4 +
 apps/users/serializers/user.py       |   3 +-
 3 files changed, 80 insertions(+), 71 deletions(-)

diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po
index 3f2bd2211..dd0c9514a 100644
--- a/apps/locale/zh/LC_MESSAGES/django.po
+++ b/apps/locale/zh/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: JumpServer 0.3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-16 10:57+0800\n"
+"POT-Creation-Date: 2021-09-16 18:58+0800\n"
 "PO-Revision-Date: 2021-05-20 10:54+0800\n"
 "Last-Translator: ibuler <ibuler@qq.com>\n"
 "Language-Team: JumpServer team<ibuler@qq.com>\n"
@@ -98,7 +98,7 @@ msgstr "动作"
 #: terminal/backends/command/models.py:18
 #: terminal/backends/command/serializers.py:12 terminal/models/session.py:38
 #: tickets/models/comment.py:17 users/const.py:14 users/models/user.py:181
-#: users/models/user.py:809 users/models/user.py:835
+#: users/models/user.py:813 users/models/user.py:839
 #: users/serializers/group.py:19
 #: users/templates/users/user_asset_permission.html:38
 #: users/templates/users/user_asset_permission.html:64
@@ -281,7 +281,7 @@ msgstr "应用管理"
 #: applications/serializers/application.py:88 assets/models/label.py:21
 #: perms/models/application_permission.py:20
 #: perms/serializers/application/user_permission.py:33
-#: tickets/serializers/ticket/meta/ticket_type/apply_application.py:20
+#: tickets/serializers/ticket/meta/ticket_type/apply_application.py:22
 #: xpack/plugins/change_auth_plan/models/app.py:25
 msgid "Category"
 msgstr "类别"
@@ -292,7 +292,7 @@ msgstr "类别"
 #: perms/serializers/application/user_permission.py:34
 #: terminal/models/storage.py:55 terminal/models/storage.py:116
 #: tickets/models/flow.py:51 tickets/models/ticket.py:48
-#: tickets/serializers/ticket/meta/ticket_type/apply_application.py:27
+#: tickets/serializers/ticket/meta/ticket_type/apply_application.py:29
 #: xpack/plugins/change_auth_plan/models/app.py:28
 #: xpack/plugins/change_auth_plan/models/app.py:148
 msgid "Type"
@@ -310,7 +310,7 @@ msgstr ""
 #: applications/serializers/application.py:59
 #: applications/serializers/application.py:89 assets/serializers/label.py:13
 #: perms/serializers/application/permission.py:16
-#: tickets/serializers/ticket/meta/ticket_type/apply_application.py:24
+#: tickets/serializers/ticket/meta/ticket_type/apply_application.py:26
 msgid "Category display"
 msgstr "类别名称"
 
@@ -318,7 +318,7 @@ msgstr "类别名称"
 #: applications/serializers/application.py:91
 #: assets/serializers/system_user.py:26 audits/serializers.py:29
 #: perms/serializers/application/permission.py:17
-#: tickets/serializers/ticket/meta/ticket_type/apply_application.py:31
+#: tickets/serializers/ticket/meta/ticket_type/apply_application.py:33
 #: tickets/serializers/ticket/ticket.py:22
 #: tickets/serializers/ticket/ticket.py:168
 msgid "Type display"
@@ -377,7 +377,7 @@ msgstr "目标URL"
 #: applications/serializers/attrs/application_type/vmware_client.py:30
 #: assets/models/base.py:177 audits/signals_handler.py:65
 #: authentication/forms.py:22
-#: authentication/templates/authentication/login.html:164
+#: authentication/templates/authentication/login.html:165
 #: settings/serializers/auth/ldap.py:44 users/forms/profile.py:21
 #: users/templates/users/user_otp_check_password.html:13
 #: users/templates/users/user_password_update.html:43
@@ -544,7 +544,7 @@ msgstr "创建者"
 #: assets/models/label.py:25 common/db/models.py:72 common/mixins/models.py:50
 #: ops/models/adhoc.py:38 ops/models/command.py:29 orgs/models.py:26
 #: orgs/models.py:435 perms/models/base.py:52 users/models/group.py:18
-#: users/models/user.py:836 xpack/plugins/cloud/models.py:122
+#: users/models/user.py:840 xpack/plugins/cloud/models.py:122
 msgid "Date created"
 msgstr "创建日期"
 
@@ -625,7 +625,7 @@ msgid "Default"
 msgstr "默认"
 
 #: assets/models/cluster.py:36 assets/models/label.py:14
-#: users/models/user.py:821
+#: users/models/user.py:825
 msgid "System"
 msgstr "系统"
 
@@ -1091,8 +1091,8 @@ msgstr "成功"
 
 #: audits/models.py:43 ops/models/command.py:30 perms/models/base.py:49
 #: terminal/models/session.py:52
-#: tickets/serializers/ticket/meta/ticket_type/apply_application.py:53
-#: tickets/serializers/ticket/meta/ticket_type/apply_asset.py:45
+#: tickets/serializers/ticket/meta/ticket_type/apply_application.py:55
+#: tickets/serializers/ticket/meta/ticket_type/apply_asset.py:47
 #: xpack/plugins/change_auth_plan/models/base.py:105
 #: xpack/plugins/change_auth_plan/models/base.py:189
 #: xpack/plugins/gathered_user/models.py:76
@@ -1239,13 +1239,13 @@ msgid "Auth Token"
 msgstr "认证令牌"
 
 #: audits/signals_handler.py:68
-#: authentication/templates/authentication/login.html:210
+#: authentication/templates/authentication/login.html:216
 #: notifications/backends/__init__.py:11 users/models/user.py:659
 msgid "WeCom"
 msgstr "企业微信"
 
 #: audits/signals_handler.py:69
-#: authentication/templates/authentication/login.html:215
+#: authentication/templates/authentication/login.html:221
 #: notifications/backends/__init__.py:12 users/models/user.py:660
 msgid "DingTalk"
 msgstr "钉钉"
@@ -1433,7 +1433,7 @@ msgstr "{ApplicationPermission} 添加 {SystemUser}"
 msgid "{ApplicationPermission} REMOVE {SystemUser}"
 msgstr "{ApplicationPermission} 移除 {SystemUser}"
 
-#: authentication/api/connection_token.py:230
+#: authentication/api/connection_token.py:227
 msgid "Invalid token"
 msgstr "无效的令牌"
 
@@ -1764,30 +1764,30 @@ msgstr "代码错误"
 msgid "Welcome back, please enter username and password to login"
 msgstr "欢迎回来，请输入用户名和密码登录"
 
-#: authentication/templates/authentication/login.html:183
+#: authentication/templates/authentication/login.html:189
 #: users/templates/users/forgot_password.html:15
 #: users/templates/users/forgot_password.html:16
 msgid "Forgot password"
 msgstr "忘记密码"
 
-#: authentication/templates/authentication/login.html:190
+#: authentication/templates/authentication/login.html:196
 #: templates/_header_bar.html:83
 msgid "Login"
 msgstr "登录"
 
-#: authentication/templates/authentication/login.html:197
+#: authentication/templates/authentication/login.html:203
 msgid "More login options"
 msgstr "更多登录方式"
 
-#: authentication/templates/authentication/login.html:200
+#: authentication/templates/authentication/login.html:206
 msgid "OpenID"
 msgstr "OpenID"
 
-#: authentication/templates/authentication/login.html:205
+#: authentication/templates/authentication/login.html:211
 msgid "CAS"
 msgstr "CAS"
 
-#: authentication/templates/authentication/login.html:220
+#: authentication/templates/authentication/login.html:226
 #: notifications/backends/__init__.py:14 users/models/user.py:661
 msgid "FeiShu"
 msgstr "飞书"
@@ -2342,22 +2342,22 @@ msgstr "任务结束"
 msgid "Server performance"
 msgstr "监控告警"
 
-#: ops/notifications.py:40
+#: ops/notifications.py:47
 #, python-brace-format
 msgid "The terminal is offline: {name}"
 msgstr "终端已离线: {name}"
 
-#: ops/notifications.py:46
+#: ops/notifications.py:53
 #, python-brace-format
 msgid "[Disk] Disk used more than {max_threshold}%: => {value} ({name})"
 msgstr "[Disk] 硬盘使用率超过 {max_threshold}%: => {value} ({name})"
 
-#: ops/notifications.py:53
+#: ops/notifications.py:60
 #, python-brace-format
 msgid "[Memory] Memory used more than {max_threshold}%: => {value} ({name})"
 msgstr "[Memory] 内存使用率超过 {max_threshold}%: => {value} ({name})"
 
-#: ops/notifications.py:60
+#: ops/notifications.py:67
 #, python-brace-format
 msgid "[CPU] CPU load more than {max_threshold}: => {value} ({name})"
 msgstr "[CPU] CPU 使用率超过 {max_threshold}: => {value} ({name})"
@@ -2478,8 +2478,8 @@ msgid "User group"
 msgstr "用户组"
 
 #: perms/models/base.py:50
-#: tickets/serializers/ticket/meta/ticket_type/apply_application.py:56
-#: tickets/serializers/ticket/meta/ticket_type/apply_asset.py:48
+#: tickets/serializers/ticket/meta/ticket_type/apply_application.py:58
+#: tickets/serializers/ticket/meta/ticket_type/apply_asset.py:50
 #: users/models/user.py:642
 msgid "Date expired"
 msgstr "失效日期"
@@ -2583,7 +2583,7 @@ msgstr "成功导入 {} 个用户 ( 组织: {} )"
 msgid "Welcome to the JumpServer open source Bastion Host"
 msgstr "欢迎使用JumpServer开源堡垒机"
 
-#: settings/models.py:155 users/templates/users/reset_password.html:29
+#: settings/models.py:191 users/templates/users/reset_password.html:29
 msgid "Setting"
 msgstr "设置"
 
@@ -4539,52 +4539,52 @@ msgstr "你有一个新的工单, 申请人 - {}"
 msgid "Your ticket has been processed, processor - {}"
 msgstr "你的工单已被处理, 处理人 - {}"
 
-#: tickets/serializers/ticket/meta/ticket_type/apply_application.py:16
-#: tickets/serializers/ticket/meta/ticket_type/apply_asset.py:16
+#: tickets/serializers/ticket/meta/ticket_type/apply_application.py:18
+#: tickets/serializers/ticket/meta/ticket_type/apply_asset.py:18
 msgid "Apply name"
 msgstr "应用名称"
 
-#: tickets/serializers/ticket/meta/ticket_type/apply_application.py:35
+#: tickets/serializers/ticket/meta/ticket_type/apply_application.py:37
 msgid "Apply applications"
 msgstr "申请应用"
 
-#: tickets/serializers/ticket/meta/ticket_type/apply_application.py:40
+#: tickets/serializers/ticket/meta/ticket_type/apply_application.py:42
 msgid "Apply applications display"
 msgstr "应用名称名称"
 
-#: tickets/serializers/ticket/meta/ticket_type/apply_application.py:44
+#: tickets/serializers/ticket/meta/ticket_type/apply_application.py:46
 msgid "Apply system users"
 msgstr "系统用户"
 
-#: tickets/serializers/ticket/meta/ticket_type/apply_application.py:49
+#: tickets/serializers/ticket/meta/ticket_type/apply_application.py:51
 msgid "Apply system user display"
 msgstr "批准的系统用户名称"
 
-#: tickets/serializers/ticket/meta/ticket_type/apply_application.py:69
-#: tickets/serializers/ticket/meta/ticket_type/apply_asset.py:61
+#: tickets/serializers/ticket/meta/ticket_type/apply_application.py:71
+#: tickets/serializers/ticket/meta/ticket_type/apply_asset.py:63
 #: tickets/serializers/ticket/ticket.py:127
 msgid "Permission named `{}` already exists"
 msgstr "授权名称 `{}` 已存在"
 
-#: tickets/serializers/ticket/meta/ticket_type/apply_application.py:75
-#: tickets/serializers/ticket/meta/ticket_type/apply_asset.py:67
+#: tickets/serializers/ticket/meta/ticket_type/apply_application.py:80
+#: tickets/serializers/ticket/meta/ticket_type/apply_asset.py:72
 msgid "The expiration date should be greater than the start date"
 msgstr "过期时间要大于开始时间"
 
-#: tickets/serializers/ticket/meta/ticket_type/apply_asset.py:20
+#: tickets/serializers/ticket/meta/ticket_type/apply_asset.py:22
 msgid "Apply assets"
 msgstr "申请资产"
 
-#: tickets/serializers/ticket/meta/ticket_type/apply_asset.py:24
+#: tickets/serializers/ticket/meta/ticket_type/apply_asset.py:26
 msgid "Approve assets display"
 msgstr "批准的资产名称"
 
-#: tickets/serializers/ticket/meta/ticket_type/apply_asset.py:29
+#: tickets/serializers/ticket/meta/ticket_type/apply_asset.py:31
 msgid "Approve system users"
 msgstr "批准的系统用户"
 
-#: tickets/serializers/ticket/meta/ticket_type/apply_asset.py:33
-#: tickets/serializers/ticket/meta/ticket_type/apply_asset.py:41
+#: tickets/serializers/ticket/meta/ticket_type/apply_asset.py:35
+#: tickets/serializers/ticket/meta/ticket_type/apply_asset.py:43
 msgid "Apply assets display"
 msgstr "批准的资产名称"
 
@@ -4799,21 +4799,21 @@ msgstr "最后更新密码日期"
 msgid "Need update password"
 msgstr "需要更新密码"
 
-#: users/models/user.py:817
+#: users/models/user.py:821
 msgid "Administrator"
 msgstr "管理员"
 
-#: users/models/user.py:820
+#: users/models/user.py:824
 msgid "Administrator is the super user of system"
 msgstr "Administrator是初始的超级管理员"
 
-#: users/notifications.py:17 users/notifications.py:50
+#: users/notifications.py:19 users/notifications.py:52
 #: users/templates/users/reset_password.html:5
 #: users/templates/users/reset_password.html:6
 msgid "Reset password"
 msgstr "重置密码"
 
-#: users/notifications.py:18
+#: users/notifications.py:20
 #, python-format
 msgid ""
 "\n"
@@ -4853,7 +4853,7 @@ msgstr ""
 "%(login_url)s\n"
 "\n"
 
-#: users/notifications.py:51
+#: users/notifications.py:53
 #, python-format
 msgid ""
 "\n"
@@ -4897,12 +4897,12 @@ msgstr ""
 "    <br>\n"
 "    "
 
-#: users/notifications.py:90 users/notifications.py:122
+#: users/notifications.py:92 users/notifications.py:124
 #: users/views/profile/reset.py:127
 msgid "Reset password success"
 msgstr "重置密码成功"
 
-#: users/notifications.py:91
+#: users/notifications.py:93
 #, python-format
 msgid ""
 "\n"
@@ -4948,7 +4948,7 @@ msgstr ""
 "        \n"
 "        "
 
-#: users/notifications.py:123
+#: users/notifications.py:125
 #, python-format
 msgid ""
 "\n"
@@ -5011,11 +5011,11 @@ msgstr ""
 "    \n"
 "    "
 
-#: users/notifications.py:166 users/notifications.py:202
+#: users/notifications.py:170 users/notifications.py:206
 msgid "Security notice"
 msgstr "安全通知"
 
-#: users/notifications.py:167
+#: users/notifications.py:171
 #, python-format
 msgid ""
 "\n"
@@ -5059,7 +5059,7 @@ msgstr ""
 "\n"
 "        "
 
-#: users/notifications.py:203
+#: users/notifications.py:207
 #, python-format
 msgid ""
 "\n"
@@ -5108,11 +5108,11 @@ msgstr ""
 "    <br>\n"
 "    "
 
-#: users/notifications.py:240 users/notifications.py:259
+#: users/notifications.py:244 users/notifications.py:263
 msgid "Expiration notice"
 msgstr "过期通知"
 
-#: users/notifications.py:241
+#: users/notifications.py:245
 #, python-format
 msgid ""
 "\n"
@@ -5133,7 +5133,7 @@ msgstr ""
 "为了不影响您正常工作，请联系管理员确认。\n"
 "           "
 
-#: users/notifications.py:260
+#: users/notifications.py:264
 #, python-format
 msgid ""
 "\n"
@@ -5155,11 +5155,11 @@ msgstr ""
 "       <br>\n"
 "       "
 
-#: users/notifications.py:280 users/notifications.py:301
+#: users/notifications.py:284 users/notifications.py:305
 msgid "SSH Key Reset"
 msgstr "重置SSH密钥"
 
-#: users/notifications.py:281
+#: users/notifications.py:285
 #, python-format
 msgid ""
 "\n"
@@ -5184,7 +5184,7 @@ msgstr ""
 "\n"
 "        "
 
-#: users/notifications.py:302
+#: users/notifications.py:306
 #, python-format
 msgid ""
 "\n"
@@ -5209,11 +5209,11 @@ msgstr ""
 "    <br>\n"
 "    "
 
-#: users/notifications.py:324 users/notifications.py:344
+#: users/notifications.py:328 users/notifications.py:348
 msgid "MFA Reset"
 msgstr "重置 MFA"
 
-#: users/notifications.py:325
+#: users/notifications.py:329
 #, python-format
 msgid ""
 "\n"
@@ -5238,7 +5238,7 @@ msgstr ""
 "\n"
 "        "
 
-#: users/notifications.py:345
+#: users/notifications.py:349
 #, python-format
 msgid ""
 "\n"
@@ -5267,7 +5267,7 @@ msgstr ""
 msgid "The old password is incorrect"
 msgstr "旧密码错误"
 
-#: users/serializers/profile.py:36 users/serializers/user.py:140
+#: users/serializers/profile.py:36 users/serializers/user.py:141
 msgid "Password does not match security rules"
 msgstr "密码不满足安全规则"
 
@@ -5353,11 +5353,15 @@ msgstr "是否绑定了钉钉"
 msgid "Is feishu bound"
 msgstr "是否绑定了飞书"
 
-#: users/serializers/user.py:114
+#: users/serializers/user.py:91
+msgid "Is OTP bound"
+msgstr "是否绑定了虚拟MFA"
+
+#: users/serializers/user.py:115
 msgid "Role limit to {}"
 msgstr "角色只能为 {}"
 
-#: users/serializers/user.py:234
+#: users/serializers/user.py:235
 msgid "name not unique"
 msgstr "名称重复"
 
@@ -5678,7 +5682,7 @@ msgstr "* 新密码不能是最近 {} 次的密码"
 msgid "Reset password success, return to login page"
 msgstr "重置密码成功，返回到登录页面"
 
-#: xpack/plugins/change_auth_plan/api/app.py:113
+#: xpack/plugins/change_auth_plan/api/app.py:112
 #: xpack/plugins/change_auth_plan/api/asset.py:100
 msgid "The parameter 'action' must be [{}]"
 msgstr "参数 'action' 必须是 [{}]"
@@ -6126,16 +6130,16 @@ msgstr "租户 ID"
 msgid "Subscription ID"
 msgstr "订阅 ID"
 
-#: xpack/plugins/cloud/serializers/account_attrs.py:87
-#: xpack/plugins/cloud/serializers/account_attrs.py:92
+#: xpack/plugins/cloud/serializers/account_attrs.py:81
+#: xpack/plugins/cloud/serializers/account_attrs.py:86
 msgid "API Endpoint"
 msgstr "API 端点"
 
-#: xpack/plugins/cloud/serializers/account_attrs.py:98
+#: xpack/plugins/cloud/serializers/account_attrs.py:92
 msgid "Service account key"
 msgstr "账户密钥"
 
-#: xpack/plugins/cloud/serializers/account_attrs.py:99
+#: xpack/plugins/cloud/serializers/account_attrs.py:93
 msgid "The file is in JSON format"
 msgstr "JSON 格式的文件"
 
diff --git a/apps/users/models/user.py b/apps/users/models/user.py
index 3a369e808..df5b436ef 100644
--- a/apps/users/models/user.py
+++ b/apps/users/models/user.py
@@ -685,6 +685,10 @@ class User(AuthMixin, TokenMixin, RoleMixin, MFAMixin, AbstractUser):
     def is_feishu_bound(self):
         return bool(self.feishu_id)
 
+    @property
+    def is_otp_secret_key_bound(self):
+        return bool(self.otp_secret_key)
+
     def get_absolute_url(self):
         return reverse('users:user-detail', args=(self.id,))
 
diff --git a/apps/users/serializers/user.py b/apps/users/serializers/user.py
index 82e9c1c50..20a94d224 100644
--- a/apps/users/serializers/user.py
+++ b/apps/users/serializers/user.py
@@ -51,7 +51,7 @@ class UserSerializer(CommonBulkSerializerMixin, serializers.ModelSerializer):
             'mfa_enabled', 'is_valid', 'is_expired', 'is_active',  # 布尔字段
             'date_expired', 'date_joined', 'last_login',  # 日期字段
             'created_by', 'comment',  # 通用字段
-            'is_wecom_bound', 'is_dingtalk_bound', 'is_feishu_bound',
+            'is_wecom_bound', 'is_dingtalk_bound', 'is_feishu_bound', 'is_otp_secret_key_bound',
             'wecom_id', 'dingtalk_id', 'feishu_id'
         ]
         # 包含不太常用的字段，可以没有
@@ -88,6 +88,7 @@ class UserSerializer(CommonBulkSerializerMixin, serializers.ModelSerializer):
             'is_wecom_bound': {'label': _('Is wecom bound')},
             'is_dingtalk_bound': {'label': _('Is dingtalk bound')},
             'is_feishu_bound': {'label': _('Is feishu bound')},
+            'is_otp_secret_key_bound': {'label': _('Is OTP bound')},
             'phone': {'validators': [PhoneValidator()]},
         }
 

From 2c46072db23a249d55c9741d1d69d9531efb9cc3 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Thu, 16 Sep 2021 19:06:16 +0800
Subject: [PATCH 13/15] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dserializer?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/authentication/forms.py          | 4 ++--
 apps/authentication/mixins.py         | 5 ++++-
 apps/authentication/views/login.py    | 8 ++++----
 apps/settings/serializers/security.py | 2 +-
 apps/users/models/user.py             | 1 +
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/apps/authentication/forms.py b/apps/authentication/forms.py
index 948ceabff..d4c1375e6 100644
--- a/apps/authentication/forms.py
+++ b/apps/authentication/forms.py
@@ -67,9 +67,9 @@ class ChallengeMixin(forms.Form):
 
 def get_user_login_form_cls(*, captcha=False):
     bases = []
-    if settings.SECURITY_LOGIN_CAPTCHA_ENABLED and captcha:
-        bases.append(CaptchaMixin)
     if settings.SECURITY_LOGIN_CHALLENGE_ENABLED:
         bases.append(ChallengeMixin)
+    elif settings.SECURITY_LOGIN_CAPTCHA_ENABLED and captcha:
+        bases.append(CaptchaMixin)
     bases.append(UserLoginForm)
     return type('UserLoginForm', tuple(bases), {})
diff --git a/apps/authentication/mixins.py b/apps/authentication/mixins.py
index ef76c8b74..5295d4c40 100644
--- a/apps/authentication/mixins.py
+++ b/apps/authentication/mixins.py
@@ -191,7 +191,10 @@ class AuthMixin(PasswordEncryptionViewMixin):
         raise self.partial_credential_error(error=error)
 
     def _set_partial_credential_error(self, username, ip, request):
-        self.partial_credential_error = partial(errors.CredentialError, username=username, ip=ip, request=request)
+        self.partial_credential_error = partial(
+            errors.CredentialError, username=username,
+            ip=ip, request=request
+        )
 
     def get_auth_data(self, decrypt_passwd=False):
         request = self.request
diff --git a/apps/authentication/views/login.py b/apps/authentication/views/login.py
index 084004a3a..a33d8cee8 100644
--- a/apps/authentication/views/login.py
+++ b/apps/authentication/views/login.py
@@ -9,6 +9,7 @@ from django.contrib.auth import login as auth_login, logout as auth_logout
 from django.http import HttpResponse
 from django.shortcuts import reverse, redirect
 from django.utils.decorators import method_decorator
+from django.db import transaction
 from django.utils.translation import ugettext as _
 from django.views.decorators.cache import never_cache
 from django.views.decorators.csrf import csrf_protect
@@ -18,14 +19,13 @@ from django.views.generic.edit import FormView
 from django.conf import settings
 from django.urls import reverse_lazy
 from django.contrib.auth import BACKEND_SESSION_KEY
-from django.db.transaction import atomic
 
-from common.utils import get_request_ip, FlashMessageUtil
+from common.utils import FlashMessageUtil
 from users.utils import (
     redirect_user_first_login_or_index
 )
 from ..const import RSA_PRIVATE_KEY, RSA_PUBLIC_KEY
-from .. import mixins, errors, utils
+from .. import mixins, errors
 from ..forms import get_user_login_form_cls
 
 
@@ -109,7 +109,7 @@ class UserLoginView(mixins.AuthMixin, FormView):
         self.request.session.delete_test_cookie()
 
         try:
-            with atomic():
+            with transaction.atomic():
                 self.check_user_auth(decrypt_passwd=True)
         except errors.AuthFailedError as e:
             form.add_error(None, e.msg)
diff --git a/apps/settings/serializers/security.py b/apps/settings/serializers/security.py
index 98bf38d52..2872baa38 100644
--- a/apps/settings/serializers/security.py
+++ b/apps/settings/serializers/security.py
@@ -70,7 +70,7 @@ class SecurityAuthSerializer(serializers.Serializer):
         help_text=_("If enable, CAS、OIDC auth will be failed, if user not exist yet")
     )
     SECURITY_MFA_VERIFY_TTL = serializers.IntegerField(
-        min_value=5, max_value=60*30,
+        min_value=5, max_value=60*60*10,
         label=_("MFA verify TTL"), help_text=_("Unit: second"),
     )
     SECURITY_LOGIN_CAPTCHA_ENABLED = serializers.BooleanField(
diff --git a/apps/users/models/user.py b/apps/users/models/user.py
index df5b436ef..385e085da 100644
--- a/apps/users/models/user.py
+++ b/apps/users/models/user.py
@@ -472,6 +472,7 @@ class MFAMixin:
         (2, _("Force enable")),
     )
     is_org_admin: bool
+    username: str
 
     @property
     def mfa_enabled(self):

From f963c5ef9d3e4f5ddaba3e9ade291b06fe52840f Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Thu, 16 Sep 2021 19:28:02 +0800
Subject: [PATCH 14/15] =?UTF-8?q?perf:=20=E4=BF=AE=E6=94=B9=E7=BF=BB?=
 =?UTF-8?q?=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/locale/zh/LC_MESSAGES/django.mo  | Bin 95665 -> 95849 bytes
 apps/locale/zh/LC_MESSAGES/django.po  |  71 ++++++++++++++------------
 apps/settings/serializers/security.py |   2 +-
 3 files changed, 40 insertions(+), 33 deletions(-)

diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo
index 26741a205f8b0dd8985259568eba7b5ac523acaf..f4fc0153399ff5f61a8f660980ec43739538b445 100644
GIT binary patch
delta 26570
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

delta 26423
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

diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po
index dd0c9514a..a95e8dfba 100644
--- a/apps/locale/zh/LC_MESSAGES/django.po
+++ b/apps/locale/zh/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: JumpServer 0.3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-16 18:58+0800\n"
+"POT-Creation-Date: 2021-09-16 19:25+0800\n"
 "PO-Revision-Date: 2021-05-20 10:54+0800\n"
 "Last-Translator: ibuler <ibuler@qq.com>\n"
 "Language-Team: JumpServer team<ibuler@qq.com>\n"
@@ -25,7 +25,7 @@ msgstr ""
 #: orgs/models.py:24 perms/models/base.py:44 settings/models.py:29
 #: settings/serializers/sms.py:6 terminal/models/storage.py:23
 #: terminal/models/task.py:16 terminal/models/terminal.py:100
-#: users/forms/profile.py:32 users/models/group.py:15 users/models/user.py:604
+#: users/forms/profile.py:32 users/models/group.py:15 users/models/user.py:605
 #: users/templates/users/_select_user_modal.html:13
 #: users/templates/users/user_asset_permission.html:37
 #: users/templates/users/user_asset_permission.html:154
@@ -60,7 +60,7 @@ msgstr "激活中"
 #: orgs/models.py:27 perms/models/base.py:53 settings/models.py:34
 #: terminal/models/storage.py:26 terminal/models/terminal.py:114
 #: tickets/models/ticket.py:71 users/models/group.py:16
-#: users/models/user.py:637 xpack/plugins/change_auth_plan/models/base.py:41
+#: users/models/user.py:638 xpack/plugins/change_auth_plan/models/base.py:41
 #: xpack/plugins/cloud/models.py:35 xpack/plugins/cloud/models.py:113
 #: xpack/plugins/gathered_user/models.py:26
 msgid "Comment"
@@ -98,7 +98,7 @@ msgstr "动作"
 #: terminal/backends/command/models.py:18
 #: terminal/backends/command/serializers.py:12 terminal/models/session.py:38
 #: tickets/models/comment.py:17 users/const.py:14 users/models/user.py:181
-#: users/models/user.py:813 users/models/user.py:839
+#: users/models/user.py:814 users/models/user.py:840
 #: users/serializers/group.py:19
 #: users/templates/users/user_asset_permission.html:38
 #: users/templates/users/user_asset_permission.html:64
@@ -177,7 +177,7 @@ msgstr "格式为逗号分隔的字符串, * 表示匹配所有. "
 #: applications/serializers/attrs/application_type/vmware_client.py:26
 #: assets/models/base.py:176 assets/models/gathered_user.py:15
 #: audits/models.py:105 authentication/forms.py:15 authentication/forms.py:17
-#: ops/models/adhoc.py:148 users/forms/profile.py:31 users/models/user.py:602
+#: ops/models/adhoc.py:148 users/forms/profile.py:31 users/models/user.py:603
 #: users/templates/users/_select_user_modal.html:14
 #: xpack/plugins/change_auth_plan/models/asset.py:35
 #: xpack/plugins/change_auth_plan/models/asset.py:191
@@ -531,7 +531,7 @@ msgstr "标签管理"
 #: assets/models/cluster.py:28 assets/models/cmd_filter.py:26
 #: assets/models/cmd_filter.py:67 assets/models/group.py:21
 #: common/db/models.py:70 common/mixins/models.py:49 orgs/models.py:25
-#: orgs/models.py:437 perms/models/base.py:51 users/models/user.py:645
+#: orgs/models.py:437 perms/models/base.py:51 users/models/user.py:646
 #: users/serializers/group.py:33
 #: xpack/plugins/change_auth_plan/models/base.py:45
 #: xpack/plugins/cloud/models.py:119 xpack/plugins/gathered_user/models.py:30
@@ -544,7 +544,7 @@ msgstr "创建者"
 #: assets/models/label.py:25 common/db/models.py:72 common/mixins/models.py:50
 #: ops/models/adhoc.py:38 ops/models/command.py:29 orgs/models.py:26
 #: orgs/models.py:435 perms/models/base.py:52 users/models/group.py:18
-#: users/models/user.py:840 xpack/plugins/cloud/models.py:122
+#: users/models/user.py:841 xpack/plugins/cloud/models.py:122
 msgid "Date created"
 msgstr "创建日期"
 
@@ -599,7 +599,7 @@ msgstr "带宽"
 msgid "Contact"
 msgstr "联系人"
 
-#: assets/models/cluster.py:22 users/models/user.py:623
+#: assets/models/cluster.py:22 users/models/user.py:624
 msgid "Phone"
 msgstr "手机"
 
@@ -625,7 +625,7 @@ msgid "Default"
 msgstr "默认"
 
 #: assets/models/cluster.py:36 assets/models/label.py:14
-#: users/models/user.py:825
+#: users/models/user.py:826
 msgid "System"
 msgstr "系统"
 
@@ -1160,7 +1160,7 @@ msgstr "用户代理"
 #: audits/models.py:110
 #: authentication/templates/authentication/_mfa_confirm_modal.html:14
 #: authentication/templates/authentication/login_otp.html:6
-#: users/forms/profile.py:64 users/models/user.py:626
+#: users/forms/profile.py:64 users/models/user.py:627
 #: users/serializers/profile.py:102
 msgid "MFA"
 msgstr "多因子认证"
@@ -1240,13 +1240,13 @@ msgstr "认证令牌"
 
 #: audits/signals_handler.py:68
 #: authentication/templates/authentication/login.html:216
-#: notifications/backends/__init__.py:11 users/models/user.py:659
+#: notifications/backends/__init__.py:11 users/models/user.py:660
 msgid "WeCom"
 msgstr "企业微信"
 
 #: audits/signals_handler.py:69
 #: authentication/templates/authentication/login.html:221
-#: notifications/backends/__init__.py:12 users/models/user.py:660
+#: notifications/backends/__init__.py:12 users/models/user.py:661
 msgid "DingTalk"
 msgstr "钉钉"
 
@@ -1616,15 +1616,15 @@ msgstr "来源 IP 不被允许登录"
 msgid "SSO auth closed"
 msgstr "SSO 认证关闭了"
 
-#: authentication/errors.py:298 authentication/mixins.py:318
+#: authentication/errors.py:298 authentication/mixins.py:321
 msgid "Your password is too simple, please change it for security"
 msgstr "你的密码过于简单，为了安全，请修改"
 
-#: authentication/errors.py:307 authentication/mixins.py:325
+#: authentication/errors.py:307 authentication/mixins.py:328
 msgid "You should to change your password before login"
 msgstr "登录完成前，请先修改密码"
 
-#: authentication/errors.py:316 authentication/mixins.py:332
+#: authentication/errors.py:316 authentication/mixins.py:335
 msgid "Your password has expired, please reset before logging in"
 msgstr "您的密码已过期，先修改再登录"
 
@@ -1649,7 +1649,7 @@ msgstr "MFA 类型"
 msgid "MFA code"
 msgstr "多因子认证验证码"
 
-#: authentication/mixins.py:308
+#: authentication/mixins.py:311
 msgid "Please change your password"
 msgstr "请修改密码"
 
@@ -1788,7 +1788,7 @@ msgid "CAS"
 msgstr "CAS"
 
 #: authentication/templates/authentication/login.html:226
-#: notifications/backends/__init__.py:14 users/models/user.py:661
+#: notifications/backends/__init__.py:14 users/models/user.py:662
 msgid "FeiShu"
 msgstr "飞书"
 
@@ -2186,7 +2186,7 @@ msgstr ""
 "div>"
 
 #: notifications/backends/__init__.py:10 users/forms/profile.py:101
-#: users/models/user.py:606
+#: users/models/user.py:607
 msgid "Email"
 msgstr "邮件"
 
@@ -2404,7 +2404,7 @@ msgstr "组织审计员"
 msgid "GLOBAL"
 msgstr "全局组织"
 
-#: orgs/models.py:434 users/models/user.py:614 users/serializers/user.py:37
+#: orgs/models.py:434 users/models/user.py:615 users/serializers/user.py:37
 #: users/templates/users/_select_user_modal.html:15
 msgid "Role"
 msgstr "角色"
@@ -2469,7 +2469,7 @@ msgid "Favorite"
 msgstr "收藏夹"
 
 #: perms/models/base.py:47 templates/_nav.html:21 users/models/group.py:31
-#: users/models/user.py:610 users/templates/users/_select_user_modal.html:16
+#: users/models/user.py:611 users/templates/users/_select_user_modal.html:16
 #: users/templates/users/user_asset_permission.html:39
 #: users/templates/users/user_asset_permission.html:67
 #: users/templates/users/user_database_app_permission.html:38
@@ -2480,7 +2480,7 @@ msgstr "用户组"
 #: perms/models/base.py:50
 #: tickets/serializers/ticket/meta/ticket_type/apply_application.py:58
 #: tickets/serializers/ticket/meta/ticket_type/apply_asset.py:50
-#: users/models/user.py:642
+#: users/models/user.py:643
 msgid "Date expired"
 msgstr "失效日期"
 
@@ -3132,7 +3132,7 @@ msgstr "下个设备登录，上次登录会被顶掉"
 msgid "Only exist user login"
 msgstr "仅已存在用户登录"
 
-#: settings/serializers/security.py:66 settings/serializers/security.py:70
+#: settings/serializers/security.py:66
 msgid "If enable, CAS、OIDC auth will be failed, if user not exist yet"
 msgstr "开启后，如果系统中不存在该用户，CAS、OIDC 登录将会失败"
 
@@ -3140,6 +3140,10 @@ msgstr "开启后，如果系统中不存在该用户，CAS、OIDC 登录将会
 msgid "Only from source login"
 msgstr "仅从用户来源登录"
 
+#: settings/serializers/security.py:70
+msgid "Only log in from the user source property"
+msgstr "开启后，如果用户来源为本地，CAS、OIDC 登录将会失败"
+
 #: settings/serializers/security.py:74
 msgid "MFA verify TTL"
 msgstr "MFA 校验有效期"
@@ -4758,7 +4762,7 @@ msgstr "不能和原来的密钥相同"
 msgid "Not a valid ssh public key"
 msgstr "SSH密钥不合法"
 
-#: users/forms/profile.py:160 users/models/user.py:634
+#: users/forms/profile.py:160 users/models/user.py:635
 #: users/templates/users/user_password_update.html:48
 msgid "Public key"
 msgstr "SSH公钥"
@@ -4771,39 +4775,39 @@ msgstr "短信验证码"
 msgid "Force enable"
 msgstr "强制启用"
 
-#: users/models/user.py:583
+#: users/models/user.py:584
 msgid "Local"
 msgstr "数据库"
 
-#: users/models/user.py:617
+#: users/models/user.py:618
 msgid "Avatar"
 msgstr "头像"
 
-#: users/models/user.py:620
+#: users/models/user.py:621
 msgid "Wechat"
 msgstr "微信"
 
-#: users/models/user.py:631
+#: users/models/user.py:632
 msgid "Private key"
 msgstr "ssh私钥"
 
-#: users/models/user.py:650
+#: users/models/user.py:651
 msgid "Source"
 msgstr "来源"
 
-#: users/models/user.py:654
+#: users/models/user.py:655
 msgid "Date password last updated"
 msgstr "最后更新密码日期"
 
-#: users/models/user.py:657
+#: users/models/user.py:658
 msgid "Need update password"
 msgstr "需要更新密码"
 
-#: users/models/user.py:821
+#: users/models/user.py:822
 msgid "Administrator"
 msgstr "管理员"
 
-#: users/models/user.py:824
+#: users/models/user.py:825
 msgid "Administrator is the super user of system"
 msgstr "Administrator是初始的超级管理员"
 
@@ -6247,3 +6251,6 @@ msgstr "旗舰版"
 #: xpack/plugins/license/models.py:77
 msgid "Community edition"
 msgstr "社区版"
+
+#~ msgid "Only "
+#~ msgstr "仅能从用户配置来源登录"
diff --git a/apps/settings/serializers/security.py b/apps/settings/serializers/security.py
index 2872baa38..868d2c4ef 100644
--- a/apps/settings/serializers/security.py
+++ b/apps/settings/serializers/security.py
@@ -67,7 +67,7 @@ class SecurityAuthSerializer(serializers.Serializer):
     )
     ONLY_ALLOW_AUTH_FROM_SOURCE = serializers.BooleanField(
         required=False, default=False, label=_("Only from source login"),
-        help_text=_("If enable, CAS、OIDC auth will be failed, if user not exist yet")
+        help_text=_("Only log in from the user source property")
     )
     SECURITY_MFA_VERIFY_TTL = serializers.IntegerField(
         min_value=5, max_value=60*60*10,

From 743c9bc3f1edbec444bac6c3c99f1cd1201c62f7 Mon Sep 17 00:00:00 2001
From: feng626 <1304903146@qq.com>
Date: Thu, 16 Sep 2021 19:28:41 +0800
Subject: [PATCH 15/15] =?UTF-8?q?fix:=20=E8=BF=87=E6=BB=A4=E5=85=B6?=
 =?UTF-8?q?=E5=AE=83=E7=B1=BB=E5=9E=8Bapp?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ticket/meta/ticket_type/apply_application.py         | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/apps/tickets/serializers/ticket/meta/ticket_type/apply_application.py b/apps/tickets/serializers/ticket/meta/ticket_type/apply_application.py
index 8ea1075d2..46ef5386d 100644
--- a/apps/tickets/serializers/ticket/meta/ticket_type/apply_application.py
+++ b/apps/tickets/serializers/ticket/meta/ticket_type/apply_application.py
@@ -6,6 +6,8 @@ from perms.models import ApplicationPermission
 from applications.const import AppCategory, AppType
 from orgs.utils import tmp_to_org
 from tickets.models import Ticket
+from applications.models import Application
+from assets.models import SystemUser
 from .common import DefaultPermissionName
 
 __all__ = [
@@ -71,6 +73,13 @@ class ApplySerializer(serializers.Serializer):
             'Permission named `{}` already exists'.format(permission_name)
         ))
 
+    def validate_apply_applications(self, apply_applications):
+        type = self.root.initial_data['meta'].get('apply_type')
+        org_id = self.root.initial_data.get('org_id')
+        with tmp_to_org(org_id):
+            applications = Application.objects.filter(id__in=apply_applications, type=type).values_list('id', flat=True)
+        return list(applications)
+
     def validate_apply_date_expired(self, value):
         date_start = self.root.initial_data['meta'].get('apply_date_start')
         date_start = datetime.strptime(date_start, '%Y-%m-%dT%H:%M:%S.%fZ')