From e81762d6922d15544e5ca8abfe3c8ee5e2b3eded Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Tue, 1 Sep 2020 13:37:16 +0800
Subject: [PATCH 01/12] =?UTF-8?q?ci(Dockerfile):=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=BE=9D=E8=B5=96=E7=9A=84setuptools=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=EF=BC=8C=E5=AF=BC=E8=87=B4=E7=9A=84ldap=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E5=AE=89=E8=A3=85=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 7cf768d85..9c0cd9dbf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,7 +21,7 @@ RUN useradd jumpserver
 RUN yum -y install epel-release && \
       echo -e "[mysql]\nname=mysql\nbaseurl=${MYSQL_MIRROR}\ngpgcheck=0\nenabled=1" > /etc/yum.repos.d/mysql.repo
 RUN yum -y install $(cat requirements/rpm_requirements.txt)
-RUN pip install --upgrade pip setuptools wheel -i ${PIP_MIRROR} && \
+RUN pip install --upgrade pip setuptools==49.6.0 wheel -i ${PIP_MIRROR} && \
     pip config set global.index-url ${PIP_MIRROR}
 RUN pip install -r requirements/requirements.txt || pip install -r requirements/requirements.txt
 

From 8227f44058acd8cc10b72cd3dbb73469f27d056a Mon Sep 17 00:00:00 2001
From: herealways <junqi1999@gmail.com>
Date: Sun, 16 Aug 2020 16:21:11 +0800
Subject: [PATCH 02/12] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0AES=20GCM?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E4=B8=BA=E9=BB=98=E8=AE=A4=E7=9A=84=E5=8A=A0?=
 =?UTF-8?q?=E5=AF=86=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/common/fields/model.py | 12 +++++--
 apps/common/utils/crypto.py | 66 +++++++++++++++++++++++++++++++++++--
 2 files changed, 73 insertions(+), 5 deletions(-)

diff --git a/apps/common/fields/model.py b/apps/common/fields/model.py
index 945a98ea4..b4ac41b2f 100644
--- a/apps/common/fields/model.py
+++ b/apps/common/fields/model.py
@@ -5,7 +5,7 @@ from django.db import models
 from django.utils.translation import ugettext_lazy as _
 from django.utils.encoding import force_text
 
-from ..utils import signer, aes_crypto
+from ..utils import signer, aes_crypto, aes_ecb_crypto
 
 
 __all__ = [
@@ -117,9 +117,17 @@ class EncryptMixin:
         return signer.unsign(value) or ''
 
     def decrypt_from_aes(self, value):
+        """
+        先尝试使用GCM模式解密，如果解不开，再尝试使用原来的ECB模式解密
+        """
         try:
             return aes_crypto.decrypt(value)
-        except (TypeError, ValueError):
+        except ValueError:
+            pass
+
+        try:
+            return aes_ecb_crypto.decrypt(value)
+        except (TypeError, ValueError, UnicodeDecodeError):
             pass
 
     def from_db_value(self, value, expression, connection, context):
diff --git a/apps/common/utils/crypto.py b/apps/common/utils/crypto.py
index ea3590d6c..31991c93c 100644
--- a/apps/common/utils/crypto.py
+++ b/apps/common/utils/crypto.py
@@ -1,5 +1,7 @@
 import base64
 from Crypto.Cipher import AES
+from Crypto.Util.Padding import pad
+from Crypto.Random import get_random_bytes
 
 from django.conf import settings
 
@@ -44,11 +46,69 @@ class AESCrypto:
         return str(aes.decrypt(base64.decodebytes(bytes(text, encoding='utf8'))).rstrip(b'\0').decode("utf8"))  # 解密
 
 
-def get_aes_crypto(key=None):
+class AESCryptoGCM:
+    """
+    使用AES GCM模式
+    """
+
+    def __init__(self, key):
+        self.key = self.process_key(key)
+
+    @staticmethod
+    def process_key(key):
+        """
+        返回32 bytes 的key
+        """
+        if not isinstance(key, bytes):
+            key = bytes(key, encoding='utf-8')
+
+        if len(key) >= 32:
+            return key[:32]
+
+        return pad(key, 32)
+
+    def encrypt(self, text):
+        """
+        加密text，并将 header, nonce, tag (3*16 bytes, base64后变为 3*24 bytes)
+        附在密文前。解密时要用到。
+        """
+        header = get_random_bytes(16)
+        cipher = AES.new(self.key, AES.MODE_GCM)
+        cipher.update(header)
+        ciphertext, tag = cipher.encrypt_and_digest(bytes(text, encoding='utf-8'))
+
+        result = []
+        for byte_data in (header, cipher.nonce, tag, ciphertext):
+            result.append(base64.b64encode(byte_data).decode('utf-8'))
+
+        return ''.join(result)
+
+    def decrypt(self, text):
+        """
+        提取header, nonce, tag并解密text。
+        """
+        metadata = text[:72]
+        header = base64.b64decode(metadata[:24])
+        nonce = base64.b64decode(metadata[24:48])
+        tag = base64.b64decode(metadata[48:])
+        ciphertext = base64.b64decode(text[72:])
+
+        cipher = AES.new(self.key, AES.MODE_GCM, nonce=nonce)
+
+        cipher.update(header)
+        plain_text_bytes = cipher.decrypt_and_verify(ciphertext, tag)
+        return plain_text_bytes.decode('utf-8')
+
+
+def get_aes_crypto(key=None, mode='GCM'):
     if key is None:
         key = settings.SECRET_KEY
-    a = AESCrypto(key)
+    if mode == 'ECB':
+        a = AESCrypto(key)
+    elif mode == 'GCM':
+        a = AESCryptoGCM(key)
     return a
 
 
-aes_crypto = get_aes_crypto()
+aes_ecb_crypto = get_aes_crypto(mode='ECB')
+aes_crypto = get_aes_crypto(mode='GCM')

From ddb71c43c475be5572080de829fd5cc8e4373589 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Tue, 1 Sep 2020 16:41:39 +0800
Subject: [PATCH 03/12] =?UTF-8?q?fix(users):=20=E4=BF=AE=E5=A4=8D=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=9C=A8=E4=B8=8D=E5=90=8C=E7=BB=84=E7=BB=87=E5=BC=95?=
 =?UTF-8?q?=E8=B5=B7=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/users/api/user.py         | 4 +---
 apps/users/models/user.py      | 6 ------
 apps/users/serializers/user.py | 3 ---
 3 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/apps/users/api/user.py b/apps/users/api/user.py
index ae4550931..148378522 100644
--- a/apps/users/api/user.py
+++ b/apps/users/api/user.py
@@ -44,9 +44,7 @@ class UserViewSet(CommonApiMixin, UserQuerysetMixin, BulkModelViewSet):
     def get_queryset(self):
         return super().get_queryset().annotate(
             gc_m2m_org_members__role=GroupConcat('m2m_org_members__role'),
-            gc_groups__name=GroupConcat('groups__name'),
-            gc_groups=GroupConcat('groups__id', output_field=CharField())
-        )
+        ).prefetch_related('groups')
 
     def send_created_signal(self, users):
         if not isinstance(users, list):
diff --git a/apps/users/models/user.py b/apps/users/models/user.py
index f65b9398e..f0f2ec896 100644
--- a/apps/users/models/user.py
+++ b/apps/users/models/user.py
@@ -560,12 +560,6 @@ class User(AuthMixin, TokenMixin, RoleMixin, MFAMixin, AbstractUser):
 
     @property
     def groups_display(self):
-        if hasattr(self, 'gc_groups__name'):
-            names = self.gc_groups__name
-            if isinstance(names, str):
-                return ' '.join(set(self.gc_groups__name.split(',')))
-            else:
-                return ''
         return ' '.join([group.name for group in self.groups.all()])
 
     @property
diff --git a/apps/users/serializers/user.py b/apps/users/serializers/user.py
index d6968a2d8..ccb269350 100644
--- a/apps/users/serializers/user.py
+++ b/apps/users/serializers/user.py
@@ -44,9 +44,6 @@ class UserSerializer(CommonBulkSerializerMixin, serializers.ModelSerializer):
         label=_('Password strategy'), write_only=True
     )
     mfa_level_display = serializers.ReadOnlyField(source='get_mfa_level_display')
-    groups = GroupConcatedPrimaryKeyRelatedField(
-        label=_('User group'), many=True, queryset=UserGroup.objects.all(), required=False
-    )
     login_blocked = serializers.SerializerMethodField()
     can_update = serializers.SerializerMethodField()
     can_delete = serializers.SerializerMethodField()

From ae9bbd26838227d1dc1871fa019623ceffad787b Mon Sep 17 00:00:00 2001
From: Bai <bugatti_it@163.com>
Date: Wed, 2 Sep 2020 09:57:28 +0800
Subject: [PATCH 04/12] =?UTF-8?q?fix(common)=20=E4=BF=AE=E5=A4=8D=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=91=98=E6=9C=AA=E8=AE=BE=E7=BD=AEEmail=E4=B8=BB?=
 =?UTF-8?q?=E9=A2=98=E5=89=8D=E7=BC=80=E5=AF=BC=E8=87=B4=E5=8F=91=E9=80=81?=
 =?UTF-8?q?=E9=82=AE=E4=BB=B6=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/common/tasks.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/common/tasks.py b/apps/common/tasks.py
index aecc54ca7..eeeee7214 100644
--- a/apps/common/tasks.py
+++ b/apps/common/tasks.py
@@ -24,7 +24,7 @@ def send_mail_async(*args, **kwargs):
     """
     if len(args) == 3:
         args = list(args)
-        args[0] = settings.EMAIL_SUBJECT_PREFIX + args[0]
+        args[0] = (settings.EMAIL_SUBJECT_PREFIX or '') + args[0]
         email_from = settings.EMAIL_FROM or settings.EMAIL_HOST_USER
         args.insert(2, email_from)
         args = tuple(args)

From 1f037b1933cafdfcdddb0e2b6ca9d2597ec4a869 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Wed, 2 Sep 2020 10:58:35 +0800
Subject: [PATCH 05/12] =?UTF-8?q?feat(i18n):=20=E6=B7=BB=E5=8A=A0=E6=96=B0?=
 =?UTF-8?q?=E7=BF=BB=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 56957 -> 56992 bytes
 apps/locale/zh/LC_MESSAGES/django.po | 147 ++++++++++++++-------------
 2 files changed, 75 insertions(+), 72 deletions(-)

diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo
index e0e23c4e4e75e48efbe1062411e431adbaca42a0..0fb6a067bbeb96fa18010b7fff2b1393273e01e4 100644
GIT binary patch
delta 16086
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

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

diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po
index ec532c0b6..f0eb5102e 100644
--- a/apps/locale/zh/LC_MESSAGES/django.po
+++ b/apps/locale/zh/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: JumpServer 0.3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-19 18:10+0800\n"
+"POT-Creation-Date: 2020-09-02 10:54+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: ibuler <ibuler@qq.com>\n"
 "Language-Team: JumpServer team<ibuler@qq.com>\n"
@@ -29,7 +29,7 @@ msgstr "自定义"
 #: orgs/models.py:22 perms/models/base.py:48 settings/models.py:27
 #: terminal/models.py:27 terminal/models.py:344 terminal/models.py:376
 #: terminal/models.py:413 users/forms/profile.py:20 users/models/group.py:15
-#: users/models/user.py:491 users/templates/users/_select_user_modal.html:13
+#: users/models/user.py:501 users/templates/users/_select_user_modal.html:13
 #: users/templates/users/user_asset_permission.html:37
 #: users/templates/users/user_asset_permission.html:154
 #: users/templates/users/user_database_app_permission.html:36
@@ -79,7 +79,7 @@ msgstr "数据库"
 #: assets/models/label.py:23 ops/models/adhoc.py:37 orgs/models.py:25
 #: perms/models/base.py:56 settings/models.py:32 terminal/models.py:37
 #: terminal/models.py:383 terminal/models.py:420 users/models/group.py:16
-#: users/models/user.py:524 users/templates/users/user_detail.html:115
+#: users/models/user.py:534 users/templates/users/user_detail.html:115
 #: users/templates/users/user_granted_database_app.html:38
 #: users/templates/users/user_granted_remote_app.html:37
 #: users/templates/users/user_group_detail.html:62
@@ -147,7 +147,7 @@ msgstr "参数"
 #: assets/models/cmd_filter.py:26 assets/models/cmd_filter.py:60
 #: assets/models/group.py:21 common/db/models.py:67 common/mixins/models.py:49
 #: orgs/models.py:23 orgs/models.py:389 perms/models/base.py:54
-#: users/models/user.py:532 users/serializers/group.py:35
+#: users/models/user.py:542 users/serializers/group.py:35
 #: users/templates/users/user_detail.html:97
 #: xpack/plugins/change_auth_plan/models.py:81 xpack/plugins/cloud/models.py:56
 #: xpack/plugins/cloud/models.py:146 xpack/plugins/gathered_user/models.py:30
@@ -354,7 +354,7 @@ msgstr ""
 #: audits/models.py:99 authentication/forms.py:11
 #: authentication/templates/authentication/login.html:21
 #: authentication/templates/authentication/xpack_login.html:101
-#: ops/models/adhoc.py:148 users/forms/profile.py:19 users/models/user.py:489
+#: ops/models/adhoc.py:148 users/forms/profile.py:19 users/models/user.py:499
 #: users/templates/users/_select_user_modal.html:14
 #: users/templates/users/user_detail.html:53
 #: users/templates/users/user_list.html:15
@@ -407,7 +407,7 @@ msgstr "带宽"
 msgid "Contact"
 msgstr "联系人"
 
-#: assets/models/cluster.py:22 users/models/user.py:510
+#: assets/models/cluster.py:22 users/models/user.py:520
 #: users/templates/users/user_detail.html:62
 msgid "Phone"
 msgstr "手机"
@@ -433,7 +433,7 @@ msgid "Default"
 msgstr "默认"
 
 #: assets/models/cluster.py:36 assets/models/label.py:14
-#: users/models/user.py:657
+#: users/models/user.py:661
 msgid "System"
 msgstr "系统"
 
@@ -547,7 +547,7 @@ msgstr "默认资产组"
 
 #: assets/models/label.py:15 audits/models.py:36 audits/models.py:56
 #: audits/models.py:69 audits/serializers.py:77 authentication/models.py:46
-#: authentication/models.py:90 orgs/models.py:16 orgs/models.py:385
+#: authentication/models.py:90 orgs/models.py:17 orgs/models.py:385
 #: perms/forms/asset_permission.py:83 perms/forms/database_app_permission.py:38
 #: perms/forms/remote_app_permission.py:40 perms/models/base.py:49
 #: templates/index.html:78 terminal/backends/command/models.py:18
@@ -555,7 +555,7 @@ msgstr "默认资产组"
 #: tickets/models/ticket.py:30 tickets/models/ticket.py:137
 #: tickets/serializers/request_asset_perm.py:65
 #: tickets/serializers/ticket.py:31 users/forms/group.py:15
-#: users/models/user.py:158 users/models/user.py:645
+#: users/models/user.py:159 users/models/user.py:649
 #: users/serializers/group.py:20
 #: users/templates/users/user_asset_permission.html:38
 #: users/templates/users/user_asset_permission.html:64
@@ -733,14 +733,14 @@ msgid "Backend"
 msgstr "后端"
 
 #: assets/serializers/asset_user.py:75 users/forms/profile.py:148
-#: users/models/user.py:521 users/templates/users/user_password_update.html:48
+#: users/models/user.py:531 users/templates/users/user_password_update.html:48
 #: users/templates/users/user_profile.html:69
 #: users/templates/users/user_profile_update.html:46
 #: users/templates/users/user_pubkey_update.html:46
 msgid "Public key"
 msgstr "SSH公钥"
 
-#: assets/serializers/asset_user.py:79 users/models/user.py:518
+#: assets/serializers/asset_user.py:79 users/models/user.py:528
 msgid "Private key"
 msgstr "ssh私钥"
 
@@ -1025,8 +1025,8 @@ msgstr "Agent"
 #: audits/models.py:104
 #: authentication/templates/authentication/_mfa_confirm_modal.html:14
 #: authentication/templates/authentication/login_otp.html:6
-#: users/forms/profile.py:52 users/models/user.py:513
-#: users/serializers/user.py:240 users/templates/users/user_detail.html:77
+#: users/forms/profile.py:52 users/models/user.py:523
+#: users/serializers/user.py:229 users/templates/users/user_detail.html:77
 #: users/templates/users/user_profile.html:87
 msgid "MFA"
 msgstr "多因子认证"
@@ -1199,7 +1199,7 @@ msgstr "登录复核 {}"
 msgid "SSO auth closed"
 msgstr "SSO 认证关闭了"
 
-#: authentication/errors.py:218 authentication/views/login.py:243
+#: authentication/errors.py:218 authentication/views/login.py:244
 msgid "Your password is too simple, please change it for security"
 msgstr "你的密码过于简单，为了安全，请修改"
 
@@ -1265,7 +1265,7 @@ msgid "Show"
 msgstr "显示"
 
 #: authentication/templates/authentication/_access_key_modal.html:66
-#: users/models/user.py:411 users/serializers/user.py:237
+#: users/models/user.py:421 users/serializers/user.py:226
 #: users/templates/users/user_profile.html:94
 #: users/templates/users/user_profile.html:163
 #: users/templates/users/user_profile.html:166
@@ -1274,7 +1274,7 @@ msgid "Disable"
 msgstr "禁用"
 
 #: authentication/templates/authentication/_access_key_modal.html:67
-#: users/models/user.py:412 users/serializers/user.py:238
+#: users/models/user.py:422 users/serializers/user.py:227
 #: users/templates/users/user_profile.html:92
 #: users/templates/users/user_profile.html:170
 msgid "Enable"
@@ -1382,11 +1382,11 @@ msgstr "复制成功"
 msgid "Welcome back, please enter username and password to login"
 msgstr "欢迎回来，请输入用户名和密码登录"
 
-#: authentication/views/login.py:84
+#: authentication/views/login.py:85
 msgid "Please enable cookies and try again."
 msgstr "设置你的浏览器支持cookie"
 
-#: authentication/views/login.py:189
+#: authentication/views/login.py:190
 msgid ""
 "Wait for <b>{}</b> confirm, You also can copy link to her/him <br/>\n"
 "                  Don't close this page"
@@ -1394,19 +1394,19 @@ msgstr ""
 "等待 <b>{}</b> 确认, 你也可以复制链接发给他/她 <br/>\n"
 "                  不要关闭本页面"
 
-#: authentication/views/login.py:194
+#: authentication/views/login.py:195
 msgid "No ticket found"
 msgstr "没有发现工单"
 
-#: authentication/views/login.py:226
+#: authentication/views/login.py:227
 msgid "Logout success"
 msgstr "退出登录成功"
 
-#: authentication/views/login.py:227
+#: authentication/views/login.py:228
 msgid "Logout success, return login page"
 msgstr "退出登录成功，返回到登录页面"
 
-#: authentication/views/login.py:242
+#: authentication/views/login.py:243
 msgid "Please change your password"
 msgstr "请修改密码"
 
@@ -1466,7 +1466,7 @@ msgstr ""
 msgid "Marshal data to text field"
 msgstr ""
 
-#: common/fields/model.py:157
+#: common/fields/model.py:165
 msgid "Encrypt field using Secret Key"
 msgstr ""
 
@@ -1503,11 +1503,11 @@ msgstr ""
 "<div>Luna是单独部署的一个程序，你需要部署luna，koko, </div><div>如果你看到了"
 "这个页面，证明你访问的不是nginx监听的端口，祝你好运</div>"
 
-#: jumpserver/views/other.py:76
+#: jumpserver/views/other.py:77
 msgid "Websocket server run on port: {}, you should proxy it on nginx"
 msgstr "Websocket 服务运行在端口: {}, 请检查nginx是否代理是否设置"
 
-#: jumpserver/views/other.py:90
+#: jumpserver/views/other.py:91
 msgid ""
 "<div>Koko is a separately deployed program, you need to deploy Koko, "
 "configure nginx for url distribution,</div> </div>If you see this page, "
@@ -1693,11 +1693,11 @@ msgstr "组织"
 msgid "Organization administrator"
 msgstr "组织管理员"
 
-#: orgs/models.py:17
+#: orgs/models.py:16
 msgid "Organization auditor"
 msgstr "组织审计员"
 
-#: orgs/models.py:386 users/forms/user.py:27 users/models/user.py:501
+#: orgs/models.py:386 users/forms/user.py:27 users/models/user.py:511
 #: users/templates/users/_select_user_modal.html:15
 #: users/templates/users/user_detail.html:73
 #: users/templates/users/user_list.html:16
@@ -1722,8 +1722,7 @@ msgstr "提示：RDP 协议不支持单独控制上传或下载文件"
 #: perms/forms/asset_permission.py:86 perms/forms/database_app_permission.py:41
 #: perms/forms/remote_app_permission.py:43 perms/models/base.py:50
 #: templates/_nav.html:21 users/forms/user.py:168 users/models/group.py:31
-#: users/models/user.py:497 users/serializers/user.py:48
-#: users/templates/users/_select_user_modal.html:16
+#: users/models/user.py:507 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
@@ -1789,7 +1788,7 @@ msgid "Asset permission"
 msgstr "资产授权"
 
 #: perms/models/base.py:53 tickets/serializers/request_asset_perm.py:31
-#: users/models/user.py:529 users/templates/users/user_detail.html:93
+#: users/models/user.py:539 users/templates/users/user_detail.html:93
 #: users/templates/users/user_profile.html:120
 msgid "Date expired"
 msgstr "失效日期"
@@ -2537,37 +2536,37 @@ msgstr "结束日期"
 msgid "Args"
 msgstr "参数"
 
-#: tickets/api/request_asset_perm.py:46
+#: tickets/api/request_asset_perm.py:48
 #, python-format
 msgid "Ticket has %s"
 msgstr "工单已%s"
 
-#: tickets/api/request_asset_perm.py:91
+#: tickets/api/request_asset_perm.py:93
 msgid "Confirm assets first"
 msgstr "请先确认资产"
 
-#: tickets/api/request_asset_perm.py:94
+#: tickets/api/request_asset_perm.py:96
 msgid "Confirmed assets changed"
 msgstr "确认的资产变更了"
 
-#: tickets/api/request_asset_perm.py:98
+#: tickets/api/request_asset_perm.py:100
 msgid "Confirm system-user first"
 msgstr "请先确认系统用户"
 
-#: tickets/api/request_asset_perm.py:102
+#: tickets/api/request_asset_perm.py:104
 msgid "Confirmed system-user changed"
 msgstr "确认的系统用户变更了"
 
-#: tickets/api/request_asset_perm.py:105 tickets/api/request_asset_perm.py:112
+#: tickets/api/request_asset_perm.py:107 tickets/api/request_asset_perm.py:114
 #: xpack/plugins/cloud/models.py:202
 msgid "Succeed"
 msgstr "成功"
 
-#: tickets/api/request_asset_perm.py:120
+#: tickets/api/request_asset_perm.py:122
 msgid "From request ticket: {} {}"
 msgstr "来自工单申请: {} {}"
 
-#: tickets/api/request_asset_perm.py:122
+#: tickets/api/request_asset_perm.py:124
 msgid "{} request assets, approved by {}"
 msgstr "{} 申请资产，通过人 {}"
 
@@ -2686,11 +2685,11 @@ msgstr ""
 "        过期时间: {date_expired}<br>\n"
 "        "
 
-#: tickets/utils.py:20
+#: tickets/utils.py:21
 msgid "New ticket"
 msgstr "新工单"
 
-#: tickets/utils.py:28
+#: tickets/utils.py:25
 #, python-brace-format
 msgid ""
 "\n"
@@ -2715,11 +2714,11 @@ msgstr ""
 "        </div>\n"
 "    "
 
-#: tickets/utils.py:47
+#: tickets/utils.py:44
 msgid "Ticket has been reply"
 msgstr "工单已被回复"
 
-#: tickets/utils.py:48
+#: tickets/utils.py:45
 #, python-brace-format
 msgid ""
 "\n"
@@ -2750,7 +2749,7 @@ msgstr ""
 "        </div>\n"
 "     "
 
-#: users/api/user.py:158
+#: users/api/user.py:156
 msgid "Could not reset self otp, use profile reset instead"
 msgstr "不能在该页面重置多因子认证, 请去个人信息页面重置"
 
@@ -2796,7 +2795,7 @@ msgstr "确认密码"
 msgid "Password does not match"
 msgstr "密码不一致"
 
-#: users/forms/profile.py:89 users/models/user.py:493
+#: users/forms/profile.py:89 users/models/user.py:503
 #: users/templates/users/user_detail.html:57
 #: users/templates/users/user_profile.html:59
 msgid "Email"
@@ -2832,12 +2831,12 @@ msgid "Public key should not be the same as your old one."
 msgstr "不能和原来的密钥相同"
 
 #: users/forms/profile.py:137 users/forms/user.py:90
-#: users/serializers/user.py:200 users/serializers/user.py:282
-#: users/serializers/user.py:340
+#: users/serializers/user.py:189 users/serializers/user.py:271
+#: users/serializers/user.py:329
 msgid "Not a valid ssh public key"
 msgstr "SSH密钥不合法"
 
-#: users/forms/user.py:31 users/models/user.py:536
+#: users/forms/user.py:31 users/models/user.py:546
 #: users/templates/users/user_detail.html:89
 #: users/templates/users/user_list.html:18
 #: users/templates/users/user_profile.html:102
@@ -2875,7 +2874,7 @@ msgstr "密码策略"
 msgid "System administrator"
 msgstr "系统管理员"
 
-#: users/models/user.py:159
+#: users/models/user.py:158
 msgid "System auditor"
 msgstr "系统审计员"
 
@@ -2883,83 +2882,83 @@ msgstr "系统审计员"
 msgid "Application"
 msgstr "应用程序"
 
-#: users/models/user.py:413 users/templates/users/user_profile.html:90
+#: users/models/user.py:423 users/templates/users/user_profile.html:90
 msgid "Force enable"
 msgstr "强制启用"
 
-#: users/models/user.py:480
+#: users/models/user.py:490
 msgid "Local"
 msgstr "数据库"
 
-#: users/models/user.py:504
+#: users/models/user.py:514
 msgid "Avatar"
 msgstr "头像"
 
-#: users/models/user.py:507 users/templates/users/user_detail.html:68
+#: users/models/user.py:517 users/templates/users/user_detail.html:68
 msgid "Wechat"
 msgstr "微信"
 
-#: users/models/user.py:540
+#: users/models/user.py:550
 msgid "Date password last updated"
 msgstr "最后更新密码日期"
 
-#: users/models/user.py:653
+#: users/models/user.py:657
 msgid "Administrator"
 msgstr "管理员"
 
-#: users/models/user.py:656
+#: users/models/user.py:660
 msgid "Administrator is the super user of system"
 msgstr "Administrator是初始的超级管理员"
 
-#: users/serializers/user.py:53 users/serializers/user.py:88
+#: users/serializers/user.py:50 users/serializers/user.py:84
 msgid "Organization role name"
 msgstr "组织角色名称"
 
-#: users/serializers/user.py:55
-msgid "Total role name"
-msgstr "汇总角色名称"
-
-#: users/serializers/user.py:79 users/serializers/user.py:253
+#: users/serializers/user.py:75 users/serializers/user.py:242
 msgid "Is first login"
 msgstr "首次登录"
 
-#: users/serializers/user.py:80
+#: users/serializers/user.py:76
 msgid "Is valid"
 msgstr "账户是否有效"
 
-#: users/serializers/user.py:81
+#: users/serializers/user.py:77
 msgid "Is expired"
 msgstr " 是否过期"
 
-#: users/serializers/user.py:82
+#: users/serializers/user.py:78
 msgid "Avatar url"
 msgstr "头像路径"
 
-#: users/serializers/user.py:86
+#: users/serializers/user.py:82
 msgid "Groups name"
 msgstr "用户组名"
 
-#: users/serializers/user.py:87
+#: users/serializers/user.py:83
 msgid "Source name"
 msgstr "用户来源名"
 
-#: users/serializers/user.py:89
+#: users/serializers/user.py:85
 msgid "Super role name"
 msgstr "超级角色名称"
 
-#: users/serializers/user.py:120
+#: users/serializers/user.py:86
+msgid "Total role name"
+msgstr "汇总角色名称"
+
+#: users/serializers/user.py:109
 msgid "Role limit to {}"
 msgstr "角色只能为 {}"
 
-#: users/serializers/user.py:132 users/serializers/user.py:306
+#: users/serializers/user.py:121 users/serializers/user.py:295
 msgid "Password does not match security rules"
 msgstr "密码不满足安全规则"
 
-#: users/serializers/user.py:298
+#: users/serializers/user.py:287
 msgid "The old password is incorrect"
 msgstr "旧密码错误"
 
-#: users/serializers/user.py:312
+#: users/serializers/user.py:301
 msgid "The newly set password is inconsistent"
 msgstr "两次密码不一致"
 
@@ -3888,7 +3887,11 @@ msgstr "同步日期"
 msgid "Unsync"
 msgstr "未同步"
 
-#: xpack/plugins/cloud/models.py:246 xpack/plugins/cloud/models.py:247
+#: xpack/plugins/cloud/models.py:246
+msgid "New Sync"
+msgstr "新同步"
+
+#: xpack/plugins/cloud/models.py:247
 msgid "Synced"
 msgstr "已同步"
 

From e6f248bfa092690387b0b514945199ac23025702 Mon Sep 17 00:00:00 2001
From: Bai <bugatti_it@163.com>
Date: Mon, 7 Sep 2020 17:20:34 +0800
Subject: [PATCH 06/12] =?UTF-8?q?feat(i18n):=20=E6=B7=BB=E5=8A=A0=E4=BA=91?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=AE=9E=E4=BE=8B=E4=BB=BB=E5=8A=A1hostname?=
 =?UTF-8?q?=5Fstrategy=E5=AD=97=E6=AE=B5=E7=BF=BB=E8=AF=91=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/locale/zh/LC_MESSAGES/django.mo | Bin 56992 -> 57154 bytes
 apps/locale/zh/LC_MESSAGES/django.po | 108 +++++++++++++++------------
 2 files changed, 62 insertions(+), 46 deletions(-)

diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo
index 0fb6a067bbeb96fa18010b7fff2b1393273e01e4..0a5f32daffcece8b72731cf2c4986bf1073a6259 100644
GIT binary patch
delta 16745
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
Y&m<Szo-z5}=#{s}kL8k4+r#qzA2Z5MDgXcg

delta 16625
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
A$N&HU

diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po
index f0eb5102e..3b5624384 100644
--- a/apps/locale/zh/LC_MESSAGES/django.po
+++ b/apps/locale/zh/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: JumpServer 0.3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-02 10:54+0800\n"
+"POT-Creation-Date: 2020-09-07 16:23+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: ibuler <ibuler@qq.com>\n"
 "Language-Team: JumpServer team<ibuler@qq.com>\n"
@@ -42,7 +42,7 @@ msgstr "自定义"
 #: users/templates/users/user_profile.html:51
 #: users/templates/users/user_pubkey_update.html:57
 #: users/templates/users/user_remote_app_permission.html:36
-#: xpack/plugins/cloud/models.py:35
+#: xpack/plugins/cloud/models.py:36
 msgid "Name"
 msgstr "名称"
 
@@ -85,8 +85,8 @@ msgstr "数据库"
 #: users/templates/users/user_group_detail.html:62
 #: users/templates/users/user_group_list.html:16
 #: users/templates/users/user_profile.html:138
-#: xpack/plugins/change_auth_plan/models.py:77 xpack/plugins/cloud/models.py:53
-#: xpack/plugins/cloud/models.py:140 xpack/plugins/gathered_user/models.py:26
+#: xpack/plugins/change_auth_plan/models.py:77 xpack/plugins/cloud/models.py:54
+#: xpack/plugins/cloud/models.py:149 xpack/plugins/gathered_user/models.py:26
 msgid "Comment"
 msgstr "备注"
 
@@ -125,7 +125,7 @@ msgstr "Kubernetes应用"
 #: users/templates/users/user_asset_permission.html:70
 #: users/templates/users/user_granted_remote_app.html:36
 #: xpack/plugins/change_auth_plan/models.py:283
-#: xpack/plugins/cloud/models.py:266
+#: xpack/plugins/cloud/models.py:275
 msgid "Asset"
 msgstr "资产"
 
@@ -149,8 +149,8 @@ msgstr "参数"
 #: orgs/models.py:23 orgs/models.py:389 perms/models/base.py:54
 #: users/models/user.py:542 users/serializers/group.py:35
 #: users/templates/users/user_detail.html:97
-#: xpack/plugins/change_auth_plan/models.py:81 xpack/plugins/cloud/models.py:56
-#: xpack/plugins/cloud/models.py:146 xpack/plugins/gathered_user/models.py:30
+#: xpack/plugins/change_auth_plan/models.py:81 xpack/plugins/cloud/models.py:57
+#: xpack/plugins/cloud/models.py:155 xpack/plugins/gathered_user/models.py:30
 msgid "Created by"
 msgstr "创建者"
 
@@ -163,7 +163,7 @@ msgstr "创建者"
 #: common/mixins/models.py:50 ops/models/adhoc.py:38 ops/models/command.py:27
 #: orgs/models.py:24 orgs/models.py:387 perms/models/base.py:55
 #: users/models/group.py:18 users/templates/users/user_group_detail.html:58
-#: xpack/plugins/cloud/models.py:59 xpack/plugins/cloud/models.py:149
+#: xpack/plugins/cloud/models.py:60 xpack/plugins/cloud/models.py:158
 msgid "Date created"
 msgstr "创建日期"
 
@@ -196,7 +196,7 @@ msgstr "不能移除资产的管理用户账号"
 msgid "Latest version could not be delete"
 msgstr "最新版本的不能被删除"
 
-#: assets/models/asset.py:146 xpack/plugins/cloud/providers/base.py:16
+#: assets/models/asset.py:146 xpack/plugins/cloud/providers/base.py:17
 msgid "Base"
 msgstr "基础"
 
@@ -262,7 +262,7 @@ msgstr "激活"
 
 #: assets/models/asset.py:199 assets/models/cluster.py:19
 #: assets/models/user.py:66 templates/_nav.html:44
-#: xpack/plugins/cloud/models.py:133 xpack/plugins/cloud/serializers.py:83
+#: xpack/plugins/cloud/models.py:142 xpack/plugins/cloud/serializers.py:84
 msgid "Admin user"
 msgstr "管理用户"
 
@@ -603,7 +603,7 @@ msgstr "键"
 #: users/templates/users/user_asset_permission.html:41
 #: users/templates/users/user_asset_permission.html:73
 #: users/templates/users/user_asset_permission.html:158
-#: xpack/plugins/cloud/models.py:129 xpack/plugins/cloud/serializers.py:84
+#: xpack/plugins/cloud/models.py:138 xpack/plugins/cloud/serializers.py:85
 msgid "Node"
 msgstr "节点"
 
@@ -1002,7 +1002,7 @@ msgstr "启用"
 msgid "-"
 msgstr ""
 
-#: audits/models.py:96 xpack/plugins/cloud/models.py:201
+#: audits/models.py:96 xpack/plugins/cloud/models.py:210
 msgid "Failed"
 msgstr "失败"
 
@@ -1032,13 +1032,13 @@ msgid "MFA"
 msgstr "多因子认证"
 
 #: audits/models.py:105 xpack/plugins/change_auth_plan/models.py:304
-#: xpack/plugins/cloud/models.py:214
+#: xpack/plugins/cloud/models.py:223
 msgid "Reason"
 msgstr "原因"
 
 #: audits/models.py:106 tickets/serializers/request_asset_perm.py:63
-#: tickets/serializers/ticket.py:29 xpack/plugins/cloud/models.py:211
-#: xpack/plugins/cloud/models.py:269
+#: tickets/serializers/ticket.py:29 xpack/plugins/cloud/models.py:220
+#: xpack/plugins/cloud/models.py:278
 msgid "Status"
 msgstr "状态"
 
@@ -1051,7 +1051,7 @@ msgid "Is success"
 msgstr "是否成功"
 
 #: audits/serializers.py:73 ops/models/command.py:24
-#: xpack/plugins/cloud/models.py:209
+#: xpack/plugins/cloud/models.py:218
 msgid "Result"
 msgstr "结果"
 
@@ -2558,7 +2558,7 @@ msgid "Confirmed system-user changed"
 msgstr "确认的系统用户变更了"
 
 #: tickets/api/request_asset_perm.py:107 tickets/api/request_asset_perm.py:114
-#: xpack/plugins/cloud/models.py:202
+#: xpack/plugins/cloud/models.py:211
 msgid "Succeed"
 msgstr "成功"
 
@@ -2972,7 +2972,7 @@ msgstr "安全令牌验证"
 
 #: users/templates/users/_base_otp.html:14 users/templates/users/_user.html:13
 #: users/templates/users/user_profile_update.html:55
-#: xpack/plugins/cloud/models.py:119 xpack/plugins/cloud/serializers.py:82
+#: xpack/plugins/cloud/models.py:124 xpack/plugins/cloud/serializers.py:83
 msgid "Account"
 msgstr "账户"
 
@@ -3136,7 +3136,7 @@ msgstr "很强"
 #: users/templates/users/user_database_app_permission.html:41
 #: users/templates/users/user_list.html:19
 #: users/templates/users/user_remote_app_permission.html:41
-#: xpack/plugins/cloud/models.py:50
+#: xpack/plugins/cloud/models.py:51
 msgid "Validity"
 msgstr "有效"
 
@@ -3835,83 +3835,95 @@ msgstr "无法将数据发送到远程"
 msgid "Cloud center"
 msgstr "云管中心"
 
-#: xpack/plugins/cloud/models.py:29
+#: xpack/plugins/cloud/models.py:30
 msgid "Available"
 msgstr "有效"
 
-#: xpack/plugins/cloud/models.py:30
+#: xpack/plugins/cloud/models.py:31
 msgid "Unavailable"
 msgstr "无效"
 
-#: xpack/plugins/cloud/models.py:39
+#: xpack/plugins/cloud/models.py:40
 msgid "Provider"
 msgstr "云服务商"
 
-#: xpack/plugins/cloud/models.py:42
+#: xpack/plugins/cloud/models.py:43
 msgid "Access key id"
 msgstr ""
 
-#: xpack/plugins/cloud/models.py:46
+#: xpack/plugins/cloud/models.py:47
 msgid "Access key secret"
 msgstr ""
 
-#: xpack/plugins/cloud/models.py:64
+#: xpack/plugins/cloud/models.py:65
 msgid "Cloud account"
 msgstr "云账号"
 
-#: xpack/plugins/cloud/models.py:122 xpack/plugins/cloud/serializers.py:59
+#: xpack/plugins/cloud/models.py:120
+msgid "Instance name"
+msgstr "实例名称"
+
+#: xpack/plugins/cloud/models.py:121
+msgid "Instance name and Partial IP"
+msgstr "实例名称和部分IP"
+
+#: xpack/plugins/cloud/models.py:127 xpack/plugins/cloud/serializers.py:59
 msgid "Regions"
 msgstr "地域"
 
-#: xpack/plugins/cloud/models.py:125
+#: xpack/plugins/cloud/models.py:130
 msgid "Instances"
 msgstr "实例"
 
-#: xpack/plugins/cloud/models.py:137 xpack/plugins/cloud/serializers.py:86
+#: xpack/plugins/cloud/models.py:134
+msgid "Hostname strategy"
+msgstr "主机名策略"
+
+#: xpack/plugins/cloud/models.py:146 xpack/plugins/cloud/serializers.py:87
 msgid "Always update"
 msgstr "总是更新"
 
-#: xpack/plugins/cloud/models.py:143
+#: xpack/plugins/cloud/models.py:152
 msgid "Date last sync"
 msgstr "最后同步日期"
 
-#: xpack/plugins/cloud/models.py:154 xpack/plugins/cloud/models.py:207
+#: xpack/plugins/cloud/models.py:163 xpack/plugins/cloud/models.py:216
 msgid "Sync instance task"
 msgstr "同步实例任务"
 
-#: xpack/plugins/cloud/models.py:217 xpack/plugins/cloud/models.py:272
+#: xpack/plugins/cloud/models.py:226 xpack/plugins/cloud/models.py:281
 msgid "Date sync"
 msgstr "同步日期"
 
-#: xpack/plugins/cloud/models.py:245
+#: xpack/plugins/cloud/models.py:254
 msgid "Unsync"
 msgstr "未同步"
 
-#: xpack/plugins/cloud/models.py:246
+#: xpack/plugins/cloud/models.py:255
 msgid "New Sync"
 msgstr "新同步"
 
-#: xpack/plugins/cloud/models.py:247
+#: xpack/plugins/cloud/models.py:256
 msgid "Synced"
 msgstr "已同步"
 
-#: xpack/plugins/cloud/models.py:248
+#: xpack/plugins/cloud/models.py:257
 msgid "Released"
 msgstr "已释放"
 
-#: xpack/plugins/cloud/models.py:253
+#: xpack/plugins/cloud/models.py:262
 msgid "Sync task"
 msgstr "同步任务"
 
-#: xpack/plugins/cloud/models.py:257
+#: xpack/plugins/cloud/models.py:266
 msgid "Sync instance task history"
 msgstr "同步实例任务历史"
 
-#: xpack/plugins/cloud/models.py:260
+#: xpack/plugins/cloud/models.py:269
 msgid "Instance"
 msgstr "实例"
 
-#: xpack/plugins/cloud/models.py:263
+#: xpack/plugins/cloud/models.py:272
 msgid "Region"
 msgstr "地域"
 
@@ -3995,7 +4007,7 @@ msgstr "执行次数"
 msgid "Instance count"
 msgstr "实例个数"
 
-#: xpack/plugins/cloud/serializers.py:85
+#: xpack/plugins/cloud/serializers.py:86
 #: xpack/plugins/gathered_user/serializers.py:20
 msgid "Periodic display"
 msgstr "定时执行"
@@ -4060,30 +4072,34 @@ msgstr "管理页面logo"
 msgid "Logo of logout page"
 msgstr "退出页面logo"
 
-#: xpack/plugins/license/api.py:46
+#: xpack/plugins/license/api.py:37
 msgid "License import successfully"
 msgstr "许可证导入成功"
 
-#: xpack/plugins/license/api.py:47
+#: xpack/plugins/license/api.py:38
 msgid "License is invalid"
 msgstr "无效的许可证"
 
-#: xpack/plugins/license/meta.py:11 xpack/plugins/license/models.py:94
+#: xpack/plugins/license/meta.py:11 xpack/plugins/license/models.py:124
 msgid "License"
 msgstr "许可证"
 
-#: xpack/plugins/license/models.py:74
+#: xpack/plugins/license/models.py:71
 msgid "Standard edition"
 msgstr "标准版"
 
-#: xpack/plugins/license/models.py:76
+#: xpack/plugins/license/models.py:73
 msgid "Enterprise edition"
 msgstr "企业版"
 
-#: xpack/plugins/license/models.py:78
+#: xpack/plugins/license/models.py:75
 msgid "Ultimate edition"
 msgstr "旗舰版"
 
+#: xpack/plugins/license/models.py:77
+msgid "Community edition"
+msgstr "社区版"
+
 #~ msgid "Organization User"
 #~ msgstr "组织用户"
 

From 172b6edd280934f2f97113c620e402020df9f053 Mon Sep 17 00:00:00 2001
From: fit2bot <68588906+fit2bot@users.noreply.github.com>
Date: Mon, 7 Sep 2020 17:42:59 +0800
Subject: [PATCH 07/12] =?UTF-8?q?feat(user):=E5=90=8C=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E4=BB=85=E5=85=81=E8=AE=B8=E5=9C=A8=E4=B8=80?=
 =?UTF-8?q?=E5=8F=B0=E7=BB=88=E7=AB=AF=E8=AE=BE=E5=A4=87=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=20(#4590)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat(user):同一个账号仅允许在一台终端设备登录

* feat(user):同一个账号仅允许在一台终端设备登录

* feat(user):同一个账号仅允许在一台终端设备登录

* feat(user):同一个账号仅允许在一台终端设备登录

* feat(user):同一个账号仅允许在一台终端设备登录

Co-authored-by: peijianbo <peijainbo3006@163.com>
---
 apps/authentication/signals_handlers.py | 16 ++++++++++++++++
 apps/jumpserver/conf.py                 |  3 ++-
 apps/jumpserver/settings/custom.py      |  3 +++
 config_example.yml                      |  5 ++++-
 4 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/apps/authentication/signals_handlers.py b/apps/authentication/signals_handlers.py
index 461ddbb99..dc6bf5e27 100644
--- a/apps/authentication/signals_handlers.py
+++ b/apps/authentication/signals_handlers.py
@@ -1,3 +1,8 @@
+from importlib import import_module
+
+from django.conf import settings
+from django.contrib.auth import user_logged_in
+from django.core.cache import cache
 from django.dispatch import receiver
 
 from jms_oidc_rp.signals import openid_user_login_failed, openid_user_login_success
@@ -5,6 +10,17 @@ from jms_oidc_rp.signals import openid_user_login_failed, openid_user_login_succ
 from .signals import post_auth_success, post_auth_failed
 
 
+@receiver(user_logged_in)
+def on_user_auth_login_success(sender, user, request, **kwargs):
+    if settings.USER_LOGIN_SINGLE_MACHINE_ENABLED:
+        user_id = 'single_machine_login_' + str(user.id)
+        session_key = cache.get(user_id)
+        if session_key and session_key != request.session.session_key:
+            session = import_module(settings.SESSION_ENGINE).SessionStore(session_key)
+            session.delete()
+        cache.set(user_id, request.session.session_key, None)
+
+
 @receiver(openid_user_login_success)
 def on_oidc_user_login_success(sender, request, user, **kwargs):
     post_auth_success.send(sender, user=user, request=request)
diff --git a/apps/jumpserver/conf.py b/apps/jumpserver/conf.py
index dcbf439da..0e186726e 100644
--- a/apps/jumpserver/conf.py
+++ b/apps/jumpserver/conf.py
@@ -266,7 +266,8 @@ class Config(dict):
         'ORG_CHANGE_TO_URL': '',
         'LANGUAGE_CODE': 'zh',
         'TIME_ZONE': 'Asia/Shanghai',
-        'CHANGE_AUTH_PLAN_SECURE_MODE_ENABLED': True
+        'CHANGE_AUTH_PLAN_SECURE_MODE_ENABLED': True,
+        'USER_LOGIN_SINGLE_MACHINE_ENABLED': False
     }
 
     def compatible_auth_openid_of_key(self):
diff --git a/apps/jumpserver/settings/custom.py b/apps/jumpserver/settings/custom.py
index b691d3ce5..5149c3d9c 100644
--- a/apps/jumpserver/settings/custom.py
+++ b/apps/jumpserver/settings/custom.py
@@ -70,6 +70,9 @@ FLOWER_URL = CONFIG.FLOWER_URL
 # Enable internal period task
 PERIOD_TASK_ENABLED = CONFIG.PERIOD_TASK_ENABLED
 
+# only allow single machine login with the same account
+USER_LOGIN_SINGLE_MACHINE_ENABLED = CONFIG.USER_LOGIN_SINGLE_MACHINE_ENABLED
+
 # Email custom content
 EMAIL_SUBJECT_PREFIX = DYNAMIC.EMAIL_SUBJECT_PREFIX
 EMAIL_SUFFIX = DYNAMIC.EMAIL_SUFFIX
diff --git a/config_example.yml b/config_example.yml
index fd8710c78..f23b5c7e5 100644
--- a/config_example.yml
+++ b/config_example.yml
@@ -116,7 +116,10 @@ REDIS_PORT: 6379
 
 # Perm show single asset to ungrouped node
 # 是否把未授权节点资产放入到 未分组 节点中
-# PERM_SINGLE_ASSET_TO_UNGROUP_NODE: false
+# PERM_SINGLE_ASSET_TO_UNGROUP_NODE: False
+#
+# 同一账号仅允许在一台设备登录
+# USER_LOGIN_SINGLE_MACHINE_ENABLED: False
 #
 # 启用定时任务
 # PERIOD_TASK_ENABLE: True

From 1b84afee0c0604cae861fcdd8c82815354a17511 Mon Sep 17 00:00:00 2001
From: peijianbo <peijainbo3006@163.com>
Date: Mon, 7 Sep 2020 18:24:13 +0800
Subject: [PATCH 08/12] =?UTF-8?q?feat(audits):=E4=BF=AE=E6=94=B9=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E9=BB=98=E8=AE=A4=E4=BF=9D=E5=AD=98=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=EF=BC=8890->9999=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/audits/tasks.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/audits/tasks.py b/apps/audits/tasks.py
index 2dfe4a2dd..d928e6e87 100644
--- a/apps/audits/tasks.py
+++ b/apps/audits/tasks.py
@@ -16,7 +16,7 @@ def clean_login_log_period():
     try:
         days = int(settings.LOGIN_LOG_KEEP_DAYS)
     except ValueError:
-        days = 90
+        days = 9999
     expired_day = now - datetime.timedelta(days=days)
     UserLoginLog.objects.filter(datetime__lt=expired_day).delete()
 
@@ -28,6 +28,6 @@ def clean_operation_log_period():
     try:
         days = int(settings.LOGIN_LOG_KEEP_DAYS)
     except ValueError:
-        days = 90
+        days = 9999
     expired_day = now - datetime.timedelta(days=days)
     OperateLog.objects.filter(datetime__lt=expired_day).delete()

From d944b5f4ff5c94f2c0f8d87dca9ae9fc047cd2fa Mon Sep 17 00:00:00 2001
From: Bai <bugatti_it@163.com>
Date: Mon, 7 Sep 2020 19:36:05 +0800
Subject: [PATCH 09/12] =?UTF-8?q?feat(tickets):=20=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0comment=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/tickets/migrations/0004_ticket_comment.py | 18 ++++++++++++++++++
 apps/tickets/models/ticket.py                  |  1 +
 apps/tickets/serializers/request_asset_perm.py |  2 +-
 3 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 apps/tickets/migrations/0004_ticket_comment.py

diff --git a/apps/tickets/migrations/0004_ticket_comment.py b/apps/tickets/migrations/0004_ticket_comment.py
new file mode 100644
index 000000000..c30776eb9
--- /dev/null
+++ b/apps/tickets/migrations/0004_ticket_comment.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.2.13 on 2020-09-07 11:10
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('tickets', '0003_auto_20200804_1551'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='ticket',
+            name='comment',
+            field=models.TextField(blank=True, default='', max_length=128, verbose_name='Comment'),
+        ),
+    ]
diff --git a/apps/tickets/models/ticket.py b/apps/tickets/models/ticket.py
index 3e979f244..f52172fb3 100644
--- a/apps/tickets/models/ticket.py
+++ b/apps/tickets/models/ticket.py
@@ -40,6 +40,7 @@ class Ticket(OrgModelMixin, CommonModelMixin):
     type = models.CharField(max_length=16, choices=TYPE.choices, default=TYPE.GENERAL, verbose_name=_("Type"))
     status = models.CharField(choices=STATUS.choices, max_length=16, default='open')
     action = models.CharField(choices=ACTION.choices, max_length=16, default='', blank=True)
+    comment = models.TextField(max_length=128, default='', blank=True, verbose_name=_('Comment'))
 
     origin_objects = models.Manager()
 
diff --git a/apps/tickets/serializers/request_asset_perm.py b/apps/tickets/serializers/request_asset_perm.py
index 8827f482c..5c7e08cfd 100644
--- a/apps/tickets/serializers/request_asset_perm.py
+++ b/apps/tickets/serializers/request_asset_perm.py
@@ -46,7 +46,7 @@ class RequestAssetPermTicketSerializer(serializers.ModelSerializer):
             'status', 'action', 'date_created', 'date_updated', 'system_user_waitlist_url',
             'type', 'type_display', 'action_display', 'ips', 'confirmed_assets',
             'date_start', 'date_expired', 'confirmed_system_user', 'hostname',
-            'assets_waitlist_url', 'system_user', 'org_id', 'actions'
+            'assets_waitlist_url', 'system_user', 'org_id', 'actions', 'comment'
         ]
         m2m_fields = [
             'user', 'user_display', 'assignees', 'assignees_display',

From 80b9db417c3798a6c0b011fc55604e9f67339a40 Mon Sep 17 00:00:00 2001
From: Bai <bugatti_it@163.com>
Date: Mon, 7 Sep 2020 20:33:44 +0800
Subject: [PATCH 10/12] =?UTF-8?q?feat(ldap):=20=E8=8E=B7=E5=8F=96ldap?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8=EF=BC=8C=E9=87=87=E7=94=A8?=
 =?UTF-8?q?=E7=BA=BF=E7=A8=8B=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/settings/api.py        | 10 ++++++----
 apps/settings/tasks/ldap.py |  7 ++-----
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/apps/settings/api.py b/apps/settings/api.py
index 786c43bad..2c7c31d13 100644
--- a/apps/settings/api.py
+++ b/apps/settings/api.py
@@ -2,6 +2,7 @@
 #
 
 import json
+import threading
 from collections.abc import Iterable
 from smtplib import SMTPSenderRefused
 from rest_framework import generics
@@ -15,7 +16,7 @@ from .utils import (
     LDAPServerUtil, LDAPCacheUtil, LDAPImportUtil, LDAPSyncUtil,
     LDAP_USE_CACHE_FLAGS, LDAPTestUtil, ObjectDict
 )
-from .tasks import sync_ldap_user_task
+from .tasks import sync_ldap_user
 from common.permissions import IsOrgAdmin, IsSuperUser
 from common.utils import get_logger
 from .serializers import (
@@ -204,8 +205,9 @@ class LDAPUserListApi(generics.ListAPIView):
         if sync_util.task_no_start:
             # 任务外部设置 task running 状态
             sync_util.set_task_status(sync_util.TASK_STATUS_IS_RUNNING)
-            task = sync_ldap_user_task.delay()
-            data = {'msg': 'Cache no data, sync task {} started.'.format(task.id)}
+            t = threading.Thread(target=sync_ldap_user)
+            t.start()
+            data = {'msg': 'Sync start.'}
             return Response(data=data, status=409)
         # 同步任务正在执行
         if sync_util.task_is_running:
@@ -214,7 +216,7 @@ class LDAPUserListApi(generics.ListAPIView):
         # 同步任务执行结束
         if sync_util.task_is_over:
             msg = sync_util.get_task_error_msg()
-            data = {'error': 'Synchronization task report error: {}'.format(msg)}
+            data = {'error': 'Synchronization error: {}'.format(msg)}
             return Response(data=data, status=400)
 
         return super().list(request, *args, **kwargs)
diff --git a/apps/settings/tasks/ldap.py b/apps/settings/tasks/ldap.py
index 60058e03e..6869d0254 100644
--- a/apps/settings/tasks/ldap.py
+++ b/apps/settings/tasks/ldap.py
@@ -1,17 +1,14 @@
 # coding: utf-8
 # 
 
-from celery import shared_task
-
 from common.utils import get_logger
 from ..utils import LDAPSyncUtil
 
-__all__ = ['sync_ldap_user_task']
+__all__ = ['sync_ldap_user']
 
 
 logger = get_logger(__file__)
 
 
-@shared_task
-def sync_ldap_user_task():
+def sync_ldap_user():
     LDAPSyncUtil().perform_sync()

From e26716e1e13a8a4884377f0c173d277a89e8c20e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=81=E5=B9=BF?= <ibuler@qq.com>
Date: Fri, 21 Aug 2020 18:18:29 +0800
Subject: [PATCH 11/12] Update README.md
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

docs: 添加  developer wanted
---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index 96a9fbd47..5f1b4653a 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,10 @@
 [![Django](https://img.shields.io/badge/django-2.2-brightgreen.svg?style=plastic)](https://www.djangoproject.com/)
 [![Docker Pulls](https://img.shields.io/docker/pulls/jumpserver/jms_all.svg)](https://hub.docker.com/u/jumpserver)
 
+|Developer Wanted|
+|------------------|
+|JumpServer 正在寻找开发者，一起为改变世界做些贡献吧，哪怕一点点，联系我 <ibuler@fit2cloud.com> |
+
 JumpServer 是全球首款开源的堡垒机，使用 GNU GPL v2.0 开源协议，是符合 4A 规范的运维安全审计系统。
 
 JumpServer 使用 Python / Django 为主进行开发，遵循 Web 2.0 规范，配备了业界领先的 Web Terminal 方案，交互界面美观、用户体验好。

From 72aa265dd73f00658d0a447bb94afe8bf9d2595b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=81=E5=B9=BF?= <ibuler@qq.com>
Date: Tue, 8 Sep 2020 14:31:54 +0800
Subject: [PATCH 12/12] =?UTF-8?q?doc:=20=E4=BF=AE=E6=94=B9readme=EF=BC=8C?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=90=E9=A1=B9=E7=9B=AE=E8=BF=9E=E6=8E=A5?=
 =?UTF-8?q?=20(#4602)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md
---
 README.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/README.md b/README.md
index 5f1b4653a..6c2fd6ba7 100644
--- a/README.md
+++ b/README.md
@@ -206,6 +206,13 @@ v2.1.0 是 v2.0.0 之后的功能版本。
 - [完整文档](https://docs.jumpserver.org)
 - [演示视频](https://jumpserver.oss-cn-hangzhou.aliyuncs.com/jms-media/%E3%80%90%E6%BC%94%E7%A4%BA%E8%A7%86%E9%A2%91%E3%80%91Jumpserver%20%E5%A0%A1%E5%9E%92%E6%9C%BA%20V1.5.0%20%E6%BC%94%E7%A4%BA%E8%A7%86%E9%A2%91%20-%20final.mp4)
 
+## 组件项目
+- [Lina](https://github.com/jumpserver/lina) JumpServer Web UI 项目
+- [Luna](https://github.com/jumpserver/luna) JumpServer Web Terminal 项目
+- [Koko](https://github.com/jumpserver/koko) JumpServer 字符协议 Connector 项目，替代原来 Python 版本的 [Coco](https://github.com/jumpserver/coco)
+- [Guacamole](https://github.com/jumpserver/docker-guacamole) JumpServer 图形协议 Connector 项目，依赖 [Apache Guacamole](https://guacamole.apache.org/)
+
+
 ## 案例研究
 
 - [JumpServer 堡垒机护航顺丰科技超大规模资产安全运维](https://blog.fit2cloud.com/?p=1147)；