diff --git a/apps/templates/_user_profile.html b/apps/templates/_user_profile.html index 4b493fd95..0e6e2c8f1 100644 --- a/apps/templates/_user_profile.html +++ b/apps/templates/_user_profile.html @@ -3,7 +3,7 @@
  • - image + image diff --git a/apps/users/forms.py b/apps/users/forms.py index b923e740b..e4727c479 100644 --- a/apps/users/forms.py +++ b/apps/users/forms.py @@ -41,8 +41,8 @@ class UserProfileForm(forms.ModelForm): class Meta: model = User fields = [ - 'username', 'name', 'email', 'groups', 'wechat', - 'phone', + 'username', 'name', 'email', + 'wechat', 'phone', ] help_texts = { 'username': '* required', @@ -51,6 +51,66 @@ class UserProfileForm(forms.ModelForm): } +class UserPasswordForm(forms.Form): + old_password = forms.CharField( + min_length=5, max_length=128, widget=forms.PasswordInput) + new_password = forms.CharField( + min_length=5, max_length=128, widget=forms.PasswordInput) + confirm_password = forms.CharField( + min_length=5, max_length=128, widget=forms.PasswordInput) + + def __init__(self, *args, **kwargs): + self.instance = kwargs.pop('instance') + super(UserPasswordForm, self).__init__(*args, **kwargs) + + def clean_old_password(self): + old_password = self.cleaned_data['old_password'] + if not self.instance.check_password(old_password): + raise forms.ValidationError(_('Old password error')) + return old_password + + def clean_confirm_password(self): + new_password = self.cleaned_data['new_password'] + confirm_password = self.cleaned_data['confirm_password'] + + if new_password != confirm_password: + raise forms.ValidationError(_('Password does not match')) + return confirm_password + + def save(self): + password = self.cleaned_data['new_password'] + self.instance.set_password(password) + self.instance.save() + return self.instance + + +class UserPublicKeyForm(forms.Form): + public_key = forms.CharField( + label=_('ssh public key'), max_length=5000, + widget=forms.Textarea(attrs={'placeholder': _('ssh-rsa AAAA...')}), + help_text=_('Paste your id_rsa.pub here.')) + + def __init__(self, *args, **kwargs): + self.instance = kwargs.pop('instance') + super(UserPublicKeyForm, self).__init__(*args, **kwargs) + + def clean_public_key(self): + public_key = self.cleaned_data['public_key'] + if self.instance.public_key and public_key == self.instance.public_key: + raise forms.ValidationError(_('Public key should not be the ' + 'same as your old one.')) + + if 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() + return self.instance + + class UserBulkImportForm(forms.ModelForm): class Meta: model = User @@ -76,25 +136,10 @@ class UserInfoForm(forms.Form): enable_otp = forms.BooleanField(required=False, label=_('enable otp')) -class UserKeyForm(forms.Form): - public_key = forms.CharField( - label=_('ssh public key'), max_length=5000, - widget=forms.Textarea(attrs={'placeholder': _('ssh-rsa AAAA...')}), - help_text=_('Paste your id_rsa.pub here.')) - def clean_public_key(self): - public_key = self.cleaned_data['public_key'] - if self.user.public_key and public_key == self.user.public_key: - raise forms.ValidationError(_('Public key should not be the ' - 'same as your old one.')) - - if not validate_ssh_public_key(public_key): - raise forms.ValidationError(_('Not a valid ssh public key')) - return public_key class UserPrivateAssetPermissionForm(forms.ModelForm): - def save(self, commit=True): self.instance = super(UserPrivateAssetPermissionForm, self)\ .save(commit=commit) @@ -121,7 +166,6 @@ class UserPrivateAssetPermissionForm(forms.ModelForm): class UserGroupPrivateAssetPermissionForm(forms.ModelForm): - def save(self, commit=True): self.instance = super(UserGroupPrivateAssetPermissionForm, self)\ .save(commit=commit) diff --git a/apps/users/models/user.py b/apps/users/models/user.py index d49adcf17..2b65785f7 100644 --- a/apps/users/models/user.py +++ b/apps/users/models/user.py @@ -101,14 +101,17 @@ class User(AbstractUser): self._public_key = signer.sign(public_key_raw) @property - def public_key_hash(self): + def public_key_obj(self): + class PubKey(object): + def __getattr__(self, item): + return '' if self.public_key: import sshpubkeys try: - return sshpubkeys.SSHKey(self.public_key).hash_md5() + return sshpubkeys.SSHKey(self.public_key) except TabError: pass - return 'None' + return PubKey() @property def is_superuser(self): diff --git a/apps/users/templates/users/user_password_update.html b/apps/users/templates/users/user_password_update.html new file mode 100644 index 000000000..e0bbb088d --- /dev/null +++ b/apps/users/templates/users/user_password_update.html @@ -0,0 +1,75 @@ +{% extends 'base.html' %} +{% load static %} +{% load i18n %} +{% load bootstrap %} + +{% block custom_head_css_js %} + + + + + +{% endblock %} +{% block content %} +
    +
    +
    +
    +
    + +
    +
    +
    +
    + {% csrf_token %} + {{ form.old_password|bootstrap_horizontal}} + {{ form.new_password|bootstrap_horizontal }} + {{ form.confirm_password|bootstrap_horizontal }} + +
    +
    +
    + + +
    +
    +
    +
    +
    +
    +
    +
    +
    +{% endblock %} + +{% block custom_foot_js %} + + +{% endblock %} diff --git a/apps/users/templates/users/user_profile.html b/apps/users/templates/users/user_profile.html index 5b098d002..64d1b0f35 100644 --- a/apps/users/templates/users/user_profile.html +++ b/apps/users/templates/users/user_profile.html @@ -68,8 +68,21 @@ {{ user.enable_otp|yesno:"Yes,No,Unkown" }} - {% trans 'Public key fingerprint' %} - {{ user.public_key_hash }} + {% trans 'Public key' %} + + + + + + + + +
    + {{ user.public_key_obj.comment }} +
    + {{ user.public_key_obj.hash_md5 }} +
    + {% trans 'Date joined' %} @@ -123,7 +136,7 @@ {% trans 'Reset password' %}: - + {% trans 'Reset' %} @@ -131,27 +144,10 @@ {% trans 'Reset public key' %}: - + {% trans 'Reset' %} - - {% trans 'Test admin user' %}: - - - - - - - - {% trans 'Test system pingpong' %}: - - - - - - -
    diff --git a/apps/users/templates/users/user_profile_update.html b/apps/users/templates/users/user_profile_update.html index 1d926d7c6..be0170b0c 100644 --- a/apps/users/templates/users/user_profile_update.html +++ b/apps/users/templates/users/user_profile_update.html @@ -20,6 +20,10 @@ height: 64px; margin: -75px 0 0 -100px; } + + img { + max-width: 100%; /* This rule is very important, please do not ignore this! */ + } {% endblock %} {% block content %} @@ -30,13 +34,13 @@
    @@ -45,7 +49,6 @@
    {% csrf_token %}

    {% trans 'Account' %}

    -{# {{ form.avatar|bootstrap_horizontal }}#} {{ form.username|bootstrap_horizontal }} {{ form.name|bootstrap_horizontal }} {{ form.email|bootstrap_horizontal }} diff --git a/apps/users/templates/users/user_pubkey_update.html b/apps/users/templates/users/user_pubkey_update.html new file mode 100644 index 000000000..5964a256e --- /dev/null +++ b/apps/users/templates/users/user_pubkey_update.html @@ -0,0 +1,86 @@ +{% extends 'base.html' %} +{% load static %} +{% load i18n %} +{% load bootstrap %} + +{% block custom_head_css_js %} + + + + + +{% endblock %} +{% block content %} +
    +
    +
    +
    +
    + +
    +
    +
    + + {% csrf_token %} +

    {% trans 'Old public key' %}

    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +

    {% trans 'Update public key' %}

    + {{ form.public_key|bootstrap_horizontal}} +
    +
    +
    + + +
    +
    + +
    +
    +
    +
    +
    +
    +{% endblock %} + +{% block custom_foot_js %} + + +{% endblock %} diff --git a/apps/users/urls/views_urls.py b/apps/users/urls/views_urls.py index a51b5738e..a60f3a764 100644 --- a/apps/users/urls/views_urls.py +++ b/apps/users/urls/views_urls.py @@ -28,6 +28,12 @@ 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'), # User view url(r'^user$', views.UserListView.as_view(), name='user-list'), diff --git a/apps/users/views/login.py b/apps/users/views/login.py index 364a13946..67bdd8e3a 100644 --- a/apps/users/views/login.py +++ b/apps/users/views/login.py @@ -154,7 +154,7 @@ class UserResetPasswordView(TemplateView): class UserFirstLoginView(LoginRequiredMixin, SessionWizardView): template_name = 'users/first_login.html' - form_list = [forms.UserInfoForm, forms.UserKeyForm] + form_list = [forms.UserInfoForm, forms.UserPublicKeyForm] file_storage = default_storage def dispatch(self, request, *args, **kwargs): diff --git a/apps/users/views/user.py b/apps/users/views/user.py index 03e00ab1b..ffed636e7 100644 --- a/apps/users/views/user.py +++ b/apps/users/views/user.py @@ -25,6 +25,7 @@ from django.views.generic.edit import (CreateView, UpdateView, FormMixin, FormView) from django.views.generic.detail import DetailView, SingleObjectMixin from django.views.decorators.csrf import csrf_exempt +from django.contrib.auth import logout as auth_logout from .. import forms from ..models import User, UserGroup @@ -37,7 +38,8 @@ __all__ = ['UserListView', 'UserCreateView', 'UserDetailView', 'UserUpdateView', 'UserAssetPermissionCreateView', 'UserAssetPermissionView', 'UserGrantedAssetView', 'UserExportView', 'UserBulkImportView', 'UserProfileView', - 'UserProfileUpdateView', + 'UserProfileUpdateView', 'UserPasswordUpdateView', + 'UserPublicKeyUpdateView', ] logger = get_logger(__name__) @@ -341,12 +343,49 @@ class UserProfileUpdateView(LoginRequiredMixin, UpdateView): ) def get_context_data(self, **kwargs): - from perms.utils import get_user_granted_assets - assets = get_user_granted_assets(self.request.user) context = { 'app': 'User', - 'action': 'User Profile', - 'assets': assets, + 'action': 'Profile update', } kwargs.update(context) - return super(UserProfileUpdateView, self).get_context_data(**kwargs) \ No newline at end of file + return super(UserProfileUpdateView, self).get_context_data(**kwargs) + + +class UserPasswordUpdateView(LoginRequiredMixin, UpdateView): + template_name = 'users/user_password_update.html' + model = User + form_class = forms.UserPasswordForm + success_url = reverse_lazy('users:user-profile') + + def get_object(self, queryset=None): + return self.request.user + + def get_context_data(self, **kwargs): + context = { + 'app': 'User', + 'action': 'Password update', + } + kwargs.update(context) + return super(UserPasswordUpdateView, self).get_context_data(**kwargs) + + def get_success_url(self): + auth_logout(self.request) + return super(UserPasswordUpdateView, self).get_success_url() + + +class UserPublicKeyUpdateView(LoginRequiredMixin, UpdateView): + template_name = 'users/user_pubkey_update.html' + model = User + form_class = forms.UserPublicKeyForm + success_url = reverse_lazy('users:user-profile') + + def get_object(self, queryset=None): + return self.request.user + + def get_context_data(self, **kwargs): + context = { + 'app': 'User', + 'action': 'Public key update', + } + kwargs.update(context) + return super(UserPublicKeyUpdateView, self).get_context_data(**kwargs)