feat: 添加命令复核逻辑; 添加命令复核工单; 4

pull/6054/head
Bai 2021-04-26 19:39:00 +08:00 committed by Jiangjie.Bai
parent 74c7b18dc4
commit 7712c1659e
2 changed files with 96 additions and 40 deletions

Binary file not shown.

View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: JumpServer 0.3.3\n" "Project-Id-Version: JumpServer 0.3.3\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-04-14 17:52+0800\n" "POT-Creation-Date: 2021-04-26 19:33+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: ibuler <ibuler@qq.com>\n" "Last-Translator: ibuler <ibuler@qq.com>\n"
"Language-Team: JumpServer team<ibuler@qq.com>\n" "Language-Team: JumpServer team<ibuler@qq.com>\n"
@ -43,12 +43,12 @@ msgstr ""
msgid "Name" msgid "Name"
msgstr "名称" msgstr "名称"
#: acls/models/base.py:27 assets/models/cmd_filter.py:53 #: acls/models/base.py:27 assets/models/cmd_filter.py:54
#: assets/models/user.py:122 #: assets/models/user.py:122
msgid "Priority" msgid "Priority"
msgstr "优先级" msgstr "优先级"
#: acls/models/base.py:28 assets/models/cmd_filter.py:53 #: acls/models/base.py:28 assets/models/cmd_filter.py:54
#: assets/models/user.py:122 #: assets/models/user.py:122
msgid "1-100, the lower the value will be match first" msgid "1-100, the lower the value will be match first"
msgstr "优先级可选范围为 1-100 (数值越小越优先)" msgstr "优先级可选范围为 1-100 (数值越小越优先)"
@ -66,7 +66,7 @@ msgstr "激活中"
#: acls/models/base.py:32 applications/models/application.py:24 #: acls/models/base.py:32 applications/models/application.py:24
#: assets/models/asset.py:147 assets/models/asset.py:223 #: assets/models/asset.py:147 assets/models/asset.py:223
#: assets/models/base.py:255 assets/models/cluster.py:29 #: assets/models/base.py:255 assets/models/cluster.py:29
#: assets/models/cmd_filter.py:23 assets/models/cmd_filter.py:57 #: assets/models/cmd_filter.py:23 assets/models/cmd_filter.py:64
#: assets/models/domain.py:22 assets/models/domain.py:56 #: assets/models/domain.py:22 assets/models/domain.py:56
#: assets/models/group.py:23 assets/models/label.py:23 ops/models/adhoc.py:37 #: assets/models/group.py:23 assets/models/label.py:23 ops/models/adhoc.py:37
#: orgs/models.py:26 perms/models/base.py:57 settings/models.py:34 #: orgs/models.py:26 perms/models/base.py:57 settings/models.py:34
@ -84,11 +84,11 @@ msgstr "激活中"
msgid "Comment" msgid "Comment"
msgstr "备注" msgstr "备注"
#: acls/models/login_acl.py:16 tickets/const.py:18 #: acls/models/login_acl.py:16 tickets/const.py:19
msgid "Reject" msgid "Reject"
msgstr "拒绝" msgstr "拒绝"
#: acls/models/login_acl.py:17 assets/models/cmd_filter.py:47 #: acls/models/login_acl.py:17 assets/models/cmd_filter.py:48
msgid "Allow" msgid "Allow"
msgstr "允许" msgstr "允许"
@ -98,7 +98,7 @@ msgstr "登录IP"
#: acls/models/login_acl.py:24 acls/models/login_asset_acl.py:26 #: acls/models/login_acl.py:24 acls/models/login_asset_acl.py:26
#: acls/serializers/login_acl.py:34 acls/serializers/login_asset_acl.py:75 #: acls/serializers/login_acl.py:34 acls/serializers/login_asset_acl.py:75
#: assets/models/cmd_filter.py:56 audits/models.py:57 #: assets/models/cmd_filter.py:57 audits/models.py:57
#: authentication/templates/authentication/_access_key_modal.html:34 #: authentication/templates/authentication/_access_key_modal.html:34
#: tickets/models/ticket.py:43 users/templates/users/_granted_assets.html:29 #: tickets/models/ticket.py:43 users/templates/users/_granted_assets.html:29
#: users/templates/users/user_asset_permission.html:44 #: users/templates/users/user_asset_permission.html:44
@ -117,7 +117,7 @@ msgstr "动作"
#: authentication/models.py:97 orgs/models.py:18 orgs/models.py:418 #: authentication/models.py:97 orgs/models.py:18 orgs/models.py:418
#: perms/models/base.py:50 templates/index.html:78 #: perms/models/base.py:50 templates/index.html:78
#: terminal/backends/command/models.py:18 #: terminal/backends/command/models.py:18
#: terminal/backends/command/serializers.py:12 terminal/models/session.py:37 #: terminal/backends/command/serializers.py:12 terminal/models/session.py:38
#: tickets/models/comment.py:17 users/models/user.py:159 #: tickets/models/comment.py:17 users/models/user.py:159
#: users/models/user.py:707 users/serializers/group.py:20 #: users/models/user.py:707 users/serializers/group.py:20
#: users/templates/users/user_asset_permission.html:38 #: users/templates/users/user_asset_permission.html:38
@ -149,7 +149,7 @@ msgstr "系统用户"
#: assets/serializers/system_user.py:192 audits/models.py:38 #: assets/serializers/system_user.py:192 audits/models.py:38
#: perms/models/asset_permission.py:99 templates/index.html:82 #: perms/models/asset_permission.py:99 templates/index.html:82
#: terminal/backends/command/models.py:19 #: terminal/backends/command/models.py:19
#: terminal/backends/command/serializers.py:13 terminal/models/session.py:39 #: terminal/backends/command/serializers.py:13 terminal/models/session.py:40
#: users/templates/users/user_asset_permission.html:40 #: users/templates/users/user_asset_permission.html:40
#: users/templates/users/user_asset_permission.html:70 #: users/templates/users/user_asset_permission.html:70
#: users/templates/users/user_granted_remote_app.html:36 #: users/templates/users/user_granted_remote_app.html:36
@ -158,12 +158,12 @@ msgstr "系统用户"
msgid "Asset" msgid "Asset"
msgstr "资产" msgstr "资产"
#: acls/models/login_asset_acl.py:32 authentication/models.py:45 #: acls/models/login_asset_acl.py:32 assets/models/cmd_filter.py:62
#: users/templates/users/user_detail.html:258 #: authentication/models.py:45 users/templates/users/user_detail.html:258
msgid "Reviewers" msgid "Reviewers"
msgstr "审批人" msgstr "审批人"
#: acls/models/login_asset_acl.py:86 tickets/const.py:12 #: acls/models/login_asset_acl.py:89 tickets/const.py:12
msgid "Login asset confirm" msgid "Login asset confirm"
msgstr "登录资产复核" msgstr "登录资产复核"
@ -281,7 +281,7 @@ msgstr "自定义"
msgid "Category" msgid "Category"
msgstr "类别" msgstr "类别"
#: applications/models/application.py:16 assets/models/cmd_filter.py:52 #: applications/models/application.py:16 assets/models/cmd_filter.py:53
#: perms/models/application_permission.py:23 #: perms/models/application_permission.py:23
#: perms/serializers/application/permission.py:17 #: perms/serializers/application/permission.py:17
#: perms/serializers/application/user_permission.py:34 #: perms/serializers/application/user_permission.py:34
@ -348,7 +348,7 @@ msgstr "目标URL"
#: applications/serializers/attrs/application_type/mysql_workbench.py:34 #: applications/serializers/attrs/application_type/mysql_workbench.py:34
#: applications/serializers/attrs/application_type/vmware_client.py:30 #: applications/serializers/attrs/application_type/vmware_client.py:30
#: assets/models/base.py:252 assets/serializers/asset_user.py:71 #: assets/models/base.py:252 assets/serializers/asset_user.py:71
#: audits/signals_handler.py:46 authentication/forms.py:22 #: audits/signals_handler.py:58 authentication/forms.py:22
#: authentication/templates/authentication/login.html:155 #: authentication/templates/authentication/login.html:155
#: settings/serializers/settings.py:93 users/forms/profile.py:21 #: settings/serializers/settings.py:93 users/forms/profile.py:21
#: users/templates/users/user_otp_check_password.html:13 #: users/templates/users/user_otp_check_password.html:13
@ -516,7 +516,7 @@ msgstr "标签管理"
#: assets/models/asset.py:221 assets/models/base.py:258 #: assets/models/asset.py:221 assets/models/base.py:258
#: assets/models/cluster.py:28 assets/models/cmd_filter.py:26 #: assets/models/cluster.py:28 assets/models/cmd_filter.py:26
#: assets/models/cmd_filter.py:60 assets/models/group.py:21 #: assets/models/cmd_filter.py:67 assets/models/group.py:21
#: common/db/models.py:70 common/mixins/models.py:49 orgs/models.py:24 #: common/db/models.py:70 common/mixins/models.py:49 orgs/models.py:24
#: orgs/models.py:422 perms/models/base.py:55 users/models/user.py:571 #: orgs/models.py:422 perms/models/base.py:55 users/models/user.py:571
#: users/serializers/group.py:35 users/templates/users/user_detail.html:97 #: users/serializers/group.py:35 users/templates/users/user_detail.html:97
@ -624,30 +624,38 @@ msgid "Regex"
msgstr "正则表达式" msgstr "正则表达式"
#: assets/models/cmd_filter.py:41 ops/models/command.py:25 #: assets/models/cmd_filter.py:41 ops/models/command.py:25
#: terminal/backends/command/serializers.py:15 terminal/models/session.py:48 #: terminal/backends/command/serializers.py:15 terminal/models/session.py:49
msgid "Command" msgid "Command"
msgstr "命令" msgstr "命令"
#: assets/models/cmd_filter.py:46 #: assets/models/cmd_filter.py:47
msgid "Deny" msgid "Deny"
msgstr "拒绝" msgstr "拒绝"
#: assets/models/cmd_filter.py:51 #: assets/models/cmd_filter.py:49
msgid "Reconfirm"
msgstr "复核"
#: assets/models/cmd_filter.py:52
msgid "Filter" msgid "Filter"
msgstr "过滤器" msgstr "过滤器"
#: assets/models/cmd_filter.py:55 xpack/plugins/license/models.py:29 #: assets/models/cmd_filter.py:56 xpack/plugins/license/models.py:29
msgid "Content" msgid "Content"
msgstr "内容" msgstr "内容"
#: assets/models/cmd_filter.py:55 #: assets/models/cmd_filter.py:56
msgid "One line one command" msgid "One line one command"
msgstr "每行一个命令" msgstr "每行一个命令"
#: assets/models/cmd_filter.py:64 #: assets/models/cmd_filter.py:71
msgid "Command filter rule" msgid "Command filter rule"
msgstr "命令过滤规则" msgstr "命令过滤规则"
#: assets/models/cmd_filter.py:111 tickets/const.py:13
msgid "Command confirm"
msgstr "命令复核"
#: assets/models/domain.py:64 #: assets/models/domain.py:64
msgid "Gateway" msgid "Gateway"
msgstr "网关" msgstr "网关"
@ -775,7 +783,7 @@ msgstr "用户组"
#: perms/models/application_permission.py:31 #: perms/models/application_permission.py:31
#: perms/models/asset_permission.py:101 templates/_nav.html:45 #: perms/models/asset_permission.py:101 templates/_nav.html:45
#: terminal/backends/command/models.py:20 #: terminal/backends/command/models.py:20
#: terminal/backends/command/serializers.py:14 terminal/models/session.py:41 #: terminal/backends/command/serializers.py:14 terminal/models/session.py:42
#: users/templates/users/_granted_assets.html:27 #: users/templates/users/_granted_assets.html:27
#: users/templates/users/user_asset_permission.html:42 #: users/templates/users/user_asset_permission.html:42
#: users/templates/users/user_asset_permission.html:76 #: users/templates/users/user_asset_permission.html:76
@ -984,25 +992,25 @@ msgid ""
"The task of self-checking is already running and cannot be started repeatedly" "The task of self-checking is already running and cannot be started repeatedly"
msgstr "自检程序已经在运行,不能重复启动" msgstr "自检程序已经在运行,不能重复启动"
#: assets/tasks/push_system_user.py:192 #: assets/tasks/push_system_user.py:193
#: assets/tasks/system_user_connectivity.py:89 #: assets/tasks/system_user_connectivity.py:89
msgid "System user is dynamic: {}" msgid "System user is dynamic: {}"
msgstr "系统用户是动态的: {}" msgstr "系统用户是动态的: {}"
#: assets/tasks/push_system_user.py:232 #: assets/tasks/push_system_user.py:233
msgid "Start push system user for platform: [{}]" msgid "Start push system user for platform: [{}]"
msgstr "推送系统用户到平台: [{}]" msgstr "推送系统用户到平台: [{}]"
#: assets/tasks/push_system_user.py:233 #: assets/tasks/push_system_user.py:234
#: assets/tasks/system_user_connectivity.py:81 #: assets/tasks/system_user_connectivity.py:81
msgid "Hosts count: {}" msgid "Hosts count: {}"
msgstr "主机数量: {}" msgstr "主机数量: {}"
#: assets/tasks/push_system_user.py:272 assets/tasks/push_system_user.py:298 #: assets/tasks/push_system_user.py:273 assets/tasks/push_system_user.py:299
msgid "Push system users to assets: {}" msgid "Push system users to assets: {}"
msgstr "推送系统用户到入资产: {}" msgstr "推送系统用户到入资产: {}"
#: assets/tasks/push_system_user.py:284 #: assets/tasks/push_system_user.py:285
msgid "Push system users to asset: {}({}) => {}" msgid "Push system users to asset: {}({}) => {}"
msgstr "推送系统用户到入资产: {}({}) => {}" msgstr "推送系统用户到入资产: {}({}) => {}"
@ -1076,7 +1084,7 @@ msgid "Symlink"
msgstr "建立软链接" msgstr "建立软链接"
#: audits/models.py:37 audits/models.py:60 audits/models.py:71 #: audits/models.py:37 audits/models.py:60 audits/models.py:71
#: terminal/models/session.py:44 #: terminal/models/session.py:45
msgid "Remote addr" msgid "Remote addr"
msgstr "远端地址" msgstr "远端地址"
@ -1094,7 +1102,7 @@ msgid "Success"
msgstr "成功" msgstr "成功"
#: audits/models.py:43 ops/models/command.py:30 perms/models/base.py:53 #: audits/models.py:43 ops/models/command.py:30 perms/models/base.py:53
#: terminal/models/session.py:51 #: terminal/models/session.py:52
#: tickets/serializers/ticket/meta/ticket_type/apply_application.py:43 #: tickets/serializers/ticket/meta/ticket_type/apply_application.py:43
#: tickets/serializers/ticket/meta/ticket_type/apply_application.py:74 #: tickets/serializers/ticket/meta/ticket_type/apply_application.py:74
#: tickets/serializers/ticket/meta/ticket_type/apply_asset.py:40 #: tickets/serializers/ticket/meta/ticket_type/apply_asset.py:40
@ -1250,11 +1258,11 @@ msgstr "运行用户(显示名称)"
msgid "User for display" msgid "User for display"
msgstr "用户(显示名称)" msgstr "用户(显示名称)"
#: audits/signals_handler.py:45 #: audits/signals_handler.py:57
msgid "SSH Key" msgid "SSH Key"
msgstr "SSH 密钥" msgstr "SSH 密钥"
#: audits/signals_handler.py:47 #: audits/signals_handler.py:59
msgid "SSO" msgid "SSO"
msgstr "" msgstr ""
@ -1486,7 +1494,7 @@ msgstr "删除成功"
#: authentication/templates/authentication/_access_key_modal.html:155 #: authentication/templates/authentication/_access_key_modal.html:155
#: authentication/templates/authentication/_mfa_confirm_modal.html:53 #: authentication/templates/authentication/_mfa_confirm_modal.html:53
#: templates/_modal.html:22 tickets/const.py:19 #: templates/_modal.html:22 tickets/const.py:20
msgid "Close" msgid "Close"
msgstr "关闭" msgstr "关闭"
@ -3036,7 +3044,7 @@ msgstr "正常"
#: terminal/const.py:34 #: terminal/const.py:34
msgid "Offline" msgid "Offline"
msgstr "" msgstr "离线"
#: terminal/exceptions.py:8 #: terminal/exceptions.py:8
msgid "Bulk create not support" msgid "Bulk create not support"
@ -3046,15 +3054,15 @@ msgstr "不支持批量创建"
msgid "Storage is invalid" msgid "Storage is invalid"
msgstr "存储无效" msgstr "存储无效"
#: terminal/models/session.py:43 #: terminal/models/session.py:44
msgid "Login from" msgid "Login from"
msgstr "登录来源" msgstr "登录来源"
#: terminal/models/session.py:47 #: terminal/models/session.py:48
msgid "Replay" msgid "Replay"
msgstr "回放" msgstr "回放"
#: terminal/models/session.py:52 #: terminal/models/session.py:53
msgid "Date end" msgid "Date end"
msgstr "结束日期" msgstr "结束日期"
@ -3201,7 +3209,7 @@ msgstr "文档类型"
#: terminal/serializers/storage.py:185 #: terminal/serializers/storage.py:185
msgid "Ignore Certificate Verification" msgid "Ignore Certificate Verification"
msgstr "" msgstr "忽略证书认证"
#: terminal/serializers/terminal.py:66 terminal/serializers/terminal.py:74 #: terminal/serializers/terminal.py:66 terminal/serializers/terminal.py:74
msgid "Not found" msgid "Not found"
@ -3291,15 +3299,15 @@ msgstr "申请资产"
msgid "Apply for application" msgid "Apply for application"
msgstr "申请应用" msgstr "申请应用"
#: tickets/const.py:16 tickets/const.py:23 #: tickets/const.py:17 tickets/const.py:24
msgid "Open" msgid "Open"
msgstr "打开" msgstr "打开"
#: tickets/const.py:17 #: tickets/const.py:18
msgid "Approve" msgid "Approve"
msgstr "同意" msgstr "同意"
#: tickets/const.py:24 #: tickets/const.py:25
msgid "Closed" msgid "Closed"
msgstr "关闭" msgstr "关闭"
@ -3414,6 +3422,30 @@ msgstr "工单申请信息"
msgid "Ticket approved info" msgid "Ticket approved info"
msgstr "工单批准信息" msgstr "工单批准信息"
#: tickets/handler/command_confirm.py:23
msgid "Applied run user"
msgstr "申请运行的用户"
#: tickets/handler/command_confirm.py:24
msgid "Applied run asset"
msgstr "申请运行的资产"
#: tickets/handler/command_confirm.py:25
msgid "Applied run system user"
msgstr "申请运行的系统用户"
#: tickets/handler/command_confirm.py:26
msgid "Applied run command"
msgstr "申请运行的命令"
#: tickets/handler/command_confirm.py:27
msgid "Applied from session"
msgstr "申请来自会话"
#: tickets/handler/command_confirm.py:28
msgid "Applied from command filter rules"
msgstr "申请来自命令过滤规则"
#: tickets/handler/login_asset_confirm.py:16 #: tickets/handler/login_asset_confirm.py:16
msgid "Applied login user" msgid "Applied login user"
msgstr "申请登录的用户" msgstr "申请登录的用户"
@ -3551,6 +3583,30 @@ msgstr "批准的资产"
msgid "No `Asset` are found under Organization `{}`" msgid "No `Asset` are found under Organization `{}`"
msgstr "在组织 `{}` 下没有发现 `资产`" msgstr "在组织 `{}` 下没有发现 `资产`"
#: tickets/serializers/ticket/meta/ticket_type/command_confirm.py:12
msgid "Run user"
msgstr "运行的用户"
#: tickets/serializers/ticket/meta/ticket_type/command_confirm.py:13
msgid "Run asset"
msgstr "运行的资产"
#: tickets/serializers/ticket/meta/ticket_type/command_confirm.py:15
msgid "Run system user"
msgstr "运行的系统用户"
#: tickets/serializers/ticket/meta/ticket_type/command_confirm.py:17
msgid "Run command"
msgstr "运行的命令"
#: tickets/serializers/ticket/meta/ticket_type/command_confirm.py:18
msgid "From session"
msgstr "来自会话"
#: tickets/serializers/ticket/meta/ticket_type/command_confirm.py:20
msgid "From cmd filter rule"
msgstr "来自命令过滤规则"
#: tickets/serializers/ticket/meta/ticket_type/common.py:11 #: tickets/serializers/ticket/meta/ticket_type/common.py:11
msgid "Created by ticket ({}-{})" msgid "Created by ticket ({}-{})"
msgstr "通过工单创建 ({}-{})" msgstr "通过工单创建 ({}-{})"