From 2a5129c481fecffe763abdde02662a08e6e26978 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Thu, 21 Feb 2019 19:22:23 +0800
Subject: [PATCH] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95cmd=20filter=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../migrations/0025_auto_20190221_1902.py     |  21 ++++++
 apps/assets/models/cmd_filter.py              |   4 +
 apps/audits/signals_handler.py                |  20 +++--
 apps/audits/views.py                          |   7 +-
 .../migrations/0005_auto_20190221_1902.py     |  17 +++++
 apps/common/models.py                         |   1 +
 apps/locale/zh/LC_MESSAGES/django.mo          | Bin 64628 -> 64747 bytes
 apps/locale/zh/LC_MESSAGES/django.po          |  69 ++++++++++--------
 8 files changed, 101 insertions(+), 38 deletions(-)
 create mode 100644 apps/assets/migrations/0025_auto_20190221_1902.py
 create mode 100644 apps/common/migrations/0005_auto_20190221_1902.py

diff --git a/apps/assets/migrations/0025_auto_20190221_1902.py b/apps/assets/migrations/0025_auto_20190221_1902.py
new file mode 100644
index 000000000..7124bb509
--- /dev/null
+++ b/apps/assets/migrations/0025_auto_20190221_1902.py
@@ -0,0 +1,21 @@
+# Generated by Django 2.1.7 on 2019-02-21 11:02
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('assets', '0024_auto_20181219_1614'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='commandfilter',
+            options={'verbose_name': 'Command filter'},
+        ),
+        migrations.AlterModelOptions(
+            name='commandfilterrule',
+            options={'ordering': ('-priority', 'action'), 'verbose_name': 'Command filter rule'},
+        ),
+    ]
diff --git a/apps/assets/models/cmd_filter.py b/apps/assets/models/cmd_filter.py
index ea2059d51..5bd031187 100644
--- a/apps/assets/models/cmd_filter.py
+++ b/apps/assets/models/cmd_filter.py
@@ -27,6 +27,9 @@ class CommandFilter(OrgModelMixin):
     def __str__(self):
         return self.name
 
+    class Meta:
+        verbose_name = _("Command filter")
+
 
 class CommandFilterRule(OrgModelMixin):
     TYPE_REGEX = 'regex'
@@ -58,6 +61,7 @@ class CommandFilterRule(OrgModelMixin):
 
     class Meta:
         ordering = ('-priority', 'action')
+        verbose_name = _("Command filter rule")
 
     @property
     def _pattern(self):
diff --git a/apps/audits/signals_handler.py b/apps/audits/signals_handler.py
index 931c6619e..cf297c052 100644
--- a/apps/audits/signals_handler.py
+++ b/apps/audits/signals_handler.py
@@ -6,14 +6,17 @@ from django.dispatch import receiver
 from django.db import transaction
 
 from jumpserver.utils import current_request
-from common.utils import get_request_ip
+from common.utils import get_request_ip, get_logger
 from users.models import User
 from .models import OperateLog, PasswordChangeLog
 
+logger = get_logger(__name__)
+
 
 MODELS_NEED_RECORD = (
     'User', 'UserGroup', 'Asset', 'Node', 'AdminUser', 'SystemUser',
-    'Domain', 'Gateway', 'Organization', 'AssetPermission',
+    'Domain', 'Gateway', 'Organization', 'AssetPermission', 'CommandFilter',
+    'CommandFilterRule', 'License', 'Setting', 'Account', 'SyncInstanceTask',
 )
 
 
@@ -26,11 +29,16 @@ def create_operate_log(action, sender, resource):
         return
     resource_type = sender._meta.verbose_name
     remote_addr = get_request_ip(current_request)
+
+    data = {
+        "user": str(user), 'action': action, 'resource_type': resource_type,
+        'resource': str(resource), 'remote_addr': remote_addr,
+    }
     with transaction.atomic():
-        OperateLog.objects.create(
-            user=user, action=action, resource_type=resource_type,
-            resource=resource, remote_addr=remote_addr
-        )
+        try:
+            OperateLog.objects.create(**data)
+        except Exception as e:
+            logger.error("Create operate log error: {}".format(e))
 
 
 @receiver(post_save, dispatch_uid="my_unique_identifier")
diff --git a/apps/audits/views.py b/apps/audits/views.py
index ed109352c..b19514e9b 100644
--- a/apps/audits/views.py
+++ b/apps/audits/views.py
@@ -14,13 +14,16 @@ from .models import FTPLog, OperateLog, PasswordChangeLog, UserLoginLog
 
 def get_resource_type_list():
     from users.models import User, UserGroup
-    from assets.models import Asset, Node, AdminUser, SystemUser, Domain, Gateway
+    from assets.models import (
+        Asset, Node, AdminUser, SystemUser, Domain, Gateway, CommandFilter,
+        CommandFilterRule,
+    )
     from orgs.models import Organization
     from perms.models import AssetPermission
 
     models = [
         User, UserGroup, Asset, Node, AdminUser, SystemUser, Domain,
-        Gateway, Organization, AssetPermission
+        Gateway, Organization, AssetPermission, CommandFilter, CommandFilterRule
     ]
     return [model._meta.verbose_name for model in models]
 
diff --git a/apps/common/migrations/0005_auto_20190221_1902.py b/apps/common/migrations/0005_auto_20190221_1902.py
new file mode 100644
index 000000000..997ca7a13
--- /dev/null
+++ b/apps/common/migrations/0005_auto_20190221_1902.py
@@ -0,0 +1,17 @@
+# Generated by Django 2.1.7 on 2019-02-21 11:02
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('common', '0004_setting_encrypted'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='setting',
+            options={'verbose_name': 'Setting'},
+        ),
+    ]
diff --git a/apps/common/models.py b/apps/common/models.py
index 012cd7351..a6755a6d4 100644
--- a/apps/common/models.py
+++ b/apps/common/models.py
@@ -123,3 +123,4 @@ class Setting(models.Model):
 
     class Meta:
         db_table = "settings"
+        verbose_name = _("Setting")
diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo
index 62c0858a181e640a916dd7acce79c953173e05ac..cf54d3647d3fa17bdb7aae16bd28264a4ba78a91 100644
GIT binary patch
delta 19221
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

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

diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po
index ca6e66d84..2f8065515 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: 2019-02-21 15:53+0800\n"
+"POT-Creation-Date: 2019-02-21 19:03+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"
@@ -233,8 +233,8 @@ msgstr "密码和私钥, 必须输入一个"
 msgid "* Automatic login mode must fill in the username."
 msgstr "自动登录模式，必须填写用户名"
 
-#: assets/forms/user.py:145 assets/models/user.py:141
-#: assets/templates/assets/_system_user.html:66
+#: assets/forms/user.py:145 assets/models/cmd_filter.py:31
+#: assets/models/user.py:141 assets/templates/assets/_system_user.html:66
 #: assets/templates/assets/system_user_detail.html:165
 msgid "Command filter"
 msgstr "命令过滤器"
@@ -382,7 +382,7 @@ msgstr "标签管理"
 
 #: assets/models/asset.py:109 assets/models/base.py:30
 #: assets/models/cluster.py:28 assets/models/cmd_filter.py:25
-#: assets/models/cmd_filter.py:55 assets/models/group.py:21
+#: assets/models/cmd_filter.py:58 assets/models/group.py:21
 #: assets/templates/assets/admin_user_detail.html:68
 #: assets/templates/assets/asset_detail.html:125
 #: assets/templates/assets/cmd_filter_detail.html:77
@@ -415,7 +415,7 @@ msgstr "创建日期"
 
 #: assets/models/asset.py:111 assets/models/base.py:27
 #: assets/models/cluster.py:29 assets/models/cmd_filter.py:22
-#: assets/models/cmd_filter.py:52 assets/models/domain.py:21
+#: assets/models/cmd_filter.py:55 assets/models/domain.py:21
 #: assets/models/domain.py:53 assets/models/group.py:23
 #: assets/models/label.py:23 assets/templates/assets/admin_user_detail.html:72
 #: assets/templates/assets/admin_user_list.html:32
@@ -533,11 +533,11 @@ msgstr "北京电信"
 msgid "BGP full netcom"
 msgstr "BGP全网通"
 
-#: assets/models/cmd_filter.py:35
+#: assets/models/cmd_filter.py:38
 msgid "Regex"
 msgstr "正则表达式"
 
-#: assets/models/cmd_filter.py:36 ops/models/command.py:21
+#: assets/models/cmd_filter.py:39 ops/models/command.py:21
 #: ops/templates/ops/command_execution_list.html:60 terminal/models.py:161
 #: terminal/templates/terminal/command_list.html:55
 #: terminal/templates/terminal/command_list.html:71
@@ -546,19 +546,19 @@ msgstr "正则表达式"
 msgid "Command"
 msgstr "命令"
 
-#: assets/models/cmd_filter.py:41
+#: assets/models/cmd_filter.py:44
 msgid "Deny"
 msgstr "拒绝"
 
-#: assets/models/cmd_filter.py:42
+#: assets/models/cmd_filter.py:45
 msgid "Allow"
 msgstr "允许"
 
-#: assets/models/cmd_filter.py:46
+#: assets/models/cmd_filter.py:49
 msgid "Filter"
 msgstr "过滤器"
 
-#: assets/models/cmd_filter.py:47
+#: assets/models/cmd_filter.py:50
 #: assets/templates/assets/cmd_filter_rule_list.html:58
 #: audits/templates/audits/login_log_list.html:50
 #: common/templates/common/command_storage_create.html:31
@@ -568,26 +568,26 @@ msgstr "过滤器"
 msgid "Type"
 msgstr "类型"
 
-#: assets/models/cmd_filter.py:48 assets/models/user.py:135
+#: assets/models/cmd_filter.py:51 assets/models/user.py:135
 #: assets/templates/assets/cmd_filter_rule_list.html:60
 msgid "Priority"
 msgstr "优先级"
 
-#: assets/models/cmd_filter.py:48
+#: assets/models/cmd_filter.py:51
 msgid "1-100, the higher will be match first"
 msgstr "优先级可选范围为1-100，1最低优先级，100最高优先级"
 
-#: assets/models/cmd_filter.py:50
+#: assets/models/cmd_filter.py:53
 #: assets/templates/assets/cmd_filter_rule_list.html:59
 #: xpack/plugins/license/models.py:27
 msgid "Content"
 msgstr "内容"
 
-#: assets/models/cmd_filter.py:50
+#: assets/models/cmd_filter.py:53
 msgid "One line one command"
 msgstr "每行一个命令"
 
-#: assets/models/cmd_filter.py:51
+#: assets/models/cmd_filter.py:54
 #: assets/templates/assets/admin_user_assets.html:52
 #: assets/templates/assets/admin_user_list.html:33
 #: assets/templates/assets/asset_list.html:96
@@ -615,6 +615,10 @@ msgstr "每行一个命令"
 msgid "Action"
 msgstr "动作"
 
+#: assets/models/cmd_filter.py:64
+msgid "Command filter rule"
+msgstr "命令过滤规则"
+
 #: assets/models/domain.py:61 assets/templates/assets/domain_detail.html:21
 #: assets/templates/assets/domain_detail.html:64
 #: assets/templates/assets/domain_gateway_list.html:21
@@ -1790,28 +1794,28 @@ msgstr "日期"
 msgid "Datetime"
 msgstr "日期"
 
-#: audits/views.py:68 audits/views.py:112 audits/views.py:148
-#: audits/views.py:192 audits/views.py:223 templates/_nav.html:72
+#: audits/views.py:71 audits/views.py:115 audits/views.py:151
+#: audits/views.py:195 audits/views.py:226 templates/_nav.html:72
 msgid "Audits"
 msgstr "日志审计"
 
-#: audits/views.py:69 templates/_nav.html:76
+#: audits/views.py:72 templates/_nav.html:76
 msgid "FTP log"
 msgstr "FTP日志"
 
-#: audits/views.py:113 templates/_nav.html:77
+#: audits/views.py:116 templates/_nav.html:77
 msgid "Operate log"
 msgstr "操作日志"
 
-#: audits/views.py:149 templates/_nav.html:78
+#: audits/views.py:152 templates/_nav.html:78
 msgid "Password change log"
 msgstr "改密日志"
 
-#: audits/views.py:193 templates/_nav.html:75
+#: audits/views.py:196 templates/_nav.html:75
 msgid "Login log"
 msgstr "登录日志"
 
-#: audits/views.py:224 ops/views/command.py:44
+#: audits/views.py:227 ops/views/command.py:44
 msgid "Command execution list"
 msgstr "命令执行列表"
 
@@ -2123,6 +2127,11 @@ msgstr ""
 msgid "Enabled"
 msgstr "启用"
 
+#: common/models.py:126 users/templates/users/reset_password.html:68
+#: users/templates/users/user_profile.html:20
+msgid "Setting"
+msgstr "设置"
+
 #: common/templates/common/basic_setting.html:15
 #: common/templates/common/email_setting.html:15
 #: common/templates/common/ldap_setting.html:15
@@ -3659,7 +3668,7 @@ msgstr "安全令牌验证"
 
 #: users/templates/users/_base_otp.html:44 users/templates/users/_user.html:13
 #: users/templates/users/user_profile_update.html:51
-#: xpack/plugins/cloud/models.py:60 xpack/plugins/cloud/models.py:120
+#: xpack/plugins/cloud/models.py:120
 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:59
 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_list.html:13
 msgid "Account"
@@ -3881,11 +3890,6 @@ msgstr "密码强度："
 msgid "Password again"
 msgstr "再次输入密码"
 
-#: users/templates/users/reset_password.html:68
-#: users/templates/users/user_profile.html:20
-msgid "Setting"
-msgstr "设置"
-
 #: users/templates/users/reset_password.html:105
 #: users/templates/users/user_password_update.html:99
 #: users/templates/users/user_update.html:46
@@ -4552,6 +4556,10 @@ msgstr ""
 msgid "Access key secret"
 msgstr ""
 
+#: xpack/plugins/cloud/models.py:60
+msgid "Cloud account"
+msgstr "云账号"
+
 #: xpack/plugins/cloud/models.py:121
 msgid "Regions"
 msgstr "地域"
@@ -4762,7 +4770,8 @@ msgstr "界面设置"
 msgid "Interface"
 msgstr "界面"
 
-#: xpack/plugins/license/meta.py:11 xpack/plugins/license/views.py:27
+#: xpack/plugins/license/meta.py:11 xpack/plugins/license/models.py:71
+#: xpack/plugins/license/views.py:27
 msgid "License"
 msgstr "许可证"