From f87e08efffb9095971692c60e898ac2489d47c55 Mon Sep 17 00:00:00 2001
From: BaiJiangJie <32935519+BaiJiangJie@users.noreply.github.com>
Date: Thu, 1 Nov 2018 16:28:19 +0800
Subject: [PATCH] =?UTF-8?q?[Update]=20=E6=B7=BB=E5=8A=A0deb=E4=BE=9D?=
 =?UTF-8?q?=E8=B5=96=EF=BC=8C=E5=AE=8C=E5=96=84=E7=94=A8=E6=88=B7=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E5=A4=B1=E8=B4=A5=E6=97=A5=E5=BF=97=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E8=B5=84=E4=BA=A7=E6=A0=87=E7=AD=BEbug=20(#1983)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [Update] 修改deb依赖

* [Update] 修改记录用户登录失败日志，用户不存在的情况，但是显示登录日志列表还不全..

* [Update] 用户登录日志，记录用户名不存在的情况(Default组织显示所有用户的登录日志)

* [Bugfix] 修复标签名为search, limit时资产列表不显示的bug
---
 .../templates/assets/user_asset_list.html     |   4 +-
 apps/assets/views/label.py                    |  11 ++
 apps/audits/views.py                          |   8 +-
 apps/locale/zh/LC_MESSAGES/django.mo          | Bin 55527 -> 55705 bytes
 apps/locale/zh/LC_MESSAGES/django.po          | 106 ++++++++++--------
 apps/users/api/auth.py                        |   7 +-
 apps/users/models/authentication.py           |   4 +-
 apps/users/views/login.py                     |   5 +-
 requirements/deb_requirements.txt             |   2 +-
 9 files changed, 89 insertions(+), 58 deletions(-)

diff --git a/apps/assets/templates/assets/user_asset_list.html b/apps/assets/templates/assets/user_asset_list.html
index 1b1a76e1d..8a563cadc 100644
--- a/apps/assets/templates/assets/user_asset_list.html
+++ b/apps/assets/templates/assets/user_asset_list.html
@@ -62,7 +62,7 @@
 
 {% block custom_foot_js %}
 <script>
-var zTree, asset_table;
+var zTree, asset_table, show=0;
 var inited = false;
 var url;
 function initTable() {
@@ -184,7 +184,7 @@ $(document).ready(function () {
 });
 
 function toggle() {
-    if ($("#split-left").is(':visible')) {
+    if (show === 0) {
         $("#split-left").hide(500, function () {
             $("#split-right").attr("class", "col-lg-12");
             $("#toggle-icon").attr("class", "fa fa-angle-right fa-x");
diff --git a/apps/assets/views/label.py b/apps/assets/views/label.py
index de30eaaa3..9ed289e3e 100644
--- a/apps/assets/views/label.py
+++ b/apps/assets/views/label.py
@@ -36,6 +36,7 @@ class LabelCreateView(AdminUserRequiredMixin, CreateView):
     form_class = LabelForm
     success_url = reverse_lazy('assets:label-list')
     success_message = create_success_msg
+    disable_name = ['draw', 'search', 'limit', 'offset', '_']
 
     def get_context_data(self, **kwargs):
         context = {
@@ -45,6 +46,16 @@ class LabelCreateView(AdminUserRequiredMixin, CreateView):
         kwargs.update(context)
         return super().get_context_data(**kwargs)
 
+    def form_valid(self, form):
+        name = form.cleaned_data.get('name')
+        if name in self.disable_name:
+            msg = _(
+                'Tips: Avoid using label names reserved internally: {}'
+            ).format(', '.join(self.disable_name))
+            form.add_error("name", msg)
+            return self.form_invalid(form)
+        return super().form_valid(form)
+
 
 class LabelUpdateView(AdminUserRequiredMixin, UpdateView):
     model = Label
diff --git a/apps/audits/views.py b/apps/audits/views.py
index 4b1c11c16..c64bbe5b4 100644
--- a/apps/audits/views.py
+++ b/apps/audits/views.py
@@ -160,8 +160,12 @@ class LoginLogListView(AdminUserRequiredMixin, DatetimeSearchMixin, ListView):
         return users
 
     def get_queryset(self):
-        users = self.get_org_users()
-        queryset = super().get_queryset().filter(username__in=users)
+        if current_org.is_default():
+            queryset = super().get_queryset()
+        else:
+            users = self.get_org_users()
+            queryset = super().get_queryset().filter(username__in=users)
+
         self.user = self.request.GET.get('user', '')
         self.keyword = self.request.GET.get("keyword", '')
 
diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo
index 1315c19c3dc03e3491612be772c9f56ef3dd5609..9f41c1d67939c0a96cc3a11a618c509fd2a70610 100644
GIT binary patch
delta 14128
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

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

diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po
index 9e3459248..0f8a6448f 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: 2018-10-24 11:03+0800\n"
+"POT-Creation-Date: 2018-11-01 13:58+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"
@@ -191,7 +191,7 @@ msgstr "名称"
 #: assets/templates/assets/system_user_list.html:30
 #: audits/templates/audits/login_log_list.html:49
 #: perms/templates/perms/asset_permission_user.html:55 users/forms.py:15
-#: users/forms.py:33 users/models/authentication.py:70 users/models/user.py:49
+#: users/forms.py:33 users/models/authentication.py:72 users/models/user.py:49
 #: users/templates/users/_select_user_modal.html:14
 #: users/templates/users/login.html:62
 #: users/templates/users/user_detail.html:67
@@ -666,8 +666,8 @@ msgstr "手动登录"
 #: assets/views/domain.py:29 assets/views/domain.py:45
 #: assets/views/domain.py:61 assets/views/domain.py:74
 #: assets/views/domain.py:98 assets/views/domain.py:126
-#: assets/views/domain.py:145 assets/views/label.py:26 assets/views/label.py:42
-#: assets/views/label.py:58 assets/views/system_user.py:28
+#: assets/views/domain.py:145 assets/views/label.py:26 assets/views/label.py:43
+#: assets/views/label.py:69 assets/views/system_user.py:28
 #: assets/views/system_user.py:44 assets/views/system_user.py:60
 #: assets/views/system_user.py:74 templates/_nav.html:19
 msgid "Assets"
@@ -1059,7 +1059,7 @@ msgstr "选择节点"
 #: users/templates/users/user_detail.html:431
 #: users/templates/users/user_detail.html:476
 #: users/templates/users/user_group_create_update.html:32
-#: users/templates/users/user_group_list.html:87
+#: users/templates/users/user_group_list.html:88
 #: users/templates/users/user_list.html:201
 #: users/templates/users/user_profile.html:232
 #: xpack/plugins/cloud/templates/cloud/account_create_update.html:34
@@ -1276,7 +1276,7 @@ msgstr "重命名失败，不能更改root节点的名称"
 #: users/templates/users/user_detail.html:376
 #: users/templates/users/user_detail.html:402
 #: users/templates/users/user_detail.html:470
-#: users/templates/users/user_group_list.html:81
+#: users/templates/users/user_group_list.html:82
 #: users/templates/users/user_list.html:195
 msgid "Are you sure?"
 msgstr "你确认吗?"
@@ -1292,7 +1292,7 @@ msgstr "删除选择资产"
 #: users/templates/users/user_detail.html:406
 #: users/templates/users/user_detail.html:474
 #: users/templates/users/user_group_create_update.html:31
-#: users/templates/users/user_group_list.html:85
+#: users/templates/users/user_group_list.html:86
 #: users/templates/users/user_list.html:199
 #: xpack/plugins/orgs/templates/orgs/org_create_update.html:32
 msgid "Cancel"
@@ -1424,7 +1424,7 @@ msgstr "JMS => 网域网关 => 目标资产"
 msgid "Create domain"
 msgstr "创建网域"
 
-#: assets/templates/assets/label_list.html:6 assets/views/label.py:43
+#: assets/templates/assets/label_list.html:6 assets/views/label.py:44
 msgid "Create label"
 msgstr "创建标签"
 
@@ -1592,7 +1592,11 @@ msgstr "创建网关"
 msgid "Label list"
 msgstr "标签列表"
 
-#: assets/views/label.py:59
+#: assets/views/label.py:53
+msgid "Tips: Avoid using label names reserved internally: {}"
+msgstr "提示: 请避免使用内部预留标签名: {}"
+
+#: assets/views/label.py:70
 msgid "Update label"
 msgstr "更新标签"
 
@@ -1635,7 +1639,7 @@ msgid "Filename"
 msgstr "文件名"
 
 #: audits/models.py:22 audits/templates/audits/ftp_log_list.html:76
-#: ops/templates/ops/task_list.html:39 users/models/authentication.py:66
+#: ops/templates/ops/task_list.html:39 users/models/authentication.py:68
 #: users/templates/users/user_detail.html:452 xpack/plugins/cloud/api.py:61
 msgid "Success"
 msgstr "成功"
@@ -1703,19 +1707,19 @@ msgid "City"
 msgstr "城市"
 
 #: audits/templates/audits/login_log_list.html:54 users/forms.py:169
-#: users/models/authentication.py:75 users/models/user.py:73
+#: users/models/authentication.py:77 users/models/user.py:73
 #: users/templates/users/first_login.html:45
 msgid "MFA"
 msgstr "MFA"
 
 #: audits/templates/audits/login_log_list.html:55
-#: users/models/authentication.py:76 xpack/plugins/cloud/models.py:192
+#: users/models/authentication.py:78 xpack/plugins/cloud/models.py:192
 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:69
 msgid "Reason"
 msgstr "原因"
 
 #: audits/templates/audits/login_log_list.html:56
-#: users/models/authentication.py:77 xpack/plugins/cloud/models.py:191
+#: users/models/authentication.py:79 xpack/plugins/cloud/models.py:191
 #: xpack/plugins/cloud/models.py:208
 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:70
 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:67
@@ -1752,15 +1756,15 @@ msgstr "操作日志"
 msgid "Password change log"
 msgstr "改密日志"
 
-#: audits/views.py:183 templates/_nav.html:10 users/views/group.py:28
+#: audits/views.py:187 templates/_nav.html:10 users/views/group.py:28
 #: users/views/group.py:44 users/views/group.py:60 users/views/group.py:76
-#: users/views/group.py:92 users/views/login.py:328 users/views/user.py:68
+#: users/views/group.py:92 users/views/login.py:331 users/views/user.py:68
 #: users/views/user.py:83 users/views/user.py:111 users/views/user.py:193
 #: users/views/user.py:354 users/views/user.py:404 users/views/user.py:439
 msgid "Users"
 msgstr "用户管理"
 
-#: audits/views.py:184 templates/_nav.html:76
+#: audits/views.py:188 templates/_nav.html:76
 msgid "Login log"
 msgstr "登录日志"
 
@@ -1780,15 +1784,15 @@ msgstr "在ou:{}中没有匹配条目"
 msgid "Match {} s users"
 msgstr "匹配 {} 个用户"
 
-#: common/api.py:107 common/api.py:138
+#: common/api.py:107 common/api.py:139
 msgid "Error: Account invalid"
 msgstr ""
 
-#: common/api.py:110 common/api.py:141
+#: common/api.py:110 common/api.py:142
 msgid "Create succeed"
 msgstr "创建成功"
 
-#: common/api.py:127 common/api.py:161
+#: common/api.py:128 common/api.py:162
 #: common/templates/common/terminal_setting.html:151
 msgid "Delete succeed"
 msgstr "删除成功"
@@ -3084,19 +3088,19 @@ msgstr "你可以使用ssh客户端工具连接终端"
 msgid "Log in frequently and try again later"
 msgstr "登录频繁, 稍后重试"
 
-#: users/api/auth.py:79
+#: users/api/auth.py:82
 msgid "Please carry seed value and conduct MFA secondary certification"
 msgstr "请携带seed值, 进行MFA二次认证"
 
-#: users/api/auth.py:192
+#: users/api/auth.py:195
 msgid "Please verify the user name and password first"
 msgstr "请先进行用户名和密码验证"
 
-#: users/api/auth.py:204
+#: users/api/auth.py:207
 msgid "MFA certification failed"
 msgstr "MFA认证失败"
 
-#: users/api/user.py:135
+#: users/api/user.py:138
 msgid "Could not reset self otp, use profile reset instead"
 msgstr "不能再该页面重置MFA, 请去个人信息页面重置"
 
@@ -3265,40 +3269,44 @@ msgstr "ssh密钥"
 msgid "Disabled"
 msgstr "禁用"
 
-#: users/models/authentication.py:52 users/models/authentication.py:60
+#: users/models/authentication.py:52 users/models/authentication.py:61
 msgid "-"
 msgstr ""
 
-#: users/models/authentication.py:61
+#: users/models/authentication.py:62
 msgid "Username/password check failed"
 msgstr "用户名/密码 校验失败"
 
-#: users/models/authentication.py:62
+#: users/models/authentication.py:63
 msgid "MFA authentication failed"
 msgstr "MFA 认证失败"
 
-#: users/models/authentication.py:67 xpack/plugins/cloud/models.py:184
+#: users/models/authentication.py:64
+msgid "Username does not exist"
+msgstr "用户名不存在"
+
+#: users/models/authentication.py:69 xpack/plugins/cloud/models.py:184
 #: xpack/plugins/cloud/models.py:198
 msgid "Failed"
 msgstr "失败"
 
-#: users/models/authentication.py:71
+#: users/models/authentication.py:73
 msgid "Login type"
 msgstr "登录方式"
 
-#: users/models/authentication.py:72
+#: users/models/authentication.py:74
 msgid "Login ip"
 msgstr "登录IP"
 
-#: users/models/authentication.py:73
+#: users/models/authentication.py:75
 msgid "Login city"
 msgstr "登录城市"
 
-#: users/models/authentication.py:74
+#: users/models/authentication.py:76
 msgid "User agent"
 msgstr "Agent"
 
-#: users/models/authentication.py:78
+#: users/models/authentication.py:80
 msgid "Date login"
 msgstr "登录日期"
 
@@ -3731,20 +3739,20 @@ msgstr "添加用户"
 msgid "Create user group"
 msgstr "创建用户组"
 
-#: users/templates/users/user_group_list.html:82
+#: users/templates/users/user_group_list.html:83
 msgid "This will delete the selected groups !!!"
 msgstr "删除选择组"
 
-#: users/templates/users/user_group_list.html:91
+#: users/templates/users/user_group_list.html:92
 msgid "UserGroups Deleted."
 msgstr "用户组删除"
 
-#: users/templates/users/user_group_list.html:92
-#: users/templates/users/user_group_list.html:97
+#: users/templates/users/user_group_list.html:93
+#: users/templates/users/user_group_list.html:98
 msgid "UserGroups Delete"
 msgstr "用户组删除"
 
-#: users/templates/users/user_group_list.html:96
+#: users/templates/users/user_group_list.html:97
 msgid "UserGroup Deleting failed."
 msgstr "用户组删除失败"
 
@@ -4019,52 +4027,52 @@ msgstr "用户组授权资产"
 msgid "Please enable cookies and try again."
 msgstr "设置你的浏览器支持cookie"
 
-#: users/views/login.py:176 users/views/user.py:526 users/views/user.py:551
+#: users/views/login.py:179 users/views/user.py:526 users/views/user.py:551
 msgid "MFA code invalid, or ntp sync server time"
 msgstr "MFA验证码不正确，或者服务器端时间不对"
 
-#: users/views/login.py:205
+#: users/views/login.py:208
 msgid "Logout success"
 msgstr "退出登录成功"
 
-#: users/views/login.py:206
+#: users/views/login.py:209
 msgid "Logout success, return login page"
 msgstr "退出登录成功，返回到登录页面"
 
-#: users/views/login.py:222
+#: users/views/login.py:225
 msgid "Email address invalid, please input again"
 msgstr "邮箱地址错误，重新输入"
 
-#: users/views/login.py:235
+#: users/views/login.py:238
 msgid "Send reset password message"
 msgstr "发送重置密码邮件"
 
-#: users/views/login.py:236
+#: users/views/login.py:239
 msgid "Send reset password mail success, login your mail box and follow it "
 msgstr ""
 "发送重置邮件成功, 请登录邮箱查看, 按照提示操作 (如果没收到,请等待3-5分钟)"
 
-#: users/views/login.py:249
+#: users/views/login.py:252
 msgid "Reset password success"
 msgstr "重置密码成功"
 
-#: users/views/login.py:250
+#: users/views/login.py:253
 msgid "Reset password success, return to login page"
 msgstr "重置密码成功，返回到登录页面"
 
-#: users/views/login.py:271 users/views/login.py:284
+#: users/views/login.py:274 users/views/login.py:287
 msgid "Token invalid or expired"
 msgstr "Token错误或失效"
 
-#: users/views/login.py:280
+#: users/views/login.py:283
 msgid "Password not same"
 msgstr "密码不一致"
 
-#: users/views/login.py:290 users/views/user.py:127 users/views/user.py:422
+#: users/views/login.py:293 users/views/user.py:127 users/views/user.py:422
 msgid "* Your password does not meet the requirements"
 msgstr "* 您的密码不符合要求"
 
-#: users/views/login.py:328
+#: users/views/login.py:331
 msgid "First login"
 msgstr "首次登陆"
 
diff --git a/apps/users/api/auth.py b/apps/users/api/auth.py
index 4abd2839b..9de2be6b2 100644
--- a/apps/users/api/auth.py
+++ b/apps/users/api/auth.py
@@ -43,10 +43,13 @@ class UserAuthApi(RootOrgViewMixin, APIView):
 
         user, msg = self.check_user_valid(request)
         if not user:
+            username = request.data.get('username', '')
+            exist = User.objects.filter(username=username).first()
+            reason = LoginLog.REASON_PASSWORD if exist else LoginLog.REASON_NOT_EXIST
             data = {
-                'username': request.data.get('username', ''),
+                'username': username,
                 'mfa': LoginLog.MFA_UNKNOWN,
-                'reason': LoginLog.REASON_PASSWORD,
+                'reason': reason,
                 'status': False
             }
             self.write_login_log(request, data)
diff --git a/apps/users/models/authentication.py b/apps/users/models/authentication.py
index cb0b7d85f..5377b0f75 100644
--- a/apps/users/models/authentication.py
+++ b/apps/users/models/authentication.py
@@ -55,11 +55,13 @@ class LoginLog(models.Model):
     REASON_NOTHING = 0
     REASON_PASSWORD = 1
     REASON_MFA = 2
+    REASON_NOT_EXIST = 3
 
     REASON_CHOICE = (
         (REASON_NOTHING, _('-')),
         (REASON_PASSWORD, _('Username/password check failed')),
         (REASON_MFA, _('MFA authentication failed')),
+        (REASON_NOT_EXIST, _("Username does not exist")),
     )
 
     STATUS_CHOICE = (
@@ -67,7 +69,7 @@ class LoginLog(models.Model):
         (False, _('Failed'))
     )
     id = models.UUIDField(default=uuid.uuid4, primary_key=True)
-    username = models.CharField(max_length=20, verbose_name=_('Username'))
+    username = models.CharField(max_length=128, verbose_name=_('Username'))
     type = models.CharField(choices=LOGIN_TYPE_CHOICE, max_length=2, verbose_name=_('Login type'))
     ip = models.GenericIPAddressField(verbose_name=_('Login ip'))
     city = models.CharField(max_length=254, blank=True, null=True, verbose_name=_('Login city'))
diff --git a/apps/users/views/login.py b/apps/users/views/login.py
index 31021d75e..4f2308d04 100644
--- a/apps/users/views/login.py
+++ b/apps/users/views/login.py
@@ -79,12 +79,15 @@ class UserLoginView(FormView):
     def form_invalid(self, form):
         # write login failed log
         username = form.cleaned_data.get('username')
+        exist = User.objects.filter(username=username).first()
+        reason = LoginLog.REASON_PASSWORD if exist else LoginLog.REASON_NOT_EXIST
         data = {
             'username': username,
             'mfa': LoginLog.MFA_UNKNOWN,
-            'reason': LoginLog.REASON_PASSWORD,
+            'reason': reason,
             'status': False
         }
+
         self.write_login_log(data)
 
         # limit user login failed count
diff --git a/requirements/deb_requirements.txt b/requirements/deb_requirements.txt
index f4131a3ea..d4cf29941 100644
--- a/requirements/deb_requirements.txt
+++ b/requirements/deb_requirements.txt
@@ -1 +1 @@
-libtiff5-dev libjpeg8-dev zlib1g-dev libfreetype6-dev liblcms2-dev libwebp-dev tcl8.5-dev tk8.5-dev python-tk python-dev openssl libssl-dev libldap2-dev libsasl2-dev sqlite gcc automake libkrb5-dev
+libtiff5-dev libjpeg8-dev zlib1g-dev libfreetype6-dev liblcms2-dev libwebp-dev tcl8.5-dev tk8.5-dev python-tk python-dev openssl libssl-dev libldap2-dev libsasl2-dev sqlite gcc automake libkrb5-dev sshpass