From 0962a16b2247d027d175dacecca4652c00426411 Mon Sep 17 00:00:00 2001 From: BaiJiangjie Date: Thu, 26 Apr 2018 19:49:09 +0800 Subject: [PATCH 01/54] =?UTF-8?q?[Bugfix]=20=E4=BF=AE=E5=A4=8D=E9=A6=96?= =?UTF-8?q?=E6=AC=A1=E7=99=BB=E5=BD=95=E6=9D=A1=E6=AC=BE=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E5=8F=8A=E5=BC=95=E5=AF=BC=E9=A1=B5=E9=9D=A2MFA=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/i18n/zh/LC_MESSAGES/django.mo | Bin 32826 -> 32913 bytes apps/i18n/zh/LC_MESSAGES/django.po | 269 ++++++++++++-------- apps/users/templates/users/first_login.html | 20 +- apps/users/views/login.py | 10 + 4 files changed, 181 insertions(+), 118 deletions(-) diff --git a/apps/i18n/zh/LC_MESSAGES/django.mo b/apps/i18n/zh/LC_MESSAGES/django.mo index ebfffbfe748496f4dfd19f8c4ebf42f48a27d9ce..4da36e76e728971c74b595652700d37f1d8eae61 100644 GIT binary patch delta 10727 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 delta 10648 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 fr+og_Hl4$Yq*Y68lHMRSzevyf\n" "Language-Team: Jumpserver team\n" @@ -128,9 +128,9 @@ msgstr "资产" #: assets/templates/assets/domain_list.html:14 #: assets/templates/assets/label_list.html:14 #: assets/templates/assets/system_user_detail.html:58 -#: assets/templates/assets/system_user_list.html:26 common/models.py:26 -#: common/templates/common/terminal_setting.html:67 -#: common/templates/common/terminal_setting.html:85 ops/models/adhoc.py:36 +#: assets/templates/assets/system_user_list.html:26 common/forms.py:179 +#: common/models.py:26 common/templates/common/terminal_setting.html:70 +#: common/templates/common/terminal_setting.html:88 ops/models/adhoc.py:36 #: ops/templates/ops/task_detail.html:59 ops/templates/ops/task_list.html:35 #: perms/models.py:19 perms/templates/perms/asset_permission_detail.html:62 #: perms/templates/perms/asset_permission_list.html:53 @@ -154,8 +154,8 @@ msgstr "名称" #: assets/templates/assets/system_user_detail.html:62 #: assets/templates/assets/system_user_list.html:27 #: perms/templates/perms/asset_permission_user.html:55 users/forms.py:13 -#: users/forms.py:22 users/models/authentication.py:45 users/models/user.py:40 -#: users/templates/users/_select_user_modal.html:14 +#: users/forms.py:21 users/forms.py:30 users/models/authentication.py:45 +#: users/models/user.py:40 users/templates/users/_select_user_modal.html:14 #: users/templates/users/login.html:56 #: users/templates/users/login_log_list.html:49 #: users/templates/users/user_detail.html:67 @@ -168,8 +168,8 @@ msgstr "用户名" msgid "Password or private key passphrase" msgstr "密码或密钥密码" -#: assets/forms/user.py:25 assets/models/base.py:22 common/forms.py:113 -#: users/forms.py:15 users/forms.py:24 users/forms.py:36 +#: assets/forms/user.py:25 assets/models/base.py:22 common/forms.py:114 +#: users/forms.py:15 users/forms.py:23 users/forms.py:32 users/forms.py:44 #: users/templates/users/login.html:59 #: users/templates/users/reset_password.html:52 #: users/templates/users/user_create.html:10 @@ -209,7 +209,7 @@ msgstr "高优先级的系统用户将会作为默认登录用户" #: assets/templates/assets/asset_list.html:87 #: assets/templates/assets/domain_gateway_list.html:57 #: assets/templates/assets/system_user_asset.html:50 -#: assets/templates/assets/user_asset_list.html:46 common/forms.py:144 +#: assets/templates/assets/user_asset_list.html:46 common/forms.py:145 #: perms/templates/perms/asset_permission_asset.html:55 #: users/templates/users/login_log_list.html:52 #: users/templates/users/user_granted_asset.html:45 @@ -222,7 +222,7 @@ msgstr "IP" #: assets/templates/assets/asset_detail.html:57 #: assets/templates/assets/asset_list.html:86 #: assets/templates/assets/system_user_asset.html:49 -#: assets/templates/assets/user_asset_list.html:45 common/forms.py:143 +#: assets/templates/assets/user_asset_list.html:45 common/forms.py:144 #: perms/templates/perms/asset_permission_asset.html:54 #: users/templates/users/user_granted_asset.html:44 #: users/templates/users/user_group_granted_asset.html:44 @@ -430,7 +430,7 @@ msgstr "默认资产组" #: terminal/templates/terminal/command_list.html:32 #: terminal/templates/terminal/command_list.html:72 #: terminal/templates/terminal/session_list.html:33 -#: terminal/templates/terminal/session_list.html:71 users/forms.py:273 +#: terminal/templates/terminal/session_list.html:71 users/forms.py:281 #: users/models/user.py:30 users/models/user.py:318 #: users/templates/users/user_group_detail.html:78 #: users/templates/users/user_group_list.html:13 users/views/user.py:339 @@ -630,10 +630,11 @@ msgstr "其它" #: assets/templates/assets/domain_create_update.html:16 #: assets/templates/assets/gateway_create_update.html:58 #: assets/templates/assets/label_create_update.html:18 -#: common/templates/common/basic_setting.html:58 -#: common/templates/common/email_setting.html:59 -#: common/templates/common/ldap_setting.html:59 -#: common/templates/common/terminal_setting.html:101 +#: common/templates/common/basic_setting.html:61 +#: common/templates/common/cloud_setting.html:74 +#: common/templates/common/email_setting.html:62 +#: common/templates/common/ldap_setting.html:62 +#: common/templates/common/terminal_setting.html:104 #: perms/templates/perms/asset_permission_create_update.html:69 #: terminal/templates/terminal/terminal_update.html:47 #: users/templates/users/_user.html:46 @@ -655,10 +656,11 @@ msgstr "重置" #: assets/templates/assets/domain_create_update.html:17 #: assets/templates/assets/gateway_create_update.html:59 #: assets/templates/assets/label_create_update.html:19 -#: common/templates/common/basic_setting.html:59 -#: common/templates/common/email_setting.html:60 -#: common/templates/common/ldap_setting.html:60 -#: common/templates/common/terminal_setting.html:103 +#: common/templates/common/basic_setting.html:62 +#: common/templates/common/cloud_setting.html:76 +#: common/templates/common/email_setting.html:63 +#: common/templates/common/ldap_setting.html:63 +#: common/templates/common/terminal_setting.html:106 #: perms/templates/perms/asset_permission_create_update.html:70 #: terminal/templates/terminal/session_list.html:120 #: terminal/templates/terminal/terminal_update.html:48 @@ -792,7 +794,7 @@ msgstr "选择节点" #: users/templates/users/user_detail.html:410 #: users/templates/users/user_group_create_update.html:32 #: users/templates/users/user_group_list.html:86 -#: users/templates/users/user_list.html:196 +#: users/templates/users/user_list.html:199 #: users/templates/users/user_profile.html:215 msgid "Confirm" msgstr "确认" @@ -973,7 +975,7 @@ msgstr "存在资产，不能删除" #: users/templates/users/user_detail.html:357 #: users/templates/users/user_detail.html:382 #: users/templates/users/user_group_list.html:81 -#: users/templates/users/user_list.html:191 +#: users/templates/users/user_list.html:194 msgid "Are you sure?" msgstr "你确认吗?" @@ -1025,8 +1027,8 @@ msgid "Create gateway" msgstr "创建网关" #: assets/templates/assets/domain_gateway_list.html:87 -#: common/templates/common/email_setting.html:58 -#: common/templates/common/ldap_setting.html:58 +#: common/templates/common/email_setting.html:61 +#: common/templates/common/ldap_setting.html:61 msgid "Test connection" msgstr "测试连接" @@ -1123,7 +1125,7 @@ msgstr "批量更新资产" msgid "Update asset" msgstr "更新资产" -#: assets/views/asset.py:311 +#: assets/views/asset.py:314 msgid "already exists" msgstr "已经存在" @@ -1246,84 +1248,84 @@ msgstr "不是字符类型" msgid "Encrypt field using Secret Key" msgstr "" -#: common/forms.py:70 +#: common/forms.py:71 msgid "Current SITE URL" msgstr "当前站点URL" -#: common/forms.py:74 +#: common/forms.py:75 msgid "User Guide URL" msgstr "用户向导URL" -#: common/forms.py:75 +#: common/forms.py:76 msgid "User first login update profile done redirect to it" msgstr "用户第一次登录，修改profile后重定向到地址" -#: common/forms.py:78 +#: common/forms.py:79 msgid "Email Subject Prefix" msgstr "Email主题前缀" -#: common/forms.py:85 +#: common/forms.py:86 msgid "SMTP host" msgstr "SMTP主机" -#: common/forms.py:87 +#: common/forms.py:88 msgid "SMTP port" msgstr "SMTP端口" -#: common/forms.py:89 +#: common/forms.py:90 msgid "SMTP user" msgstr "SMTP账号" -#: common/forms.py:92 +#: common/forms.py:93 msgid "SMTP password" msgstr "SMTP密码" -#: common/forms.py:93 +#: common/forms.py:94 msgid "Some provider use token except password" msgstr "一些邮件提供商需要输入的是Token" -#: common/forms.py:96 common/forms.py:136 +#: common/forms.py:97 common/forms.py:137 msgid "Use SSL" msgstr "使用SSL" -#: common/forms.py:97 +#: common/forms.py:98 msgid "If SMTP port is 465, may be select" msgstr "如果SMTP端口是465，通常需要启用SSL" -#: common/forms.py:100 +#: common/forms.py:101 msgid "Use TLS" msgstr "使用TLS" -#: common/forms.py:101 +#: common/forms.py:102 msgid "If SMTP port is 587, may be select" msgstr "如果SMTP端口是587，通常需要启用TLS" -#: common/forms.py:107 +#: common/forms.py:108 msgid "LDAP server" msgstr "LDAP地址" -#: common/forms.py:110 +#: common/forms.py:111 msgid "Bind DN" msgstr "绑定DN" -#: common/forms.py:117 +#: common/forms.py:118 msgid "User OU" msgstr "用户OU" -#: common/forms.py:120 +#: common/forms.py:121 msgid "User search filter" msgstr "用户过滤器" -#: common/forms.py:121 +#: common/forms.py:122 #, python-format msgid "Choice may be (cn|uid|sAMAccountName)=%(user)s)" msgstr "可能的选项是(cn或uid或sAMAccountName=%(user)s)" -#: common/forms.py:124 +#: common/forms.py:125 msgid "User attr map" msgstr "LDAP属性映射" -#: common/forms.py:131 +#: common/forms.py:132 msgid "" "User attr map present how to map LDAP user attr to jumpserver, username,name," "email is jumpserver attr" @@ -1331,52 +1333,80 @@ msgstr "" "用户属性映射代表怎样将LDAP中用户属性映射到jumpserver用户上，username, name," "email 是jumpserver的属性" -#: common/forms.py:138 +#: common/forms.py:139 msgid "Enable LDAP auth" msgstr "启用LDAP认证" -#: common/forms.py:147 +#: common/forms.py:148 msgid "List sort by" msgstr "资产列表排序" -#: common/forms.py:150 +#: common/forms.py:151 msgid "Heartbeat interval" msgstr "心跳间隔" -#: common/forms.py:150 ops/models/adhoc.py:37 +#: common/forms.py:151 ops/models/adhoc.py:37 msgid "Units: seconds" msgstr "单位: 秒" -#: common/forms.py:153 +#: common/forms.py:154 msgid "Password auth" msgstr "密码认证" -#: common/forms.py:156 +#: common/forms.py:157 msgid "Public key auth" msgstr "密钥认证" -#: common/forms.py:159 common/templates/common/terminal_setting.html:63 +#: common/forms.py:160 common/templates/common/terminal_setting.html:66 #: terminal/forms.py:30 terminal/models.py:20 msgid "Command storage" msgstr "命令存储" -#: common/forms.py:160 +#: common/forms.py:161 msgid "" "Set terminal storage setting, `default` is the using as default,You can set " "other storage and some terminal using" msgstr "设置终端命令存储，default是默认用的存储方式" -#: common/forms.py:165 common/templates/common/terminal_setting.html:81 +#: common/forms.py:166 common/templates/common/terminal_setting.html:84 #: terminal/forms.py:35 terminal/models.py:21 msgid "Replay storage" msgstr "录像存储" -#: common/forms.py:166 +#: common/forms.py:167 msgid "" "Set replay storage setting, `default` is the using as default,You can set " "other storage and some terminal using" msgstr "设置终端录像存储，default是默认用的存储方式" +#: common/forms.py:175 +msgid "Aliyun" +msgstr "" + +#: common/forms.py:176 +msgid "AWS" +msgstr "" + +#: common/forms.py:183 +msgid "Cloud provider" +msgstr "" + +#: common/forms.py:186 +msgid "Access key id" +msgstr "" + +#: common/forms.py:187 +msgid "Enter the access key id for the cloud service" +msgstr "" + +#: common/forms.py:190 +msgid "Access key secret" +msgstr "" + +#: common/forms.py:191 +msgid "Enter the access key secret for the cloud service" +msgstr "" + #: common/mixins.py:29 msgid "is discard" msgstr "" @@ -1390,46 +1420,62 @@ msgid "Enabled" msgstr "启用" #: common/templates/common/basic_setting.html:15 +#: common/templates/common/cloud_setting.html:16 +#: common/templates/common/cloud_setting.html:49 #: common/templates/common/email_setting.html:15 #: common/templates/common/ldap_setting.html:15 #: common/templates/common/terminal_setting.html:16 -#: common/templates/common/terminal_setting.html:42 common/views.py:22 +#: common/templates/common/terminal_setting.html:45 common/views.py:34 msgid "Basic setting" msgstr "基本设置" #: common/templates/common/basic_setting.html:18 +#: common/templates/common/cloud_setting.html:20 #: common/templates/common/email_setting.html:18 #: common/templates/common/ldap_setting.html:18 -#: common/templates/common/terminal_setting.html:20 common/views.py:48 +#: common/templates/common/terminal_setting.html:20 common/views.py:60 msgid "Email setting" msgstr "邮件设置" #: common/templates/common/basic_setting.html:21 +#: common/templates/common/cloud_setting.html:24 #: common/templates/common/email_setting.html:21 #: common/templates/common/ldap_setting.html:21 -#: common/templates/common/terminal_setting.html:24 common/views.py:74 +#: common/templates/common/terminal_setting.html:24 common/views.py:86 msgid "LDAP setting" msgstr "LDAP设置" #: common/templates/common/basic_setting.html:24 +#: common/templates/common/cloud_setting.html:28 #: common/templates/common/email_setting.html:24 #: common/templates/common/ldap_setting.html:24 -#: common/templates/common/terminal_setting.html:28 common/views.py:104 +#: common/templates/common/terminal_setting.html:28 common/views.py:116 msgid "Terminal setting" msgstr "终端设置" -#: common/templates/common/terminal_setting.html:68 -#: common/templates/common/terminal_setting.html:86 +#: common/templates/common/basic_setting.html:27 +#: common/templates/common/cloud_setting.html:32 +#: common/templates/common/email_setting.html:27 +#: common/templates/common/ldap_setting.html:27 +#: common/templates/common/terminal_setting.html:31 common/views.py:144 +#, fuzzy +#| msgid "Email setting" +msgid "Cloud setting" +msgstr "邮件设置" + +#: common/templates/common/terminal_setting.html:71 +#: common/templates/common/terminal_setting.html:89 #: users/templates/users/login_log_list.html:50 msgid "Type" msgstr "类型" -#: common/views.py:21 common/views.py:47 common/views.py:73 common/views.py:103 -#: templates/_nav.html:81 +#: common/views.py:33 common/views.py:59 common/views.py:85 common/views.py:115 +#: common/views.py:143 templates/_nav.html:81 msgid "Settings" msgstr "系统设置" -#: common/views.py:32 common/views.py:58 common/views.py:86 common/views.py:116 +#: common/views.py:44 common/views.py:70 common/views.py:98 common/views.py:128 +#: common/views.py:155 msgid "Update setting successfully, please restart program" msgstr "更新设置成功, 请手动重启程序" @@ -1703,8 +1749,8 @@ msgstr "任务列表" msgid "Task run history" msgstr "执行历史" -#: perms/forms.py:18 users/forms.py:230 users/forms.py:235 users/forms.py:247 -#: users/forms.py:277 +#: perms/forms.py:18 users/forms.py:238 users/forms.py:243 users/forms.py:255 +#: users/forms.py:285 msgid "Select users" msgstr "选择用户" @@ -1852,7 +1898,7 @@ msgstr "商业支持" msgid "Docs" msgstr "文档" -#: templates/_header_bar.html:37 templates/_nav_user.html:9 users/forms.py:113 +#: templates/_header_bar.html:37 templates/_nav_user.html:9 users/forms.py:121 #: users/templates/users/_user.html:39 #: users/templates/users/first_login.html:39 #: users/templates/users/user_password_update.html:37 @@ -1916,7 +1962,7 @@ msgstr "关闭" #: templates/_nav.html:10 users/views/group.py:28 users/views/group.py:44 #: users/views/group.py:62 users/views/group.py:79 users/views/group.py:95 -#: users/views/login.py:241 users/views/login.py:289 users/views/user.py:64 +#: users/views/login.py:264 users/views/login.py:325 users/views/user.py:64 #: users/views/user.py:79 users/views/user.py:99 users/views/user.py:155 #: users/views/user.py:310 users/views/user.py:357 users/views/user.py:379 msgid "Users" @@ -2228,11 +2274,11 @@ msgstr "" msgid "Invalid token or cache refreshed." msgstr "" -#: users/forms.py:30 +#: users/forms.py:38 msgid "MFA code" msgstr "MFA 验证码" -#: users/forms.py:41 users/models/user.py:52 +#: users/forms.py:49 users/models/user.py:52 #: users/templates/users/_select_user_modal.html:15 #: users/templates/users/user_detail.html:87 #: users/templates/users/user_list.html:25 @@ -2240,31 +2286,31 @@ msgstr "MFA 验证码" msgid "Role" msgstr "角色" -#: users/forms.py:44 users/forms.py:193 +#: users/forms.py:52 users/forms.py:201 msgid "ssh public key" msgstr "ssh公钥" -#: users/forms.py:45 users/forms.py:194 +#: users/forms.py:53 users/forms.py:202 msgid "ssh-rsa AAAA..." msgstr "" -#: users/forms.py:46 +#: users/forms.py:54 msgid "Paste user id_rsa.pub here." msgstr "复制用户公钥到这里" -#: users/forms.py:64 users/templates/users/user_detail.html:196 +#: users/forms.py:72 users/templates/users/user_detail.html:196 msgid "Join user groups" msgstr "添加到用户组" -#: users/forms.py:75 users/forms.py:208 +#: users/forms.py:83 users/forms.py:216 msgid "Public key should not be the same as your old one." msgstr "不能和原来的密钥相同" -#: users/forms.py:79 users/forms.py:212 users/serializers.py:45 +#: users/forms.py:87 users/forms.py:220 users/serializers.py:45 msgid "Not a valid ssh public key" msgstr "ssh密钥不合法" -#: users/forms.py:119 +#: users/forms.py:127 msgid "" "Tip: when enabled, you will enter the MFA binding process the next time you " "log in. you can also directly bind in \"personal information -> quick " @@ -2273,16 +2319,16 @@ msgstr "" "提示：启用之后您将会在下次登录时进入MFA绑定流程；您也可以在（个人信息->快速修" "改->更改MFA设置）中直接绑定!" -#: users/forms.py:129 +#: users/forms.py:137 msgid "* Enable MFA authentication to make the account more secure." msgstr "* 启用MFA认证，使账号更加安全." -#: users/forms.py:134 users/models/user.py:64 +#: users/forms.py:142 users/models/user.py:64 #: users/templates/users/first_login.html:45 msgid "MFA" msgstr "MFA" -#: users/forms.py:139 +#: users/forms.py:147 msgid "" "In order to protect you and your company, please keep your account, password " "and key sensitive information properly. (for example: setting complex " @@ -2291,40 +2337,41 @@ msgstr "" "为了保护您和公司的安全，请妥善保管您的账户、密码和密钥等重要敏感信息；（如：" "设置复杂密码，启用MFA认证）" -#: users/forms.py:146 users/templates/users/first_login.html:48 -#: users/templates/users/first_login.html:110 +#: users/forms.py:154 users/templates/users/first_login.html:48 +#: users/templates/users/first_login.html:107 +#: users/templates/users/first_login.html:130 msgid "Finish" msgstr "完成" -#: users/forms.py:152 +#: users/forms.py:160 msgid "Old password" msgstr "原来密码" -#: users/forms.py:157 +#: users/forms.py:165 msgid "New password" msgstr "新密码" -#: users/forms.py:162 +#: users/forms.py:170 msgid "Confirm password" msgstr "确认密码" -#: users/forms.py:172 +#: users/forms.py:180 msgid "Old password error" msgstr "原来密码错误" -#: users/forms.py:180 +#: users/forms.py:188 msgid "Password does not match" msgstr "密码不一致" -#: users/forms.py:191 +#: users/forms.py:199 msgid "Automatically configure and download the SSH key" msgstr "自动配置并下载SSH密钥" -#: users/forms.py:195 +#: users/forms.py:203 msgid "Paste your id_rsa.pub here." msgstr "复制你的公钥到这里" -#: users/forms.py:223 users/models/user.py:72 +#: users/forms.py:231 users/models/user.py:72 #: users/templates/users/first_login.html:42 #: users/templates/users/user_password_update.html:43 #: users/templates/users/user_profile.html:68 @@ -2443,11 +2490,15 @@ msgstr "首次登陆" msgid "I agree with the terms and conditions." msgstr "我同意条款和条件" -#: users/templates/users/first_login.html:100 +#: users/templates/users/first_login.html:73 +msgid "Please choose the terms and conditions." +msgstr "请选择同意条款和条件" + +#: users/templates/users/first_login.html:101 msgid "Previous" msgstr "上一步" -#: users/templates/users/first_login.html:108 +#: users/templates/users/first_login.html:105 #: users/templates/users/login_otp.html:66 #: users/templates/users/user_otp_authentication.html:22 #: users/templates/users/user_otp_enable_bind.html:19 @@ -2643,20 +2694,20 @@ msgstr "用户组删除" msgid "UserGroup Deleting failed." msgstr "用户组删除失败" -#: users/templates/users/user_list.html:192 +#: users/templates/users/user_list.html:195 msgid "This will delete the selected users !!!" msgstr "删除选中用户 !!!" -#: users/templates/users/user_list.html:200 +#: users/templates/users/user_list.html:203 msgid "User Deleted." msgstr "已被删除" -#: users/templates/users/user_list.html:201 -#: users/templates/users/user_list.html:206 +#: users/templates/users/user_list.html:204 +#: users/templates/users/user_list.html:209 msgid "User Delete" msgstr "删除" -#: users/templates/users/user_list.html:205 +#: users/templates/users/user_list.html:208 msgid "User Deleting failed." msgstr "用户删除失败" @@ -2847,56 +2898,56 @@ msgstr "更新用户组" msgid "User group granted asset" msgstr "用户组授权资产" -#: users/views/login.py:56 +#: users/views/login.py:60 msgid "Please enable cookies and try again." msgstr "设置你的浏览器支持cookie" -#: users/views/login.py:107 users/views/user.py:464 users/views/user.py:489 +#: users/views/login.py:126 users/views/user.py:464 users/views/user.py:489 msgid "MFA code invalid" msgstr "MFA码认证失败" -#: users/views/login.py:133 +#: users/views/login.py:152 msgid "Logout success" msgstr "退出登录成功" -#: users/views/login.py:134 +#: users/views/login.py:153 msgid "Logout success, return login page" msgstr "退出登录成功，返回到登录页面" -#: users/views/login.py:150 +#: users/views/login.py:169 msgid "Email address invalid, please input again" msgstr "邮箱地址错误，重新输入" -#: users/views/login.py:163 +#: users/views/login.py:182 msgid "Send reset password message" msgstr "发送重置密码邮件" -#: users/views/login.py:164 +#: users/views/login.py:183 msgid "Send reset password mail success, login your mail box and follow it " msgstr "" "发送重置邮件成功, 请登录邮箱查看, 按照提示操作 (如果没收到,请等待3-5分钟)" -#: users/views/login.py:177 +#: users/views/login.py:196 msgid "Reset password success" msgstr "重置密码成功" -#: users/views/login.py:178 +#: users/views/login.py:197 msgid "Reset password success, return to login page" msgstr "重置密码成功，返回到登录页面" -#: users/views/login.py:195 users/views/login.py:208 +#: users/views/login.py:214 users/views/login.py:227 msgid "Token invalid or expired" msgstr "Token错误或失效" -#: users/views/login.py:204 +#: users/views/login.py:223 msgid "Password not same" msgstr "密码不一致" -#: users/views/login.py:241 +#: users/views/login.py:264 msgid "First login" msgstr "首次登陆" -#: users/views/login.py:290 +#: users/views/login.py:326 msgid "Login log list" msgstr "登录日志" diff --git a/apps/users/templates/users/first_login.html b/apps/users/templates/users/first_login.html index 7138199a3..170bfdd32 100644 --- a/apps/users/templates/users/first_login.html +++ b/apps/users/templates/users/first_login.html @@ -70,6 +70,7 @@
+ {% endif %} {% bootstrap_form wizard.form %} @@ -99,11 +100,7 @@ {% if wizard.steps.prev %}
  • {% trans "Previous" %}
    • {% endif %} - {#{% if wizard.steps.next %}#} - {#
  • {% trans "Next" %}
    • #} - {#{% endif %}#} - {#
  • {% trans "Submit" %}
    • #} - {#将原来的下一页-替换为提交；修复 每页都提交，最后才能成功问题#} + {% if wizard.steps.next %}
  • {% trans "Next" %}
    • {% else %} @@ -124,16 +121,21 @@ {% block custom_foot_js %} + + -
    -
    +
    -
    - - {% endblock %} \ No newline at end of file diff --git a/apps/assets/templates/assets/system_user_detail.html b/apps/assets/templates/assets/system_user_detail.html index 1e180f0ab..96ed7bb93 100644 --- a/apps/assets/templates/assets/system_user_detail.html +++ b/apps/assets/templates/assets/system_user_detail.html @@ -64,14 +64,14 @@ {% trans 'Protocol' %}: - {{ system_user.protocol }} + {{ system_user.protocol }} - + {% trans 'Sudo' %}: {{ system_user.sudo }} {% if system_user.shell %} - + {% trans 'Shell' %}: {{ system_user.shell }} @@ -107,7 +107,7 @@
    -
    +
    {% trans 'Quick update' %}
    @@ -236,6 +236,12 @@ function updateSystemUserNode(nodes) { } jumpserver.nodes_selected = {}; $(document).ready(function () { + if($('#id_protocol_type').text() === 'rdp'){ + $('#id_quick_update').addClass('hidden'); + $('#id_sudo').addClass('hidden'); + $('#id_shell').addClass('hidden'); + } + $('.select2').select2() .on('select2:select', function(evt) { var data = evt.params.data; diff --git a/apps/assets/templates/assets/system_user_update.html b/apps/assets/templates/assets/system_user_update.html index 46ef8d6a3..a8a5c7483 100644 --- a/apps/assets/templates/assets/system_user_update.html +++ b/apps/assets/templates/assets/system_user_update.html @@ -15,10 +15,9 @@
    {% endblock %} -{% block custom_foot_js %} - -{% endblock %} \ No newline at end of file + protocolChange(); + }); +{% endblock %} From cb4afabc9117eff1847ca945ddb73d6b65dd1721 Mon Sep 17 00:00:00 2001 From: ibuler Date: Tue, 15 May 2018 14:44:02 +0800 Subject: [PATCH 34/54] =?UTF-8?q?[Bugfix]=20=E4=BF=AE=E5=A4=8D=E5=88=9B?= =?UTF-8?q?=E5=BB=BAnode=E8=8A=82=E7=82=B9=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E5=A4=8Dwindows=20session=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/api/node.py | 8 ++++---- apps/terminal/api.py | 3 +++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/apps/assets/api/node.py b/apps/assets/api/node.py index b8b2707e6..bc78e408a 100644 --- a/apps/assets/api/node.py +++ b/apps/assets/api/node.py @@ -51,10 +51,10 @@ class NodeViewSet(BulkModelViewSet): else: return serializers.NodeSerializer - # def perform_create(self, serializer): - # child_key = Node.root().get_next_child_key() - # serializer.validated_data["key"] = child_key - # serializer.save() + def perform_create(self, serializer): + child_key = Node.root().get_next_child_key() + serializer.validated_data["key"] = child_key + serializer.save() class NodeWithAssetsApi(generics.ListAPIView): diff --git a/apps/terminal/api.py b/apps/terminal/api.py index eb4b6400a..c9bb68ed6 100644 --- a/apps/terminal/api.py +++ b/apps/terminal/api.py @@ -108,6 +108,9 @@ class StatusViewSet(viewsets.ModelViewSet): task_serializer_class = TaskSerializer def create(self, request, *args, **kwargs): + if self.request.query_params.get("from_guacamole", None): + return Response({"msg": "From guacamole, not support now"}) + self.handle_sessions() super().create(request, *args, **kwargs) tasks = self.request.user.terminal.task_set.filter(is_finished=False) From ed18cb317f754432439d48823d91138315863ea3 Mon Sep 17 00:00:00 2001 From: ibuler Date: Tue, 15 May 2018 15:05:49 +0800 Subject: [PATCH 35/54] =?UTF-8?q?[Bugfix]=20=E4=BF=AE=E5=A4=8D=E5=88=9B?= =?UTF-8?q?=E5=BB=BAnode=20api=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/serializers/node.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/apps/assets/serializers/node.py b/apps/assets/serializers/node.py index bee350591..b191b0a4f 100644 --- a/apps/assets/serializers/node.py +++ b/apps/assets/serializers/node.py @@ -53,14 +53,13 @@ class NodeSerializer(serializers.ModelSerializer): def validate(self, data): value = data.get('value') - instance = self.instance - if not instance.is_root(): - children = instance.parent.get_children().exclude(key=instance.key) - values = [child.value for child in children] - if value in values: - raise serializers.ValidationError( - 'The same level node name cannot be the same' - ) + instance = self.instance if self.instance else Node.root() + children = instance.parent.get_children().exclude(key=instance.key) + values = [child.value for child in children] + if value in values: + raise serializers.ValidationError( + 'The same level node name cannot be the same' + ) return data @staticmethod From 599431f402e868c69aa59de8bd3ba24fc5a55373 Mon Sep 17 00:00:00 2001 From: BaiJiangJie Date: Tue, 15 May 2018 17:32:20 +0800 Subject: [PATCH 36/54] =?UTF-8?q?[Update]=20=E5=8E=BB=E6=8E=89=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0windows=E7=9B=B8=E5=85=B3=E9=85=8D=E7=BD=AE=E6=97=B6?= =?UTF-8?q?=E7=9A=84=E4=B8=80=E4=BA=9B=E6=97=A0=E7=94=A8=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=EF=BC=8C=E7=BD=91=E5=9F=9F=E7=BD=91=E5=85=B3/=E4=BC=9A?= =?UTF-8?q?=E8=AF=9D=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/api/node.py | 2 +- apps/assets/models/node.py | 2 +- .../assets/templates/assets/_system_user.html | 20 +++++++------- .../templates/assets/domain_gateway_list.html | 6 +++-- .../assets/gateway_create_update.html | 26 +++++++++++++++++++ .../templates/terminal/session_list.html | 6 ++++- 6 files changed, 47 insertions(+), 15 deletions(-) diff --git a/apps/assets/api/node.py b/apps/assets/api/node.py index 30d661a29..5a3197288 100644 --- a/apps/assets/api/node.py +++ b/apps/assets/api/node.py @@ -186,7 +186,7 @@ class NodeAddChildrenApi(generics.UpdateAPIView): continue # node.parent = instance # node.save() - node.move(instance) + node.set_parent(instance) return Response("OK") diff --git a/apps/assets/models/node.py b/apps/assets/models/node.py index bb83035c0..5ee97af9b 100644 --- a/apps/assets/models/node.py +++ b/apps/assets/models/node.py @@ -39,7 +39,7 @@ class Node(models.Model): def level(self): return len(self.key.split(':')) - def move(self, instance): + def set_parent(self, instance): children = self.get_all_children() old_key = self.key with transaction.atomic(): diff --git a/apps/assets/templates/assets/_system_user.html b/apps/assets/templates/assets/_system_user.html index 6e3b81658..98d1b6098 100644 --- a/apps/assets/templates/assets/_system_user.html +++ b/apps/assets/templates/assets/_system_user.html @@ -87,6 +87,16 @@ var sudo_id = '#' + '{{ form.sudo.id_for_label }}'; var shell_id = '#' + '{{ form.shell.id_for_label }}'; + var div_auto_generate_key = $(auto_generate_key).parent().parent(); + var div_ssh_private_key = $(private_key_id).parent().parent().parent().parent(); + var div_auto_push = $(auto_push_id).parent().parent(); + var div_sudo = $(sudo_id).parent().parent(); + var div_shell = $(shell_id).parent().parent(); + var need_change_div = [ + div_auto_generate_key, div_ssh_private_key, + div_auto_push, div_sudo, div_shell + ]; + function authFieldsDisplay() { if ($(auto_generate_key).prop('checked')) { $('.auth-fields').addClass('hidden'); @@ -96,16 +106,6 @@ } function protocolChange() { - var div_auto_generate_key = $(auto_generate_key).parent().parent(); - var div_ssh_private_key = $(private_key_id).parent().parent().parent().parent(); - var div_auto_push = $(auto_push_id).parent().parent(); - var div_sudo = $(sudo_id).parent().parent(); - var div_shell = $(shell_id).parent().parent(); - var need_change_div = [ - div_auto_generate_key, div_ssh_private_key, - div_auto_push, div_sudo, div_shell - ]; - if ($(protocol_id + " option:selected").text() === 'rdp') { $('.auth-fields').removeClass('hidden'); $.each(need_change_div, function (index, value) { diff --git a/apps/assets/templates/assets/domain_gateway_list.html b/apps/assets/templates/assets/domain_gateway_list.html index 581f6c08a..c2d5528ee 100644 --- a/apps/assets/templates/assets/domain_gateway_list.html +++ b/apps/assets/templates/assets/domain_gateway_list.html @@ -85,6 +85,9 @@ function initTable() { var update_btn = '{% trans "Update" %}'.replace('{{ DEFAULT_PK }}', cellData); var del_btn = '{% trans "Delete" %}'.replace('{{ DEFAULT_PK }}', cellData); var test_btn = '{% trans "Test connection" %}'.replace('{{ DEFAULT_PK }}', cellData); + if(rowData.protocol === 'rdp'){ + test_btn = '{% trans "Test connection" %}'.replace('{{ DEFAULT_PK }}', cellData); + } $(td).html(update_btn + test_btn + del_btn) }} ], @@ -120,7 +123,6 @@ $(document).ready(function(){ success_message: "可连接", fail_message: "连接失败" }) - -}) +}); {% endblock %} diff --git a/apps/assets/templates/assets/gateway_create_update.html b/apps/assets/templates/assets/gateway_create_update.html index 7d6800c41..e57d8ed5c 100644 --- a/apps/assets/templates/assets/gateway_create_update.html +++ b/apps/assets/templates/assets/gateway_create_update.html @@ -66,3 +66,29 @@
    {% endblock %} + +{% block custom_foot_js %} + +{% endblock %} \ No newline at end of file diff --git a/apps/terminal/templates/terminal/session_list.html b/apps/terminal/templates/terminal/session_list.html index eaaa89ce1..8cea8e217 100644 --- a/apps/terminal/templates/terminal/session_list.html +++ b/apps/terminal/templates/terminal/session_list.html @@ -102,7 +102,11 @@ {% trans "Replay" %} {% else %} - {% trans "Terminate" %} + {% if session.protocol == 'rdp' %} + {% trans "Terminate" %} + {% else %} + {% trans "Terminate" %} + {% endif %} {% endif %} From ac67c231fccb9ed80d57b3d73ba9dff8b88bcfd1 Mon Sep 17 00:00:00 2001 From: BaiJiangJie Date: Wed, 16 May 2018 12:31:13 +0800 Subject: [PATCH 37/54] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E5=89=8D?= =?UTF-8?q?=E7=AB=AFrdp=E7=9B=B8=E5=85=B3=E9=85=8D=E7=BD=AE=E7=9A=84?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../assets/templates/assets/_system_user.html | 95 +++++++++---------- .../assets/gateway_create_update.html | 39 ++++---- .../templates/assets/system_user_detail.html | 11 +-- .../templates/assets/system_user_update.html | 6 -- 4 files changed, 66 insertions(+), 85 deletions(-) diff --git a/apps/assets/templates/assets/_system_user.html b/apps/assets/templates/assets/_system_user.html index 98d1b6098..314967d22 100644 --- a/apps/assets/templates/assets/_system_user.html +++ b/apps/assets/templates/assets/_system_user.html @@ -79,59 +79,50 @@ {% endblock %} {% block custom_foot_js %} - + } +} + +function authFieldsDisplay() { + if ($(auto_generate_key).prop('checked')) { + $('.auth-fields').addClass('hidden'); + } else { + $('.auth-fields').removeClass('hidden'); + } +} + +$(document).ready(function () { + $('.select2').select2(); + authFieldsDisplay(); + protocolChange(); +}) +.on('change', protocol_id, function(){ + protocolChange(); +}) +.on('change', auto_generate_key, function(){ + authFieldsDisplay(); +}); + + {% endblock %} \ No newline at end of file diff --git a/apps/assets/templates/assets/gateway_create_update.html b/apps/assets/templates/assets/gateway_create_update.html index e57d8ed5c..e0b10ba73 100644 --- a/apps/assets/templates/assets/gateway_create_update.html +++ b/apps/assets/templates/assets/gateway_create_update.html @@ -68,27 +68,26 @@ {% endblock %} {% block custom_foot_js %} - +$(document).ready(function(){ + protocolChange(); +}) +.on('change', protocol_id, function(){ + protocolChange(); +}); + {% endblock %} \ No newline at end of file diff --git a/apps/assets/templates/assets/system_user_detail.html b/apps/assets/templates/assets/system_user_detail.html index 96ed7bb93..cc686a62b 100644 --- a/apps/assets/templates/assets/system_user_detail.html +++ b/apps/assets/templates/assets/system_user_detail.html @@ -66,12 +66,12 @@ {% trans 'Protocol' %}: {{ system_user.protocol }} - + {% trans 'Sudo' %}: {{ system_user.sudo }} {% if system_user.shell %} - + {% trans 'Shell' %}: {{ system_user.shell }} @@ -107,7 +107,7 @@
    -
    +
    {% trans 'Quick update' %}
    @@ -237,11 +237,8 @@ function updateSystemUserNode(nodes) { jumpserver.nodes_selected = {}; $(document).ready(function () { if($('#id_protocol_type').text() === 'rdp'){ - $('#id_quick_update').addClass('hidden'); - $('#id_sudo').addClass('hidden'); - $('#id_shell').addClass('hidden'); + $('.only-ssh').addClass('hidden') } - $('.select2').select2() .on('select2:select', function(evt) { var data = evt.params.data; diff --git a/apps/assets/templates/assets/system_user_update.html b/apps/assets/templates/assets/system_user_update.html index a8a5c7483..7e1590db5 100644 --- a/apps/assets/templates/assets/system_user_update.html +++ b/apps/assets/templates/assets/system_user_update.html @@ -15,9 +15,3 @@
    {% endblock %} -{% block document_ready %} - $(document).ready(function () { - $('.select2').select2(); - protocolChange(); - }); -{% endblock %} From 4b7af1457d14e5779d47fb4b6b65dc5b9f382d24 Mon Sep 17 00:00:00 2001 From: ibuler Date: Thu, 17 May 2018 11:39:04 +0800 Subject: [PATCH 38/54] =?UTF-8?q?[Update]=20=E7=B3=BB=E7=BB=9F=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E6=96=B0=E5=A2=9E=E6=B8=85=E9=99=A4=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E7=9A=84=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/api/system_user.py | 7 +- apps/assets/models/base.py | 1 + .../templates/assets/system_user_detail.html | 25 +++++-- apps/i18n/zh/LC_MESSAGES/django.mo | Bin 33242 -> 33388 bytes apps/i18n/zh/LC_MESSAGES/django.po | 61 +++++++++++------- apps/users/models/group.py | 2 +- 6 files changed, 67 insertions(+), 29 deletions(-) diff --git a/apps/assets/api/system_user.py b/apps/assets/api/system_user.py index 1be316567..66d62232d 100644 --- a/apps/assets/api/system_user.py +++ b/apps/assets/api/system_user.py @@ -40,7 +40,7 @@ class SystemUserViewSet(BulkModelViewSet): permission_classes = (IsSuperUserOrAppUser,) -class SystemUserAuthInfoApi(generics.RetrieveUpdateAPIView): +class SystemUserAuthInfoApi(generics.RetrieveUpdateDestroyAPIView): """ Get system user auth info """ @@ -48,6 +48,11 @@ class SystemUserAuthInfoApi(generics.RetrieveUpdateAPIView): permission_classes = (IsSuperUserOrAppUser,) serializer_class = serializers.SystemUserAuthSerializer + def destroy(self, request, *args, **kwargs): + instance = self.get_object() + instance.clear_auth() + return Response(status=204) + class SystemUserPushApi(generics.RetrieveAPIView): """ diff --git a/apps/assets/models/base.py b/apps/assets/models/base.py index 11afd92cf..cb9bb96ae 100644 --- a/apps/assets/models/base.py +++ b/apps/assets/models/base.py @@ -107,6 +107,7 @@ class AssetUser(models.Model): def clear_auth(self): self._password = '' self._private_key = '' + self._public_key = '' self.save() def auto_gen_auth(self): diff --git a/apps/assets/templates/assets/system_user_detail.html b/apps/assets/templates/assets/system_user_detail.html index cc686a62b..9a7bc255a 100644 --- a/apps/assets/templates/assets/system_user_detail.html +++ b/apps/assets/templates/assets/system_user_detail.html @@ -107,14 +107,14 @@
    -
    +
    {% trans 'Quick update' %}
    - + - {% if system_user.auto_push %} + - {% endif %} + + + + + + {# #} {# #} {# ?u2HiM1)~BF{rI$5KGhZ{8VJPiu zQMcd|)PlY;52Lp9xS4NWH=VIw{}5EaNVCdV-haK{b*w{YEKT0sI*dSF$pj3?`B({8 zpkA-t7>#GJHWnV|ec;5S#z{k+KM1w(Y-;UX1!Na~LFR@wx$(w4Xw z(=ZbAt^O`*2LdN}_dE>sB@~50SOzs-460vU)B+OCWV2f}3ceMhCd{^m=~lnc>eu8< zu2j-hk36e6WnRMS)Zena%0zF(I;j4w%uc8!^hPahs5u(7MAw{dzKlBmb<_%1Oyp*1 zfDftAhv`1lK;NLA`|nXV=@jxm=L&x`z_aYJ9E&=C1~$b-sDTfo#`)FS|1ck*UWc$r z-gz;TtYbqeG++y}qjl(M`C!Y(paz(3`4V$2YQpWPaSossas;)&d{p~Q)J=6Jd%3?$ zL0c7yIx)(Ow)(neB5HtUmbb&2-JJNqrHbGNB96ahCFY;vnU=xEbdV-6%hf z{(k)7SYL?yf15%J8gwLLI`$_z5r2`thgDJU%3VUo??e|nM|mltK5?4RbF+bnCA9UY zh-ub0fU=Gd7El^jGQaPbPKTc;4MzQ6P#O>+U@7+Cm(K|E>IIl>?I$Ke-fWjZisvi zJD*d2iijqL5jrjrZxQ#%`AOxxgWqBk;!WZ!;%`F7@4Ekd>^Wc2sWx$s@?|2L7)kyk zF^MQaX%UNVEHNX&#YWPcM4BX|1ObBxrCqH|8CafR~$p5 zj$&93%M%f7SHZF0+S9QYQNbD}TKy;3g1TGyowc>cYvjIn-|E(2p5}kkPAqGxy}FfK zQVwSFaPkI}{~>g|MqU#$3H>tIK%PYC({dv&CUhJ!U!=T>NG7^cSIz3(1r+{6{6d3{ zjvoL1Jx$xgWKsBlD9K{Rk$-AEex~jQvDESp@m2DI<2lNokgO$k5FN=~q7mi2-t+G` zyX=Gj{ELPQI05St^C-WMM+hAUhzitwK>UZY9}7B+G2{iuqgI%UpHjb+(3kXkcn-G` ztthwDKh{1)@;!-;Gej)qAj^LsuSfY0%l~Wsf)8kW-13DcRn9AvU&s4amutpj3F=dc z_bE>x7HKP*64R+{hB{7q`2PMx-5{bbSt2o$a!LH!`i`VLoAP6*V<^#yd@2@aXZlz_ zwdwecd<4$1diNH|L}D!!^RNt2o^nMTkDH0zghPxY&J+I1IsP~9h%gqkkvvL`9IN&I>&T<=zrGUpl5%@uCozQ3|BLWp{Fb;%JVU=Xh;r6{1a)_a z#>5mtM=@eC5lr+WbY#>?QjdR!}6=t%^+HH(!*B@Pf2E_ee!}FAj5~;)coxUdSnRQaypYmnm8>>5l z>#W=l(}-8-7esWRJXbEjIVL7@XPMmnvB@walu=;t#xFKBeDQoyLu0|pEnH7aLL_a1@q zjVi~-H*HXV^X2aSg39E7JndrcD#zo(x>Xm}Pd>MEMgHXVn^OnOuNaU&bN;WhmpT6f DXY(YG delta 11471 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 diff --git a/apps/i18n/zh/LC_MESSAGES/django.po b/apps/i18n/zh/LC_MESSAGES/django.po index 8f95f9291..196c3fb36 100644 --- a/apps/i18n/zh/LC_MESSAGES/django.po +++ b/apps/i18n/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-05-08 17:24+0800\n" +"POT-Creation-Date: 2018-05-17 11:32+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: ibuler \n" "Language-Team: Jumpserver team\n" @@ -17,22 +17,22 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: assets/api/node.py:96 +#: assets/api/node.py:106 msgid "New node {}" msgstr "新节点 {}" -#: assets/api/node.py:225 +#: assets/api/node.py:242 msgid "更新节点资产硬件信息: {}" msgstr "" -#: assets/api/node.py:238 +#: assets/api/node.py:255 msgid "测试节点下资产是否可连接: {}" msgstr "" #: assets/forms/asset.py:24 assets/models/asset.py:66 assets/models/user.py:103 #: assets/templates/assets/asset_detail.html:183 #: assets/templates/assets/asset_detail.html:191 -#: assets/templates/assets/system_user_detail.html:166 perms/models.py:33 +#: assets/templates/assets/system_user_detail.html:175 perms/models.py:33 msgid "Nodes" msgstr "节点管理" @@ -438,7 +438,7 @@ msgstr "默认资产组" msgid "User" msgstr "用户" -#: assets/models/label.py:18 assets/models/node.py:15 +#: assets/models/label.py:18 assets/models/node.py:18 #: assets/templates/assets/label_list.html:15 common/models.py:27 msgid "Value" msgstr "值" @@ -535,7 +535,7 @@ msgstr "测试系统用户可连接性: {}" msgid "定期测试系统用户可连接性: {}" msgstr "" -#: assets/tasks.py:401 +#: assets/tasks.py:402 msgid "推送系统用户到入资产: {}" msgstr "" @@ -660,7 +660,7 @@ msgstr "重置" #: common/templates/common/ldap_setting.html:60 #: common/templates/common/terminal_setting.html:103 #: perms/templates/perms/asset_permission_create_update.html:70 -#: terminal/templates/terminal/session_list.html:120 +#: terminal/templates/terminal/session_list.html:124 #: terminal/templates/terminal/terminal_update.html:48 #: users/templates/users/_user.html:47 #: users/templates/users/forgot_password.html:44 @@ -782,8 +782,8 @@ msgstr "选择节点" #: assets/templates/assets/admin_user_detail.html:100 #: assets/templates/assets/asset_detail.html:200 -#: assets/templates/assets/asset_list.html:634 -#: assets/templates/assets/system_user_detail.html:183 +#: assets/templates/assets/asset_list.html:636 +#: assets/templates/assets/system_user_detail.html:192 #: assets/templates/assets/system_user_list.html:138 templates/_modal.html:22 #: terminal/templates/terminal/session_detail.html:108 #: users/templates/users/user_detail.html:362 @@ -963,19 +963,19 @@ msgstr "仅显示当前节点资产" msgid "Displays all child node assets" msgstr "显示所有子节点资产" -#: assets/templates/assets/asset_list.html:215 +#: assets/templates/assets/asset_list.html:217 msgid "Create node failed" msgstr "创建节点失败" -#: assets/templates/assets/asset_list.html:227 +#: assets/templates/assets/asset_list.html:229 msgid "Have child node, cancel" msgstr "存在子节点，不能删除" -#: assets/templates/assets/asset_list.html:229 +#: assets/templates/assets/asset_list.html:231 msgid "Have assets, cancel" msgstr "存在资产，不能删除" -#: assets/templates/assets/asset_list.html:629 +#: assets/templates/assets/asset_list.html:631 #: assets/templates/assets/system_user_list.html:133 #: users/templates/users/user_detail.html:357 #: users/templates/users/user_detail.html:382 @@ -984,20 +984,20 @@ msgstr "存在资产，不能删除" msgid "Are you sure?" msgstr "你确认吗?" -#: assets/templates/assets/asset_list.html:630 +#: assets/templates/assets/asset_list.html:632 msgid "This will delete the selected assets !!!" msgstr "删除选择资产" -#: assets/templates/assets/asset_list.html:638 +#: assets/templates/assets/asset_list.html:640 msgid "Asset Deleted." msgstr "已被删除" -#: assets/templates/assets/asset_list.html:639 -#: assets/templates/assets/asset_list.html:644 +#: assets/templates/assets/asset_list.html:641 +#: assets/templates/assets/asset_list.html:646 msgid "Asset Delete" msgstr "删除" -#: assets/templates/assets/asset_list.html:643 +#: assets/templates/assets/asset_list.html:645 msgid "Asset Deleting failed." msgstr "删除失败" @@ -1032,6 +1032,7 @@ msgid "Create gateway" msgstr "创建网关" #: assets/templates/assets/domain_gateway_list.html:87 +#: assets/templates/assets/domain_gateway_list.html:89 #: common/templates/common/email_setting.html:58 #: common/templates/common/ldap_setting.html:58 msgid "Test connection" @@ -1080,10 +1081,23 @@ msgstr "家目录" msgid "Uid" msgstr "Uid" -#: assets/templates/assets/system_user_detail.html:174 +#: assets/templates/assets/system_user_detail.html:153 +#: assets/templates/assets/system_user_detail.html:339 +msgid "Clear auth" +msgstr "清除认证信息" + +#: assets/templates/assets/system_user_detail.html:156 +msgid "Clear" +msgstr "清除" + +#: assets/templates/assets/system_user_detail.html:183 msgid "Add to node" msgstr "添加到节点" +#: assets/templates/assets/system_user_detail.html:339 +msgid "success" +msgstr "成功" + #: assets/templates/assets/system_user_list.html:18 #: assets/views/system_user.py:45 msgid "Create system user" @@ -2113,15 +2127,16 @@ msgstr "时长" msgid "Monitor" msgstr "监控" -#: terminal/templates/terminal/session_list.html:105 +#: terminal/templates/terminal/session_list.html:106 +#: terminal/templates/terminal/session_list.html:108 msgid "Terminate" msgstr "终断" -#: terminal/templates/terminal/session_list.html:116 +#: terminal/templates/terminal/session_list.html:120 msgid "Terminate selected" msgstr "终断所选" -#: terminal/templates/terminal/session_list.html:136 +#: terminal/templates/terminal/session_list.html:140 msgid "Terminate task send, waiting ..." msgstr "终断任务已发送，请等待" diff --git a/apps/users/models/group.py b/apps/users/models/group.py index 128fbdbcb..48ed2e949 100644 --- a/apps/users/models/group.py +++ b/apps/users/models/group.py @@ -11,7 +11,7 @@ __all__ = ['UserGroup'] class UserGroup(NoDeleteModelMixin): id = models.UUIDField(default=uuid.uuid4, primary_key=True) - name = models.CharField(max_length=128, verbose_name=_('Name')) + name = models.CharField(max_length=128, unique=True, verbose_name=_('Name')) comment = models.TextField(blank=True, verbose_name=_('Comment')) date_created = models.DateTimeField(auto_now_add=True, null=True, verbose_name=_('Date created')) From 46520287d940daee4444e1a217adf609fe4bc7e6 Mon Sep 17 00:00:00 2001 From: ibuler Date: Thu, 17 May 2018 15:26:22 +0800 Subject: [PATCH 39/54] =?UTF-8?q?[Update]=20=E6=B7=BB=E5=8A=A0=E6=B8=85?= =?UTF-8?q?=E7=90=86=E9=87=8D=E5=A4=8D=E7=94=A8=E6=88=B7=E7=BB=84=E8=84=9A?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- utils/clean_duplicate_user_groups.py | 70 ++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 utils/clean_duplicate_user_groups.py diff --git a/utils/clean_duplicate_user_groups.py b/utils/clean_duplicate_user_groups.py new file mode 100644 index 000000000..be8b2d9ec --- /dev/null +++ b/utils/clean_duplicate_user_groups.py @@ -0,0 +1,70 @@ +#!/usr/bin/python +# + +import os +import sys +from collections import Counter +import django +from django.db.models import Count + + +if os.path.exists('../apps'): + sys.path.insert(0, '../apps') +elif os.path.exists('./apps'): + sys.path.insert(0, './apps') + +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "jumpserver.settings") +django.setup() + +from users.models import UserGroup + + +def clean_group(interactive=True): + groups = UserGroup.objects.all() + groups_name_list = groups.values_list('name', flat=True) + groups_with_info = groups.annotate(Count('users'))\ + .annotate(Count('asset_permissions')) + + counter = Counter(groups_name_list) + for name, count in counter.items(): + if count == 0: + continue + groups_duplicate = groups_with_info.filter(name=name) + need_clean_count = groups_duplicate.count() + + for group in groups_duplicate: + need_clean = True + if group.users__count > 0: + need_clean = False + elif group.asset_permissions__count > 0: + need_clean = False + elif need_clean_count == 1: + need_clean = False + + if need_clean: + confirm = True + if interactive: + confirm = False + while True: + confirm = input( + "Delete user group <{}>, create at {}? ([y]/n)".format( + name, group.date_created) + ) + if confirm.lower() == "y": + confirm = True + break + elif confirm.lower() == "n": + confirm = False + break + else: + print("No valid input") + continue + if confirm: + group.delete() + print("Delete success: {}".format(name)) + need_clean_count -= 1 + else: + continue + +if __name__ == '__main__': + clean_group() From d615eb80b5672948a59aaa19d92095c5a5912a9c Mon Sep 17 00:00:00 2001 From: ibuler Date: Tue, 22 May 2018 18:22:06 +0800 Subject: [PATCH 40/54] =?UTF-8?q?[Update]=20=E4=BC=98=E5=8C=96=E4=BD=BF?= =?UTF-8?q?=E7=94=A8storage=20sdk?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/terminal/api.py | 54 +++++++-------------- apps/terminal/backends/__init__.py | 16 +++--- apps/terminal/backends/command/es.py | 31 +++--------- apps/terminal/serializers.py | 4 +- apps/terminal/templatetags/terminal_tags.py | 4 +- apps/terminal/views/command.py | 4 +- apps/terminal/views/session.py | 4 +- requirements/requirements.txt | 3 +- 8 files changed, 41 insertions(+), 79 deletions(-) diff --git a/apps/terminal/api.py b/apps/terminal/api.py index c9bb68ed6..924a30dfd 100644 --- a/apps/terminal/api.py +++ b/apps/terminal/api.py @@ -9,6 +9,7 @@ from django.core.cache import cache from django.shortcuts import get_object_or_404, redirect from django.utils import timezone from django.core.files.storage import default_storage +from django.http.response import HttpResponseRedirectBase from django.http import HttpResponseNotFound from django.conf import settings @@ -25,7 +26,7 @@ from .serializers import TerminalSerializer, StatusSerializer, \ SessionSerializer, TaskSerializer, ReplaySerializer from .hands import IsSuperUserOrAppUser, IsAppUser, \ IsSuperUserOrAppUserOrUserReadonly -from .backends import get_command_store, get_multi_command_store, \ +from .backends import get_command_storage, get_multi_command_storage, \ SessionCommandSerializer logger = logging.getLogger(__file__) @@ -227,8 +228,8 @@ class CommandViewSet(viewsets.ViewSet): } """ - command_store = get_command_store() - multi_command_storage = get_multi_command_store() + command_store = get_command_storage() + multi_command_storage = get_multi_command_storage() serializer_class = SessionCommandSerializer permission_classes = (IsSuperUserOrAppUser,) @@ -291,19 +292,20 @@ class SessionReplayViewSet(viewsets.ViewSet): url = default_storage.url(path) return redirect(url) else: - configs = settings.TERMINAL_REPLAY_STORAGE.items() + configs = settings.TERMINAL_REPLAY_STORAGE + configs = [cfg for cfg in configs if cfg['TYPE'] != 'server'] if not configs: return HttpResponseNotFound() - for name, config in configs: - client = jms_storage.init(config) - date = self.session.date_start.strftime('%Y-%m-%d') - file_path = os.path.join(date, str(self.session.id) + '.replay.gz') - target_path = default_storage.base_location + '/' + path - - if client and client.has_file(file_path) and \ - client.download_file(file_path, target_path): - return redirect(default_storage.url(path)) + date = self.session.date_start.strftime('%Y-%m-%d') + file_path = os.path.join(date, str(self.session.id) + '.replay.gz') + target_path = default_storage.base_location + '/' + path + storage = jms_storage.get_multi_object_storage(configs) + ok, err = storage.download(file_path, target_path) + if ok: + return redirect(default_storage.url(path)) + else: + logger.error("Failed download replay file: {}".format(err)) return HttpResponseNotFound() @@ -313,34 +315,14 @@ class SessionReplayV2ViewSet(SessionReplayViewSet): session = None def retrieve(self, request, *args, **kwargs): - session_id = kwargs.get('pk') - self.session = get_object_or_404(Session, id=session_id) - path = self.gen_session_path() + response = super().retrieve(request, *args, **kwargs) data = { 'type': 'guacamole' if self.session.protocol == 'rdp' else 'json', 'src': '', } - - if default_storage.exists(path): - url = default_storage.url(path) - data['src'] = url + if isinstance(response, HttpResponseRedirectBase): + data['src'] = response.url return Response(data) - else: - configs = settings.TERMINAL_REPLAY_STORAGE.items() - if not configs: - return HttpResponseNotFound() - - for name, config in configs: - client = jms_storage.init(config) - date = self.session.date_start.strftime('%Y-%m-%d') - file_path = os.path.join(date, str(self.session.id) + '.replay.gz') - target_path = default_storage.base_location + '/' + path - - if client and client.has_file(file_path) and \ - client.download_file(file_path, target_path): - url = default_storage.url(path) - data['src'] = url - return Response(data) return HttpResponseNotFound() diff --git a/apps/terminal/backends/__init__.py b/apps/terminal/backends/__init__.py index ef1ba56a9..9a1c338f5 100644 --- a/apps/terminal/backends/__init__.py +++ b/apps/terminal/backends/__init__.py @@ -7,19 +7,19 @@ TYPE_ENGINE_MAPPING = { } -def get_command_store(): - params = settings.COMMAND_STORAGE - engine_class = import_module(params['ENGINE']) - storage = engine_class.CommandStore(params) +def get_command_storage(): + config = settings.COMMAND_STORAGE + engine_class = import_module(config['ENGINE']) + storage = engine_class.CommandStore(config) return storage -def get_terminal_command_store(): +def get_terminal_command_storages(): storage_list = {} for name, params in settings.TERMINAL_COMMAND_STORAGE.items(): tp = params['TYPE'] if tp == 'server': - storage = get_command_store() + storage = get_command_storage() else: if not TYPE_ENGINE_MAPPING.get(tp): continue @@ -29,9 +29,9 @@ def get_terminal_command_store(): return storage_list -def get_multi_command_store(): +def get_multi_command_storage(): from .command.multi import CommandStore - storage_list = get_terminal_command_store().values() + storage_list = get_terminal_command_storages().values() storage = CommandStore(storage_list) return storage diff --git a/apps/terminal/backends/command/es.py b/apps/terminal/backends/command/es.py index 9c75fc978..dde8e1e95 100644 --- a/apps/terminal/backends/command/es.py +++ b/apps/terminal/backends/command/es.py @@ -1,41 +1,22 @@ # -*- coding: utf-8 -*- # -from jms_es_sdk import ESStore +from jms_storage.es import ESStorage from .base import CommandBase from .models import AbstractSessionCommand -class CommandStore(CommandBase, ESStore): +class CommandStore(ESStorage, CommandBase): def __init__(self, params): - hosts = params.get('HOSTS', ['http://localhost']) - ESStore.__init__(self, hosts=hosts) - - def save(self, command): - return ESStore.save(self, command) - - def bulk_save(self, commands): - return ESStore.bulk_save(self, commands) + super().__init__(params) def filter(self, date_from=None, date_to=None, user=None, asset=None, system_user=None, input=None, session=None): - data = ESStore.filter( - self, date_from=date_from, date_to=date_to, - user=user, asset=asset, system_user=system_user, - input=input, session=session - ) + data = super().filter(date_from=date_from, date_to=date_to, + user=user, asset=asset, system_user=system_user, + input=input, session=session) return AbstractSessionCommand.from_multi_dict( [item["_source"] for item in data["hits"] if item] ) - - def count(self, date_from=None, date_to=None, - user=None, asset=None, system_user=None, - input=None, session=None): - amount = ESStore.count( - self, date_from=date_from, date_to=date_to, - user=user, asset=asset, system_user=system_user, - input=input, session=session - ) - return amount diff --git a/apps/terminal/serializers.py b/apps/terminal/serializers.py index 8c40315a7..c18c5023d 100644 --- a/apps/terminal/serializers.py +++ b/apps/terminal/serializers.py @@ -9,7 +9,7 @@ from rest_framework_bulk.serializers import BulkListSerializer from common.mixins import BulkSerializerMixin from common.utils import get_object_or_none from .models import Terminal, Status, Session, Task -from .backends import get_multi_command_store +from .backends import get_multi_command_storage class TerminalSerializer(serializers.ModelSerializer): @@ -47,7 +47,7 @@ class TerminalSerializer(serializers.ModelSerializer): class SessionSerializer(serializers.ModelSerializer): command_amount = serializers.SerializerMethodField() - command_store = get_multi_command_store() + command_store = get_multi_command_storage() class Meta: model = Session diff --git a/apps/terminal/templatetags/terminal_tags.py b/apps/terminal/templatetags/terminal_tags.py index cd7120fec..c5643c67b 100644 --- a/apps/terminal/templatetags/terminal_tags.py +++ b/apps/terminal/templatetags/terminal_tags.py @@ -1,10 +1,10 @@ # ~*~ coding: utf-8 ~*~ from django import template -from ..backends import get_multi_command_store +from ..backends import get_multi_command_storage register = template.Library() -command_store = get_multi_command_store() +command_store = get_multi_command_storage() @register.filter diff --git a/apps/terminal/views/command.py b/apps/terminal/views/command.py index 0af0b5bfd..748261414 100644 --- a/apps/terminal/views/command.py +++ b/apps/terminal/views/command.py @@ -9,10 +9,10 @@ from django.utils.translation import ugettext as _ from common.mixins import DatetimeSearchMixin, AdminUserRequiredMixin from ..models import Command from .. import utils -from ..backends import get_multi_command_store +from ..backends import get_multi_command_storage __all__ = ['CommandListView'] -common_storage = get_multi_command_store() +common_storage = get_multi_command_storage() class CommandListView(DatetimeSearchMixin, AdminUserRequiredMixin, ListView): diff --git a/apps/terminal/views/session.py b/apps/terminal/views/session.py index 3b66baff7..71caeae48 100644 --- a/apps/terminal/views/session.py +++ b/apps/terminal/views/session.py @@ -10,7 +10,7 @@ from django.conf import settings from users.utils import AdminUserRequiredMixin from common.mixins import DatetimeSearchMixin from ..models import Session, Command, Terminal -from ..backends import get_multi_command_store +from ..backends import get_multi_command_storage from .. import utils @@ -19,7 +19,7 @@ __all__ = [ 'SessionDetailView', ] -command_store = get_multi_command_store() +command_store = get_multi_command_storage() class SessionListView(AdminUserRequiredMixin, DatetimeSearchMixin, ListView): diff --git a/requirements/requirements.txt b/requirements/requirements.txt index e0ecc634e..5fb844181 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -40,7 +40,6 @@ itsdangerous==0.24 itypes==1.1.0 Jinja2==2.10 jmespath==0.9.3 -jms-es-sdk kombu==4.0.2 ldap3==2.4 MarkupSafe==1.0 @@ -62,7 +61,7 @@ pytz==2017.3 PyYAML==3.12 redis==2.10.6 requests==2.18.4 -jms-storage==0.0.13 +jms-storage==0.0.15 s3transfer==0.1.13 simplejson==3.13.2 six==1.11.0 From 092b33d4d1ca10a3dbe7c9c93b8db467796cdce2 Mon Sep 17 00:00:00 2001 From: ibuler Date: Tue, 22 May 2018 19:30:15 +0800 Subject: [PATCH 41/54] =?UTF-8?q?[Update]=20=E6=9B=B4=E6=96=B0requirements?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- requirements/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 5fb844181..f3905f018 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -61,7 +61,7 @@ pytz==2017.3 PyYAML==3.12 redis==2.10.6 requests==2.18.4 -jms-storage==0.0.15 +jms-storage==0.0.16 s3transfer==0.1.13 simplejson==3.13.2 six==1.11.0 From dc1d228e07e5b17022044f4bb0984372c954761d Mon Sep 17 00:00:00 2001 From: ibuler Date: Tue, 22 May 2018 19:44:13 +0800 Subject: [PATCH 42/54] =?UTF-8?q?[Update]=20=E6=9B=B4=E6=96=B0requirements?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- requirements/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index f3905f018..af682f5ca 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -61,7 +61,7 @@ pytz==2017.3 PyYAML==3.12 redis==2.10.6 requests==2.18.4 -jms-storage==0.0.16 +jms-storage==0.0.17 s3transfer==0.1.13 simplejson==3.13.2 six==1.11.0 From f8384973a1be85cac0df6e63630f1ec15a6be386 Mon Sep 17 00:00:00 2001 From: ibuler Date: Wed, 23 May 2018 15:15:27 +0800 Subject: [PATCH 43/54] =?UTF-8?q?[Update]=20=E8=B0=83=E6=95=B4Luna?= =?UTF-8?q?=E7=9A=84=E6=A0=91=E5=BD=A2=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/models/node.py | 8 ++++++-- apps/perms/api.py | 9 +++++++-- apps/perms/utils.py | 34 +++++++++++++++++++++++++++++++--- 3 files changed, 44 insertions(+), 7 deletions(-) diff --git a/apps/assets/models/node.py b/apps/assets/models/node.py index 5ee97af9b..fed8980ed 100644 --- a/apps/assets/models/node.py +++ b/apps/assets/models/node.py @@ -61,10 +61,14 @@ class Node(models.Model): return child def get_children(self): - return self.__class__.objects.filter(key__regex=r'^{}:[0-9]+$'.format(self.key)) + return self.__class__.objects.filter( + key__regex=r'^{}:[0-9]+$'.format(self.key) + ) def get_all_children(self): - return self.__class__.objects.filter(key__startswith='{}:'.format(self.key)) + return self.__class__.objects.filter( + key__startswith='{}:'.format(self.key) + ) def get_family(self): children = list(self.get_all_children()) diff --git a/apps/perms/api.py b/apps/perms/api.py index be69d6158..8f663a0f4 100644 --- a/apps/perms/api.py +++ b/apps/perms/api.py @@ -6,7 +6,7 @@ from rest_framework.views import APIView, Response from rest_framework.generics import ListAPIView, get_object_or_404, RetrieveUpdateAPIView from rest_framework import viewsets -from common.utils import set_or_append_attr_bulk +from common.utils import set_or_append_attr_bulk, get_object_or_none from users.permissions import IsValidUser, IsSuperUser, IsSuperUserOrAppUser from .utils import AssetPermissionUtil from .models import AssetPermission @@ -147,8 +147,13 @@ class UserGrantedNodeAssetsApi(ListAPIView): user = get_object_or_404(User, id=user_id) else: user = self.request.user - node = get_object_or_404(Node, id=node_id) nodes = AssetPermissionUtil.get_user_nodes_with_assets(user) + node = get_object_or_none(Node, id=node_id) + + if not node: + unnode = [node for node in nodes if node.name == 'Unnode'] + node = unnode[0] if unnode else None + assets = nodes.get(node, []) for asset, system_users in assets.items(): asset.system_users_granted = system_users diff --git a/apps/perms/utils.py b/apps/perms/utils.py index b23b1cb7c..abcd2e17e 100644 --- a/apps/perms/utils.py +++ b/apps/perms/utils.py @@ -13,7 +13,6 @@ logger = get_logger(__file__) class AssetPermissionUtil: - @staticmethod def get_user_permissions(user): return AssetPermission.objects.all().valid().filter(users=user) @@ -122,6 +121,24 @@ class AssetPermissionUtil: nodes[node].update(set(_system_users)) return nodes + @classmethod + def get_user_nodes_inherit_group(cls, user): + nodes = defaultdict(set) + groups = user.groups.all() + for group in groups: + _nodes = cls.get_user_group_nodes(group) + for node, system_users in _nodes.items(): + nodes[node].update(set(system_users)) + return nodes + + @classmethod + def get_user_nodes(cls, user): + nodes = cls.get_user_nodes_direct(user) + nodes_inherit = cls.get_user_nodes_inherit_group(user) + for node, system_users in nodes_inherit.items(): + nodes[node].update(set(system_users)) + return nodes + @classmethod def get_user_nodes_assets_direct(cls, user): assets = defaultdict(set) @@ -164,15 +181,26 @@ class AssetPermissionUtil: :param user: :return: {node: {asset: set(su1, su2)}} """ + from assets.models import Node + unnode = Node(value='Unnode') nodes = defaultdict(dict) + for _node in cls.get_user_nodes(user): + children = _node.get_family() + for node in children: + nodes[node] = defaultdict(set) _assets = cls.get_user_assets(user) for asset, _system_users in _assets.items(): _nodes = asset.get_nodes() + in_node = False for node in _nodes: - if asset in nodes[node]: + if node in nodes: + in_node = True nodes[node][asset].update(_system_users) + if not in_node: + if unnode in nodes: + nodes[unnode][asset].update(_system_users) else: - nodes[node][asset] = _system_users + nodes[unnode][asset] = _system_users return nodes @classmethod From fe52c57a1133976c585d9db0acf0331c142a8c6e Mon Sep 17 00:00:00 2001 From: ibuler Date: Thu, 24 May 2018 11:13:22 +0800 Subject: [PATCH 44/54] =?UTF-8?q?[Bugfix]=20=E4=BF=AE=E5=A4=8D=E6=8E=88?= =?UTF-8?q?=E6=9D=83uitls=E7=9A=84=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/perms/utils.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/apps/perms/utils.py b/apps/perms/utils.py index abcd2e17e..36349b982 100644 --- a/apps/perms/utils.py +++ b/apps/perms/utils.py @@ -197,10 +197,8 @@ class AssetPermissionUtil: in_node = True nodes[node][asset].update(_system_users) if not in_node: - if unnode in nodes: - nodes[unnode][asset].update(_system_users) - else: - nodes[unnode][asset] = _system_users + nodes[unnode] = defaultdict(set) + nodes[unnode][asset].update(_system_users) return nodes @classmethod From c529061ee0ade5494d4f1e0947f8e12c3ef41792 Mon Sep 17 00:00:00 2001 From: ibuler Date: Thu, 24 May 2018 11:18:20 +0800 Subject: [PATCH 45/54] =?UTF-8?q?[Bugfix]=20=E4=BF=AE=E5=A4=8D=E6=8E=88?= =?UTF-8?q?=E6=9D=83uitls=E7=9A=84=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/perms/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/perms/utils.py b/apps/perms/utils.py index 36349b982..7899cc5cb 100644 --- a/apps/perms/utils.py +++ b/apps/perms/utils.py @@ -188,6 +188,7 @@ class AssetPermissionUtil: children = _node.get_family() for node in children: nodes[node] = defaultdict(set) + nodes[unnode] = defaultdict(set) _assets = cls.get_user_assets(user) for asset, _system_users in _assets.items(): _nodes = asset.get_nodes() @@ -197,7 +198,6 @@ class AssetPermissionUtil: in_node = True nodes[node][asset].update(_system_users) if not in_node: - nodes[unnode] = defaultdict(set) nodes[unnode][asset].update(_system_users) return nodes From 5a7192e035e3f6b1c08bf909641f1063d36e681d Mon Sep 17 00:00:00 2001 From: ibuler Date: Thu, 24 May 2018 13:30:15 +0800 Subject: [PATCH 46/54] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E5=BF=83?= =?UTF-8?q?=E8=B7=B3bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/terminal/api.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/apps/terminal/api.py b/apps/terminal/api.py index 924a30dfd..fbbae5e22 100644 --- a/apps/terminal/api.py +++ b/apps/terminal/api.py @@ -109,10 +109,9 @@ class StatusViewSet(viewsets.ModelViewSet): task_serializer_class = TaskSerializer def create(self, request, *args, **kwargs): - if self.request.query_params.get("from_guacamole", None): - return Response({"msg": "From guacamole, not support now"}) - - self.handle_sessions() + from_gua = self.request.query_params.get("from_guacamole", None) + if not from_gua: + self.handle_sessions() super().create(request, *args, **kwargs) tasks = self.request.user.terminal.task_set.filter(is_finished=False) serializer = self.task_serializer_class(tasks, many=True) From b9d0d89f66f6b578b9112a5d64c532cd66918696 Mon Sep 17 00:00:00 2001 From: ibuler Date: Thu, 24 May 2018 13:32:20 +0800 Subject: [PATCH 47/54] =?UTF-8?q?[Update]=20=E6=9B=B4=E6=94=B9=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=A5=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/__init__.py | 2 +- apps/templates/_footer.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/__init__.py b/apps/__init__.py index 90767858b..c6491d9fa 100644 --- a/apps/__init__.py +++ b/apps/__init__.py @@ -2,4 +2,4 @@ # -*- coding: utf-8 -*- # -__version__ = "1.3.0" +__version__ = "1.3.1" diff --git a/apps/templates/_footer.html b/apps/templates/_footer.html index 8a723646d..10e607fa3 100644 --- a/apps/templates/_footer.html +++ b/apps/templates/_footer.html @@ -1,6 +1,6 @@
    - Version 1.3.0-{% include '_build.html' %} GPLv2. + Version 1.3.1-{% include '_build.html' %} GPLv2.
    From bff3868b8fbf9a5cf30bf50e45c5e97785162db3 Mon Sep 17 00:00:00 2001 From: ibuler Date: Fri, 25 May 2018 15:23:52 +0800 Subject: [PATCH 48/54] =?UTF-8?q?[Update]=20=E7=BB=9F=E4=B8=80requirements?= =?UTF-8?q?=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- requirements/requirements.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index af682f5ca..bcba2627c 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -3,10 +3,10 @@ ansible==2.4.2.0 asn1crypto==0.24.0 bcrypt==3.1.4 billiard==3.5.0.3 -boto3==1.6.4 -botocore==1.9.4 +boto3==1.6.5 +botocore==1.9.5 celery==4.1.0 -certifi==2017.11.5 +certifi==2018.1.18 cffi==1.11.2 chardet==3.0.4 configparser==3.5.0 @@ -31,7 +31,7 @@ ecdsa==0.13 elasticsearch==6.1.1 enum-compat==0.0.2 ephem==3.7.6.0 -eventlet==0.21.0 +eventlet==0.22.1 ForgeryPy==0.1 greenlet==0.4.12 gunicorn==19.7.1 @@ -57,7 +57,7 @@ pyotp==2.2.6 PyNaCl==1.2.1 python-dateutil==2.6.1 python-gssapi==0.6.4 -pytz==2017.3 +pytz==2018.3 PyYAML==3.12 redis==2.10.6 requests==2.18.4 From a96bda8ca94c5566d3866a3df62a43fdacf1486d Mon Sep 17 00:00:00 2001 From: ibuler Date: Fri, 25 May 2018 17:26:57 +0800 Subject: [PATCH 49/54] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E6=A0=91?= =?UTF-8?q?=E5=BD=A2=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/models/node.py | 41 ++++++++++++++++++++++++------------- apps/jumpserver/settings.py | 6 +++++- 2 files changed, 32 insertions(+), 15 deletions(-) diff --git a/apps/assets/models/node.py b/apps/assets/models/node.py index fed8980ed..b63daf513 100644 --- a/apps/assets/models/node.py +++ b/apps/assets/models/node.py @@ -65,15 +65,25 @@ class Node(models.Model): key__regex=r'^{}:[0-9]+$'.format(self.key) ) + def get_children_with_self(self): + return self.__class__.objects.filter( + key__regex=r'^{0}$|^{0}:[0-9]+$'.format(self.key) + ) + def get_all_children(self): return self.__class__.objects.filter( key__startswith='{}:'.format(self.key) ) + def get_all_children_with_self(self): + return self.__class__.objects.filter( + key__regex=r'^{0}$|^{0}:'.format(self.key) + ) + def get_family(self): - children = list(self.get_all_children()) - children.append(self) - return children + ancestor = self.ancestor + children = self.get_all_children() + return [*tuple(ancestor), self, *tuple(children)] def get_assets(self): from .asset import Asset @@ -88,7 +98,7 @@ class Node(models.Model): if self.is_root(): assets = Asset.objects.all() else: - nodes = self.get_family() + nodes = self.get_all_children_with_self() assets = Asset.objects.filter(nodes__in=nodes).distinct() return assets @@ -108,18 +118,15 @@ class Node(models.Model): @property def parent(self): - if self.key == "0": - return self.__class__.root() - elif not self.key.startswith("0"): + if self.key == "0" or not self.key.startswith("0"): return self.__class__.root() parent_key = ":".join(self.key.split(":")[:-1]) try: parent = self.__class__.objects.get(key=parent_key) + return parent except Node.DoesNotExist: return self.__class__.root() - else: - return parent @parent.setter def parent(self, parent): @@ -127,14 +134,20 @@ class Node(models.Model): @property def ancestor(self): - if self.parent == self.__class__.root(): + _key = self.key.split(':') + ancestor_keys = [] + + if self.is_root(): return [self.__class__.root()] - else: - return [self.parent, *tuple(self.parent.ancestor)] + + for i in range(len(_key)-1): + _key.pop() + ancestor_keys.append(':'.join(_key)) + return self.__class__.objects.filter(key__in=ancestor_keys) @property - def ancestor_with_node(self): - ancestor = self.ancestor + def ancestor_with_self(self): + ancestor = list(self.ancestor) ancestor.insert(0, self) return ancestor diff --git a/apps/jumpserver/settings.py b/apps/jumpserver/settings.py index af72292f7..b81188b9d 100644 --- a/apps/jumpserver/settings.py +++ b/apps/jumpserver/settings.py @@ -229,7 +229,11 @@ LOGGING = { 'django_auth_ldap': { 'handlers': ['console', 'ansible_logs'], 'level': "INFO", - } + }, + # 'django.db': { + # 'handlers': ['console', 'file'], + # 'level': 'DEBUG' + # } } } From 3f4b5ad465aad1f446eb402ac1de10d7e382ee04 Mon Sep 17 00:00:00 2001 From: ibuler Date: Fri, 25 May 2018 17:28:53 +0800 Subject: [PATCH 50/54] [Update] Merge --- apps/perms/api.py | 2 +- apps/perms/utils.py | 49 ++++++++++++++++++++++++++++----------------- 2 files changed, 32 insertions(+), 19 deletions(-) diff --git a/apps/perms/api.py b/apps/perms/api.py index 8f663a0f4..e104cc1c4 100644 --- a/apps/perms/api.py +++ b/apps/perms/api.py @@ -41,7 +41,7 @@ class AssetPermissionViewSet(viewsets.ModelViewSet): asset = get_object_or_404(Asset, pk=asset_id) permissions = set(queryset.filter(assets=asset)) for node in asset.nodes.all(): - inherit_nodes.update(set(node.ancestor_with_node)) + inherit_nodes.update(set(node.ancestor_with_self)) elif node_id: node = get_object_or_404(Node, pk=node_id) permissions = set(queryset.filter(nodes=node)) diff --git a/apps/perms/utils.py b/apps/perms/utils.py index abcd2e17e..d45f0f3d7 100644 --- a/apps/perms/utils.py +++ b/apps/perms/utils.py @@ -8,10 +8,35 @@ import copy from common.utils import set_or_append_attr_bulk, get_logger from .models import AssetPermission +from .hands import Node logger = get_logger(__file__) +class Tree: + def __init__(self): + self.__all_nodes = list(Node.objects.all()) + self.nodes = defaultdict(dict) + self.root = Node.root() + + def add_node(self, node): + if node in self.nodes: + return + else: + self.nodes[node] = defaultdict(set) + if node.key == self.root.key: + return + parent_key = ':'.join(node.key.split(':')[:-1]) + for n in self.__all_nodes: + if n.key == parent_key: + self.add_node(n) + break + + def add_nodes(self, nodes): + for node in nodes: + self.add_node(node) + + class AssetPermissionUtil: @staticmethod def get_user_permissions(user): @@ -181,27 +206,15 @@ class AssetPermissionUtil: :param user: :return: {node: {asset: set(su1, su2)}} """ - from assets.models import Node - unnode = Node(value='Unnode') - nodes = defaultdict(dict) - for _node in cls.get_user_nodes(user): - children = _node.get_family() - for node in children: - nodes[node] = defaultdict(set) + tree = Tree() _assets = cls.get_user_assets(user) for asset, _system_users in _assets.items(): _nodes = asset.get_nodes() - in_node = False + tree.add_nodes(_nodes) + for node in _nodes: - if node in nodes: - in_node = True - nodes[node][asset].update(_system_users) - if not in_node: - if unnode in nodes: - nodes[unnode][asset].update(_system_users) - else: - nodes[unnode][asset] = _system_users - return nodes + tree.nodes[node][asset].update(_system_users) + return tree.nodes @classmethod def get_system_user_assets(cls, system_user): @@ -256,7 +269,7 @@ class NodePermissionUtil: nodes = copy.deepcopy(nodes_directed) for node, system_users in nodes_directed.items(): - for child in node.get_family(): + for child in node.get_all_children_with_self(): nodes[child].update(system_users) return nodes From 9b4b9e69008f092e64c2cab1a8291b964878b915 Mon Sep 17 00:00:00 2001 From: ibuler Date: Fri, 25 May 2018 18:13:48 +0800 Subject: [PATCH 51/54] =?UTF-8?q?[Update]=20=E5=8F=91=E9=80=81=E9=82=AE?= =?UTF-8?q?=E4=BB=B6=E5=A2=9E=E5=8A=A0=E7=94=A8=E6=88=B7=E5=90=8D=E6=98=BE?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/i18n/zh/LC_MESSAGES/django.mo | Bin 33388 -> 32508 bytes apps/i18n/zh/LC_MESSAGES/django.po | 24 ++++++++++++++---------- apps/users/utils.py | 3 +++ 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/apps/i18n/zh/LC_MESSAGES/django.mo b/apps/i18n/zh/LC_MESSAGES/django.mo index 6b02da8fad05df4e52dd43f5833a98e2ab222cc0..b764117a297c394ce044245ec712ffa3ee379e26 100644 GIT binary patch delta 11484 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 delta 11710 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\n" "Language-Team: Jumpserver team\n" @@ -535,7 +535,7 @@ msgstr "测试系统用户可连接性: {}" msgid "定期测试系统用户可连接性: {}" msgstr "" -#: assets/tasks.py:402 +#: assets/tasks.py:401 msgid "推送系统用户到入资产: {}" msgstr "" @@ -2540,7 +2540,7 @@ msgid "Can't provide security? Please contact the administrator!" msgstr "如果不能提供MFA验证码，请联系管理员!" #: users/templates/users/reset_password.html:45 -#: users/templates/users/user_detail.html:348 users/utils.py:73 +#: users/templates/users/user_detail.html:348 users/utils.py:76 msgid "Reset password" msgstr "重置密码" @@ -2744,13 +2744,15 @@ msgid "Create account successfully" msgstr "创建账户成功" #: users/utils.py:39 -#, python-format +#, fuzzy, python-format msgid "" "\n" " Hello %(name)s:\n" "
    \n" " Your account has been created successfully\n" "
    \n" +" Username: %(username)s\n" +"
    \n" " click " "here to set your password\n" "
    \n" @@ -2770,6 +2772,8 @@ msgstr "" " 你好 %(name)s:\n" "
    \n" " 恭喜您，您的账号已经创建成功
    \n" +" 用户名: %(username)s\n" +"
    \n" " 请点击这" "里设置密码
    \n" " 这个链接有效期1小时, 超过时间您可以 \n" " " -#: users/utils.py:75 +#: users/utils.py:78 #, python-format msgid "" "\n" @@ -2828,11 +2832,11 @@ msgstr "" "
    \n" " " -#: users/utils.py:106 +#: users/utils.py:109 msgid "SSH Key Reset" msgstr "重置ssh密钥" -#: users/utils.py:108 +#: users/utils.py:111 #, python-format msgid "" "\n" @@ -2857,15 +2861,15 @@ msgstr "" "
    \n" " " -#: users/utils.py:141 +#: users/utils.py:144 msgid "User not exist" msgstr "用户不存在" -#: users/utils.py:143 +#: users/utils.py:146 msgid "Disabled or expired" msgstr "禁用或失效" -#: users/utils.py:156 +#: users/utils.py:159 msgid "Password or SSH public key invalid" msgstr "密码或密钥不合法" diff --git a/apps/users/utils.py b/apps/users/utils.py index 0ccba92be..cb0e800ed 100644 --- a/apps/users/utils.py +++ b/apps/users/utils.py @@ -41,6 +41,8 @@ def send_user_created_mail(user):
    Your account has been created successfully
    + Username: %(username)s +
    click here to set your password
    This link is valid for 1 hour. After it expires, request new one @@ -54,6 +56,7 @@ def send_user_created_mail(user):
    """) % { 'name': user.name, + 'username': user.username, 'rest_password_url': reverse('users:reset-password', external=True), 'rest_password_token': user.generate_reset_token(), 'forget_password_url': reverse('users:forgot-password', external=True), From fc2a44621bfc53fec941b2cf269a2716b11157dd Mon Sep 17 00:00:00 2001 From: ibuler Date: Fri, 25 May 2018 19:17:57 +0800 Subject: [PATCH 52/54] =?UTF-8?q?[Bugfix]=20=E4=BF=AE=E5=A4=8D=E5=8F=B3?= =?UTF-8?q?=E5=87=BB=E4=BD=8D=E7=BD=AE=E4=B8=8D=E5=AF=B9=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/templates/assets/asset_list.html | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/apps/assets/templates/assets/asset_list.html b/apps/assets/templates/assets/asset_list.html index 0100e1e7f..ab08f7b67 100644 --- a/apps/assets/templates/assets/asset_list.html +++ b/apps/assets/templates/assets/asset_list.html @@ -17,20 +17,21 @@ position:absolute; visibility:hidden; text-align: left; - top: 100%; + {#top: 100%;#} + top: 0; left: 0; z-index: 1000; - float: left; - padding: 5px 0; + {#float: left;#} + padding: 0 0; margin: 2px 0 0; list-style: none; background-clip: padding-box; - } + } div#rMenu li{ margin: 1px 0; cursor: pointer; - {#list-style: none outside none;#} - } + list-style: none outside none; + } .dropdown a:hover { background-color: #f1f1f1 } @@ -266,6 +267,8 @@ function OnRightClick(event, treeId, treeNode) { function showRMenu(type, x, y) { $("#rMenu ul").show(); x -= 220; + x += document.body.scrollLeft; + y += document.body.scrollTop+document.documentElement.scrollTop; rMenu.css({"top":y+"px", "left":x+"px", "visibility":"visible"}); $("body").bind("mousedown", onBodyMouseDown); From 0bc86543b5b1c3c3c158d03806fd9361d5b5a51f Mon Sep 17 00:00:00 2001 From: ibuler Date: Sat, 26 May 2018 21:53:50 +0800 Subject: [PATCH 53/54] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E7=BB=84=E8=AF=A6=E6=83=85=E6=98=BE=E7=A4=BA=E6=8E=88?= =?UTF-8?q?=E6=9D=83=E8=B5=84=E4=BA=A7=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/perms/utils.py | 16 +++++++--------- .../users/user_group_granted_asset.html | 3 ++- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/apps/perms/utils.py b/apps/perms/utils.py index d45f0f3d7..e23a88b27 100644 --- a/apps/perms/utils.py +++ b/apps/perms/utils.py @@ -106,21 +106,19 @@ class AssetPermissionUtil: return assets @classmethod - def get_user_group_nodes_with_assets(cls, user): + def get_user_group_nodes_with_assets(cls, group): """ - :param user: + :param group: :return: {node: {asset: set(su1, su2)}} """ - nodes = defaultdict(dict) - _assets = cls.get_user_group_assets(user) + _assets = cls.get_user_group_assets(group) + tree = Tree() for asset, _system_users in _assets.items(): _nodes = asset.get_nodes() + tree.add_nodes(_nodes) for node in _nodes: - if asset in nodes[node]: - nodes[node][asset].update(_system_users) - else: - nodes[node][asset] = _system_users - return nodes + tree.nodes[node][asset].update(_system_users) + return tree.nodes @classmethod def get_user_assets_direct(cls, user): diff --git a/apps/users/templates/users/user_group_granted_asset.html b/apps/users/templates/users/user_group_granted_asset.html index c1d56a701..1692e06a2 100644 --- a/apps/users/templates/users/user_group_granted_asset.html +++ b/apps/users/templates/users/user_group_granted_asset.html @@ -64,10 +64,11 @@ var zTree; var inited = false; var url; +var asset_table; function initTable() { if (inited){ - return + return asset_table } else { inited = true; } From 0b4df7839365e2c7574e14db5a7447f9a8e62578 Mon Sep 17 00:00:00 2001 From: ibuler Date: Mon, 28 May 2018 13:20:26 +0800 Subject: [PATCH 54/54] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9permistion?= =?UTF-8?q?=20utils=E4=BC=98=E5=8C=96=E8=BF=94=E5=9B=9E=E7=9A=84=E5=B1=9E?= =?UTF-8?q?=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/models/asset.py | 3 ++- apps/assets/models/node.py | 8 ++++++- apps/assets/serializers/asset.py | 4 ++-- apps/perms/models.py | 4 ++-- apps/perms/utils.py | 36 +++++++++++++++++++++++++------- apps/users/models/user.py | 2 +- 6 files changed, 42 insertions(+), 15 deletions(-) diff --git a/apps/assets/models/asset.py b/apps/assets/models/asset.py index 4a2942291..297d50dfc 100644 --- a/apps/assets/models/asset.py +++ b/apps/assets/models/asset.py @@ -117,7 +117,8 @@ class Asset(models.Model): def get_nodes(self): from .node import Node - return self.nodes.all() or [Node.root()] + nodes = self.nodes.all() or [Node.root()] + return nodes @property def hardware_info(self): diff --git a/apps/assets/models/node.py b/apps/assets/models/node.py index b63daf513..5109f3d0a 100644 --- a/apps/assets/models/node.py +++ b/apps/assets/models/node.py @@ -3,6 +3,7 @@ import uuid from django.db import models, transaction +from django.db.models import Q from django.utils.translation import ugettext_lazy as _ @@ -87,7 +88,12 @@ class Node(models.Model): def get_assets(self): from .asset import Asset - assets = Asset.objects.filter(nodes__id=self.id) + if self.is_root(): + assets = Asset.objects.filter( + Q(nodes__id=self.id) | Q(nodes__isnull=True) + ) + else: + assets = Asset.objects.filter(nodes__id=self.id) return assets def get_valid_assets(self): diff --git a/apps/assets/serializers/asset.py b/apps/assets/serializers/asset.py index cf844b5c7..2c5aa253c 100644 --- a/apps/assets/serializers/asset.py +++ b/apps/assets/serializers/asset.py @@ -61,13 +61,13 @@ class AssetGrantedSerializer(serializers.ModelSerializer): """ system_users_granted = AssetSystemUserSerializer(many=True, read_only=True) system_users_join = serializers.SerializerMethodField() - nodes = NodeTMPSerializer(many=True, read_only=True) + # nodes = NodeTMPSerializer(many=True, read_only=True) class Meta: model = Asset fields = ( "id", "hostname", "ip", "port", "system_users_granted", - "is_active", "system_users_join", "os", 'domain', "nodes", + "is_active", "system_users_join", "os", 'domain', "platform", "comment" ) diff --git a/apps/perms/models.py b/apps/perms/models.py index f7792ee6d..581b552b4 100644 --- a/apps/perms/models.py +++ b/apps/perms/models.py @@ -33,8 +33,8 @@ class AssetPermission(models.Model): nodes = models.ManyToManyField('assets.Node', related_name='granted_by_permissions', blank=True, verbose_name=_("Nodes")) system_users = models.ManyToManyField('assets.SystemUser', related_name='granted_by_permissions', verbose_name=_("System user")) is_active = models.BooleanField(default=True, verbose_name=_('Active')) - date_start = models.DateTimeField(default=timezone.now, verbose_name=_("Date start")) - date_expired = models.DateTimeField(default=date_expired_default, verbose_name=_('Date expired')) + date_start = models.DateTimeField(default=timezone.now, db_index=True, verbose_name=_("Date start")) + date_expired = models.DateTimeField(default=date_expired_default, db_index=True, verbose_name=_('Date expired')) created_by = models.CharField(max_length=128, blank=True, verbose_name=_('Created by')) date_created = models.DateTimeField(auto_now_add=True, verbose_name=_('Date created')) comment = models.TextField(verbose_name=_('Comment'), blank=True) diff --git a/apps/perms/utils.py b/apps/perms/utils.py index d45f0f3d7..87911120e 100644 --- a/apps/perms/utils.py +++ b/apps/perms/utils.py @@ -16,8 +16,22 @@ logger = get_logger(__file__) class Tree: def __init__(self): self.__all_nodes = list(Node.objects.all()) + self.__node_asset_map = defaultdict(set) self.nodes = defaultdict(dict) self.root = Node.root() + self.init_node_asset_map() + + def init_node_asset_map(self): + for node in self.__all_nodes: + assets = node.get_assets().values_list('id', flat=True) + for asset in assets: + self.__node_asset_map[str(asset)].add(node) + + def add_asset(self, asset, system_users): + nodes = self.__node_asset_map.get(str(asset.id), []) + self.add_nodes(nodes) + for node in nodes: + self.nodes[node][asset].update(system_users) def add_node(self, node): if node in self.nodes: @@ -44,11 +58,15 @@ class AssetPermissionUtil: @staticmethod def get_user_group_permissions(user_group): - return AssetPermission.objects.all().valid().filter(user_groups=user_group) + return AssetPermission.objects.all().valid().filter( + user_groups=user_group + ) @staticmethod def get_asset_permissions(asset): - return AssetPermission.objects.all().valid().filter(assets=asset) + return AssetPermission.objects.all().valid().filter( + assets=asset + ) @staticmethod def get_node_permissions(node): @@ -56,7 +74,9 @@ class AssetPermissionUtil: @staticmethod def get_system_user_permissions(system_user): - return AssetPermission.objects.valid().all().filter(system_users=system_user) + return AssetPermission.objects.valid().all().filter( + system_users=system_user + ) @classmethod def get_user_group_nodes(cls, group): @@ -209,11 +229,11 @@ class AssetPermissionUtil: tree = Tree() _assets = cls.get_user_assets(user) for asset, _system_users in _assets.items(): - _nodes = asset.get_nodes() - tree.add_nodes(_nodes) - - for node in _nodes: - tree.nodes[node][asset].update(_system_users) + tree.add_asset(asset, _system_users) + # _nodes = asset.get_nodes() + # tree.add_nodes(_nodes) + # for node in _nodes: + # tree.nodes[node][asset].update(_system_users) return tree.nodes @classmethod diff --git a/apps/users/models/user.py b/apps/users/models/user.py index 23c30cf77..025fe7c8f 100644 --- a/apps/users/models/user.py +++ b/apps/users/models/user.py @@ -77,7 +77,7 @@ class User(AbstractUser): is_first_login = models.BooleanField(default=True) date_expired = models.DateTimeField( default=date_expired_default, blank=True, null=True, - verbose_name=_('Date expired') + db_index=True, verbose_name=_('Date expired') ) created_by = models.CharField( max_length=30, default='', verbose_name=_('Created by')
    {% trans 'Auto push' %}: @@ -130,8 +130,8 @@
    {% trans 'Push system user now' %}: @@ -139,8 +139,8 @@
    {% trans 'Test assets connective' %}: @@ -149,6 +149,15 @@
    {% trans 'Clear auth' %}: + + + +
    {% trans 'Change auth period' %}:#} @@ -239,6 +248,7 @@ $(document).ready(function () { if($('#id_protocol_type').text() === 'rdp'){ $('.only-ssh').addClass('hidden') } + $(".panel-body .table tr:visible:first").addClass('no-borders-tr'); $('.select2').select2() .on('select2:select', function(evt) { var data = evt.params.data; @@ -321,6 +331,13 @@ $(document).ready(function () { success: success, flash_message: false }); +}).on('click', '.btn-clear-auth', function () { + var the_url = '{% url "api-assets:system-user-auth-info" pk=system_user.id %}'; + APIUpdateAttr({ + url: the_url, + method: 'DELETE', + success_message: "{% trans 'Clear auth' %}" + " {% trans 'success' %}" + }); }) {% endblock %} diff --git a/apps/i18n/zh/LC_MESSAGES/django.mo b/apps/i18n/zh/LC_MESSAGES/django.mo index 36220e3219e13e2f33a24be9281b1ef120ef808e..6b02da8fad05df4e52dd43f5833a98e2ab222cc0 100644 GIT binary patch delta 11602 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