From 759760e7d9075bc1d5bb0a7d726c76a9b07e491c Mon Sep 17 00:00:00 2001 From: ibuler Date: Wed, 21 Mar 2018 15:22:10 +0800 Subject: [PATCH] =?UTF-8?q?[Update]=20=E6=9C=8D=E5=8A=A1=E5=99=A8=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E7=94=9F=E6=88=90=E7=94=A8=E6=88=B7=E5=AF=86=E9=92=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/i18n/zh/LC_MESSAGES/django.mo | Bin 29683 -> 29778 bytes apps/i18n/zh/LC_MESSAGES/django.po | 200 ++++++++++-------- apps/users/forms.py | 34 ++- apps/users/models/user.py | 2 +- apps/users/templates/users/first_login.html | 8 +- apps/users/templates/users/user_profile.html | 25 ++- .../templates/users/user_pubkey_update.html | 6 + apps/users/templates/users/user_update.html | 1 + apps/users/urls/views_urls.py | 1 + apps/users/views/user.py | 15 +- 10 files changed, 188 insertions(+), 104 deletions(-) diff --git a/apps/i18n/zh/LC_MESSAGES/django.mo b/apps/i18n/zh/LC_MESSAGES/django.mo index 161c337a8ecd1c8cec04b2a990b68511f9a31af9..61378222c5d09ce31638c9e2c087ea860f64fdf3 100644 GIT binary patch delta 10721 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\n" "Language-Team: Jumpserver team\n" @@ -29,9 +29,8 @@ msgstr "" msgid "测试节点下资产是否可连接: {}" msgstr "" -#: assets/forms/asset.py:23 assets/forms/asset.py:54 assets/forms/user.py:125 -#: assets/models/asset.py:53 assets/models/user.py:218 -#: assets/templates/assets/asset_detail.html:183 +#: assets/forms/asset.py:23 assets/forms/asset.py:54 assets/models/asset.py:53 +#: assets/models/user.py:218 assets/templates/assets/asset_detail.html:183 #: assets/templates/assets/asset_detail.html:191 #: assets/templates/assets/system_user_detail.html:166 msgid "Nodes" @@ -64,7 +63,7 @@ msgid "* required Must set exact system platform, Windows, Linux ..." msgstr "* required 必须准确设置操作系统平台，如Windows, Linux ..." #: assets/forms/asset.py:80 assets/forms/asset.py:84 assets/forms/label.py:15 -#: perms/templates/perms/asset_permission_asset.html:88 users/forms.py:244 +#: perms/templates/perms/asset_permission_asset.html:88 users/forms.py:270 msgid "Select assets" msgstr "选择资产" @@ -162,15 +161,11 @@ msgstr "名称" msgid "Username" msgstr "用户名" -#: assets/forms/user.py:132 -msgid "If auto push checked, system user will be create at node assets" -msgstr "如果选择了自动推送，系统用户将会创建在节点资产上" - -#: assets/forms/user.py:133 +#: assets/forms/user.py:126 msgid "Auto push system user to asset" msgstr "自动推送系统用户到资产" -#: assets/forms/user.py:134 +#: assets/forms/user.py:127 msgid "" "High level will be using login asset as default, if user was granted more " "than 2 system user" @@ -370,10 +365,10 @@ 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:192 +#: terminal/templates/terminal/session_list.html:71 users/forms.py:218 #: users/models/user.py:30 users/models/user.py:254 #: users/templates/users/user_group_detail.html:78 -#: users/templates/users/user_group_list.html:13 users/views/user.py:333 +#: users/templates/users/user_group_list.html:13 users/views/user.py:334 msgid "User" msgstr "用户" @@ -627,7 +622,7 @@ msgstr "激活所选" #: users/templates/users/user_list.html:44 #: users/templates/users/user_password_update.html:59 #: users/templates/users/user_profile_update.html:64 -#: users/templates/users/user_pubkey_update.html:71 +#: users/templates/users/user_pubkey_update.html:77 msgid "Submit" msgstr "提交" @@ -647,6 +642,8 @@ msgstr "提交" #: users/templates/users/user_group_detail.html:28 #: users/templates/users/user_group_list.html:43 #: users/templates/users/user_list.html:76 +#: users/templates/users/user_profile.html:135 +#: users/templates/users/user_profile.html:143 msgid "Update" msgstr "更新" @@ -713,10 +710,10 @@ msgstr "其它" #: users/templates/users/_user.html:43 #: users/templates/users/user_bulk_update.html:23 #: users/templates/users/user_password_update.html:58 -#: users/templates/users/user_profile.html:135 -#: users/templates/users/user_profile.html:143 +#: users/templates/users/user_profile.html:151 #: users/templates/users/user_profile_update.html:63 #: users/templates/users/user_pubkey_update.html:70 +#: users/templates/users/user_pubkey_update.html:76 msgid "Reset" msgstr "重置" @@ -782,7 +779,7 @@ msgstr "替换资产的管理员" #: 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_profile.html:177 +#: users/templates/users/user_profile.html:185 msgid "Confirm" msgstr "确认" @@ -1175,6 +1172,7 @@ msgid "User search filter" msgstr "用户过滤器" #: common/forms.py:121 +#, python-format msgid "Choice may be (cn|uid|sAMAccountName)=%(user)s)" msgstr "可能的选项是(cn或uid或sAMAccountName=%(user)s)" @@ -1613,7 +1611,7 @@ msgstr "添加" msgid "Add asset group to this permission" msgstr "添加资产组" -#: perms/templates/perms/asset_permission_asset.html:116 users/forms.py:247 +#: perms/templates/perms/asset_permission_asset.html:116 users/forms.py:273 msgid "Select asset groups" msgstr "选择资产组" @@ -1642,7 +1640,7 @@ msgstr "资产组数量" msgid "System user count" msgstr "系统用户数量" -#: perms/templates/perms/asset_permission_detail.html:144 users/forms.py:250 +#: perms/templates/perms/asset_permission_detail.html:144 users/forms.py:276 msgid "Select system users" msgstr "选择系统用户" @@ -1695,13 +1693,13 @@ msgstr "商业支持" msgid "Docs" msgstr "文档" -#: templates/_header_bar.html:37 templates/_nav_user.html:9 +#: templates/_header_bar.html:37 templates/_nav_user.html:9 users/forms.py:92 #: users/templates/users/_user.html:36 #: users/templates/users/user_password_update.html:37 #: users/templates/users/user_profile.html:17 #: users/templates/users/user_profile_update.html:37 #: users/templates/users/user_profile_update.html:57 -#: users/templates/users/user_pubkey_update.html:37 users/views/user.py:316 +#: users/templates/users/user_pubkey_update.html:37 users/views/user.py:317 msgid "Profile" msgstr "个人信息" @@ -1758,13 +1756,13 @@ 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:209 users/views/login.py:258 users/views/user.py:59 -#: users/views/user.py:74 users/views/user.py:93 users/views/user.py:149 -#: users/views/user.py:304 users/views/user.py:351 users/views/user.py:373 +#: users/views/login.py:209 users/views/login.py:258 users/views/user.py:60 +#: users/views/user.py:75 users/views/user.py:94 users/views/user.py:150 +#: users/views/user.py:305 users/views/user.py:352 users/views/user.py:374 msgid "Users" msgstr "用户管理" -#: templates/_nav.html:13 users/views/user.py:60 +#: templates/_nav.html:13 users/views/user.py:61 msgid "User list" msgstr "用户列表" @@ -2087,51 +2085,63 @@ msgstr "" msgid "Role" msgstr "角色" -#: users/forms.py:45 users/templates/users/user_detail.html:187 -msgid "Join user groups" -msgstr "添加到用户组" - -#: users/forms.py:76 -msgid "Old password" -msgstr "原来密码" - -#: users/forms.py:81 -msgid "New password" -msgstr "新密码" - -#: users/forms.py:86 -msgid "Confirm password" -msgstr "确认密码" - -#: users/forms.py:96 -msgid "Old password error" -msgstr "原来密码错误" - -#: users/forms.py:104 -msgid "Password does not match" -msgstr "密码不一致" - -#: users/forms.py:116 +#: users/forms.py:30 users/forms.py:138 msgid "ssh public key" msgstr "ssh公钥" -#: users/forms.py:117 +#: users/forms.py:31 users/forms.py:139 msgid "ssh-rsa AAAA..." msgstr "" -#: users/forms.py:118 -msgid "Paste your id_rsa.pub here." -msgstr "复制你的公钥到这里" +#: users/forms.py:32 +msgid "Paste user id_rsa.pub here." +msgstr "复制用户公钥到这里" -#: users/forms.py:131 +#: users/forms.py:50 users/templates/users/user_detail.html:187 +msgid "Join user groups" +msgstr "添加到用户组" + +#: users/forms.py:58 users/forms.py:153 msgid "Public key should not be the same as your old one." msgstr "不能和原来的密钥相同" -#: users/forms.py:135 users/serializers.py:42 +#: users/forms.py:62 users/forms.py:157 users/serializers.py:42 msgid "Not a valid ssh public key" msgstr "ssh密钥不合法" -#: users/forms.py:149 users/forms.py:154 users/forms.py:166 users/forms.py:196 +#: users/forms.py:98 +msgid "Old password" +msgstr "原来密码" + +#: users/forms.py:103 +msgid "New password" +msgstr "新密码" + +#: users/forms.py:108 +msgid "Confirm password" +msgstr "确认密码" + +#: users/forms.py:118 +msgid "Old password error" +msgstr "原来密码错误" + +#: users/forms.py:126 +msgid "Password does not match" +msgstr "密码不一致" + +#: users/forms.py:140 +msgid "Paste your id_rsa.pub here." +msgstr "复制你的公钥到这里" + +#: users/forms.py:168 users/models/user.py:46 +#: users/templates/users/user_password_update.html:43 +#: users/templates/users/user_profile.html:71 +#: users/templates/users/user_profile_update.html:43 +#: users/templates/users/user_pubkey_update.html:43 +msgid "Public key" +msgstr "ssh公钥" + +#: users/forms.py:175 users/forms.py:180 users/forms.py:192 users/forms.py:222 msgid "Select users" msgstr "选择用户" @@ -2184,13 +2194,6 @@ msgstr "微信" msgid "Enable OTP" msgstr "二次验证" -#: users/models/user.py:46 users/templates/users/user_password_update.html:43 -#: users/templates/users/user_profile.html:71 -#: users/templates/users/user_profile_update.html:43 -#: users/templates/users/user_pubkey_update.html:43 -msgid "Public key" -msgstr "ssh公钥" - #: users/models/user.py:265 msgid "Administrator is the super user of system" msgstr "Administrator是初始的超级管理员" @@ -2241,13 +2244,13 @@ msgstr "首次登陆" msgid "Step" msgstr "Step" -#: users/templates/users/first_login.html:59 -msgid "First step" -msgstr "第一步" +#: users/templates/users/first_login.html:57 +msgid "Previous" +msgstr "" #: users/templates/users/first_login.html:60 -msgid "Prev step" -msgstr "上一步" +msgid "Next" +msgstr "" #: users/templates/users/first_login_done.html:30 msgid "Welcome to use jumpserver, visit " @@ -2283,8 +2286,7 @@ msgid "City" msgstr "城市" #: users/templates/users/reset_password.html:45 -#: users/templates/users/user_detail.html:325 -#: users/templates/users/user_profile.html:132 users/utils.py:71 +#: users/templates/users/user_detail.html:325 users/utils.py:71 msgid "Reset password" msgstr "重置密码" @@ -2298,7 +2300,7 @@ msgid "Setting" msgstr "设置" #: users/templates/users/user_create.html:4 -#: users/templates/users/user_list.html:16 users/views/user.py:74 +#: users/templates/users/user_list.html:16 users/views/user.py:75 msgid "Create user" msgstr "创建用户" @@ -2307,7 +2309,7 @@ msgid "Reset link will be generated and sent to the user. " msgstr "生成重置密码连接，通过邮件发送给用户" #: users/templates/users/user_detail.html:19 -#: users/templates/users/user_granted_asset.html:18 users/views/user.py:150 +#: users/templates/users/user_granted_asset.html:18 users/views/user.py:151 msgid "User detail" msgstr "用户详情" @@ -2351,7 +2353,6 @@ msgid "" msgstr "重设密钥邮件将会发送到用户邮箱" #: users/templates/users/user_detail.html:350 -#: users/templates/users/user_profile.html:140 msgid "Reset SSH public key" msgstr "重置SSH密钥" @@ -2360,14 +2361,14 @@ msgid "This will reset the user public key and send a reset mail" msgstr "将会失效用户当前密钥，并发送重置邮件到用户邮箱" #: users/templates/users/user_detail.html:377 -#: users/templates/users/user_profile.html:166 +#: users/templates/users/user_profile.html:174 msgid "Successfully updated the SSH public key." msgstr "更新ssh密钥成功" #: users/templates/users/user_detail.html:378 #: users/templates/users/user_detail.html:382 -#: users/templates/users/user_profile.html:167 -#: users/templates/users/user_profile.html:172 +#: users/templates/users/user_profile.html:175 +#: users/templates/users/user_profile.html:180 msgid "User SSH public key update" msgstr "ssh密钥" @@ -2427,12 +2428,24 @@ msgstr "用户删除失败" msgid "OTP" msgstr "" -#: users/templates/users/user_profile.html:100 users/views/user.py:179 -#: users/views/user.py:233 +#: users/templates/users/user_profile.html:100 users/views/user.py:180 +#: users/views/user.py:234 msgid "User groups" msgstr "用户组" -#: users/templates/users/user_profile.html:170 +#: users/templates/users/user_profile.html:132 +msgid "Update password" +msgstr "更改密码" + +#: users/templates/users/user_profile.html:140 +msgid "Update SSH public key" +msgstr "更改SSH密钥" + +#: users/templates/users/user_profile.html:148 +msgid "Reset public key and download" +msgstr "重置并下载SSH密钥" + +#: users/templates/users/user_profile.html:178 msgid "Failed to update SSH public key." msgstr "更新密钥失败" @@ -2448,7 +2461,11 @@ msgstr "指纹" msgid "Update public key" msgstr "更新密钥" -#: users/templates/users/user_update.html:4 users/views/user.py:93 +#: users/templates/users/user_pubkey_update.html:68 +msgid "Or reset by server" +msgstr "或者重置并下载密钥" + +#: users/templates/users/user_update.html:4 users/views/user.py:94 msgid "Update user" msgstr "更新用户" @@ -2643,30 +2660,39 @@ msgstr "首次登陆" msgid "Login log list" msgstr "登录日志" -#: users/views/user.py:103 +#: users/views/user.py:104 msgid "Bulk update user success" msgstr "批量更新用户成功" -#: users/views/user.py:208 +#: users/views/user.py:209 msgid "Invalid file." msgstr "文件不合法" -#: users/views/user.py:305 +#: users/views/user.py:306 msgid "User granted assets" msgstr "用户授权资产" -#: users/views/user.py:334 +#: users/views/user.py:335 msgid "Profile setting" msgstr "个人信息设置" -#: users/views/user.py:352 +#: users/views/user.py:353 msgid "Password update" msgstr "密码更新" -#: users/views/user.py:374 +#: users/views/user.py:375 msgid "Public key update" msgstr "密钥更新" +#~ msgid "If auto push checked, system user will be create at node assets" +#~ msgstr "如果选择了自动推送，系统用户将会创建在节点资产上" + +#~ msgid "First step" +#~ msgstr "第一步" + +#~ msgid "Prev step" +#~ msgstr "上一步" + #~ msgid "Test node assets connective: {}" #~ msgstr "测试节点资产可连接性" diff --git a/apps/users/forms.py b/apps/users/forms.py index 58b78de71..8d223b627 100644 --- a/apps/users/forms.py +++ b/apps/users/forms.py @@ -26,6 +26,11 @@ class UserCreateUpdateForm(forms.ModelForm): max_length=128, strip=False, required=False, ) role = forms.ChoiceField(choices=role_choices, required=True, initial=User.ROLE_USER, label=_("Role")) + public_key = forms.CharField( + label=_('ssh public key'), max_length=5000, + widget=forms.Textarea(attrs={'placeholder': _('ssh-rsa AAAA...')}), + help_text=_('Paste user id_rsa.pub here.') + ) class Meta: model = User @@ -47,12 +52,26 @@ class UserCreateUpdateForm(forms.ModelForm): ), } + def clean_public_key(self): + public_key = self.cleaned_data['public_key'] + if self.instance.public_key and public_key == self.instance.public_key: + msg = _('Public key should not be the same as your old one.') + raise forms.ValidationError(msg) + + if not validate_ssh_public_key(public_key): + raise forms.ValidationError(_('Not a valid ssh public key')) + return public_key + def save(self, commit=True): password = self.cleaned_data.get('password') + public_key = self.cleaned_data.get('public_key') user = super().save(commit=commit) if password: user.set_password(password) user.save() + if public_key: + user.public_key = public_key + user.save() return user @@ -70,6 +89,9 @@ class UserProfileForm(forms.ModelForm): } +UserProfileForm.verbose_name = _("Profile") + + class UserPasswordForm(forms.Form): old_password = forms.CharField( max_length=128, widget=forms.PasswordInput, @@ -113,7 +135,7 @@ class UserPasswordForm(forms.Form): class UserPublicKeyForm(forms.Form): public_key = forms.CharField( - label=_('ssh public key'), max_length=5000, + label=_('ssh public key'), max_length=5000, required=False, widget=forms.Textarea(attrs={'placeholder': _('ssh-rsa AAAA...')}), help_text=_('Paste your id_rsa.pub here.') ) @@ -131,17 +153,21 @@ class UserPublicKeyForm(forms.Form): msg = _('Public key should not be the same as your old one.') raise forms.ValidationError(msg) - if not validate_ssh_public_key(public_key): + if public_key and not validate_ssh_public_key(public_key): raise forms.ValidationError(_('Not a valid ssh public key')) return public_key def save(self): public_key = self.cleaned_data['public_key'] - self.instance.public_key = public_key - self.instance.save() + if public_key: + self.instance.public_key = public_key + self.instance.save() return self.instance +UserPublicKeyForm.verbose_name = _("Public key") + + class UserBulkUpdateForm(forms.ModelForm): users = forms.ModelMultipleChoiceField( required=True, diff --git a/apps/users/models/user.py b/apps/users/models/user.py index 4c051db22..0e2e06f39 100644 --- a/apps/users/models/user.py +++ b/apps/users/models/user.py @@ -115,7 +115,7 @@ class User(AbstractUser): import sshpubkeys try: return sshpubkeys.SSHKey(self.public_key) - except TabError: + except (TabError, TypeError): pass return PubKey() diff --git a/apps/users/templates/users/first_login.html b/apps/users/templates/users/first_login.html index 99aff6ccf..b670caf60 100644 --- a/apps/users/templates/users/first_login.html +++ b/apps/users/templates/users/first_login.html @@ -45,10 +45,8 @@ {{ wizard.form.management_form }} {% for form in wizard.form.forms %} {% bootstrap_form form %} -{# {{ form|bootstrap }}#} {% endfor %} {% else %} -{# {{ wizard.form|bootstrap }}#} {% bootstrap_form wizard.form %} {% endif %} @@ -56,8 +54,10 @@
diff --git a/apps/users/templates/users/user_profile.html b/apps/users/templates/users/user_profile.html index e7e8640f9..88d963595 100644 --- a/apps/users/templates/users/user_profile.html +++ b/apps/users/templates/users/user_profile.html @@ -22,7 +22,7 @@
-
+
{{ user.name }} @@ -120,7 +120,7 @@
-
+
{% trans 'Quick modify' %} @@ -129,18 +129,26 @@ - + - + + + + + @@ -180,8 +188,11 @@ $(document).on('click', '#btn_update_pk', function() { $('#txt_pk').focus(); } ); - } + }; APIUpdateAttr({ url: the_url, body: JSON.stringify(body), success: success, error: fail}); +}).on('click', '.btn-reset-pubkey', function () { + var the_url = '{% url "users:user-pubkey-generate" %}'; + window.open(the_url, "_blank") }) {% endblock %} diff --git a/apps/users/templates/users/user_pubkey_update.html b/apps/users/templates/users/user_pubkey_update.html index ee621eb8d..82c4a3590 100644 --- a/apps/users/templates/users/user_pubkey_update.html +++ b/apps/users/templates/users/user_pubkey_update.html @@ -64,6 +64,12 @@

{% trans 'Update public key' %}

{% bootstrap_field form.public_key layout="horizontal" %} +
+ +
+ {% trans 'Reset' %} +
+
diff --git a/apps/users/templates/users/user_update.html b/apps/users/templates/users/user_update.html index a83d89859..88ec01c5c 100644 --- a/apps/users/templates/users/user_update.html +++ b/apps/users/templates/users/user_update.html @@ -5,4 +5,5 @@ {% block password %}

{% trans 'Auth' %}

{% bootstrap_field form.password layout="horizontal" %} + {% bootstrap_field form.public_key layout="horizontal" %} {% endblock %} diff --git a/apps/users/urls/views_urls.py b/apps/users/urls/views_urls.py index 5d23976ae..b9d6788ee 100644 --- a/apps/users/urls/views_urls.py +++ b/apps/users/urls/views_urls.py @@ -20,6 +20,7 @@ urlpatterns = [ url(r'^profile/update/$', views.UserProfileUpdateView.as_view(), name='user-profile-update'), url(r'^profile/password/update/$', views.UserPasswordUpdateView.as_view(), name='user-password-update'), url(r'^profile/pubkey/update/$', views.UserPublicKeyUpdateView.as_view(), name='user-pubkey-update'), + url(r'^profile/pubkey/generate/$', views.UserPublicKeyGenerateView.as_view(), name='user-pubkey-generate'), # User view url(r'^user$', views.UserListView.as_view(), name='user-list'), diff --git a/apps/users/views/user.py b/apps/users/views/user.py index bf2ecca57..84c670370 100644 --- a/apps/users/views/user.py +++ b/apps/users/views/user.py @@ -31,7 +31,7 @@ from django.contrib.auth import logout as auth_logout from common.const import create_success_msg, update_success_msg from common.mixins import JSONResponseMixin -from common.utils import get_logger, get_object_or_none, is_uuid +from common.utils import get_logger, get_object_or_none, is_uuid, ssh_key_gen from .. import forms from ..models import User, UserGroup from ..utils import AdminUserRequiredMixin @@ -45,6 +45,7 @@ __all__ = [ 'UserExportView', 'UserBulkImportView', 'UserProfileView', 'UserProfileUpdateView', 'UserPasswordUpdateView', 'UserPublicKeyUpdateView', 'UserBulkUpdateView', + 'UserPublicKeyGenerateView', ] logger = get_logger(__name__) @@ -375,3 +376,15 @@ class UserPublicKeyUpdateView(LoginRequiredMixin, UpdateView): } kwargs.update(context) return super().get_context_data(**kwargs) + + +class UserPublicKeyGenerateView(LoginRequiredMixin, View): + def get(self, request, *args, **kwargs): + private, public = ssh_key_gen(username=request.user.username, hostname='jumpserver') + request.user.public_key = public + request.user.save() + response = HttpResponse(private, content_type='text/plain') + filename = "{0}-jumpserver.pem".format(request.user.username) + response['Content-Disposition'] = 'attachment; filename={}'.format(filename) + return response +
{% trans 'Reset password' %}:{% trans 'Update password' %}: - {% trans 'Reset' %} + {% trans 'Update' %}
{% trans 'Reset SSH public key' %}:{% trans 'Update SSH public key' %}: - {% trans 'Reset' %} + {% trans 'Update' %} + +
{% trans 'Reset public key and download' %}: + + {% trans 'Reset' %}