Mirrored_Repos/InvenTree
1
0
Fork 0
mirror of https://github.com/inventree/InvenTree synced 2024-08-30 18:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Small changes to password changing (#3213)

Browse Source 
* fix formatting

* also check for the old password

* validate that password matches the rules
This commit is contained in:
Matthias Mair 2022-06-17 02:36:36 +02:00 committed by GitHub
parent 136924cd3f
commit 50a4bda184
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 46 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
InvenTree/InvenTree/forms.py
View File

@ -124,21 +124,31 @@ class EditUserForm(HelperForm):
class SetPasswordForm(HelperForm): class SetPasswordForm(HelperForm):
"""Form for setting user password.""" """Form for setting user password."""
enter_password = forms.CharField(max_length=100, enter_password = forms.CharField(
min_length=8, max_length=100,
required=True, min_length=8,
initial='', required=True,
widget=forms.PasswordInput(attrs={'autocomplete': 'off'}), initial='',
label=_('Enter password'), widget=forms.PasswordInput(attrs={'autocomplete': 'off'}),
help_text=_('Enter new password')) label=_('Enter password'),
help_text=_('Enter new password')
)
confirm_password = forms.CharField(max_length=100, confirm_password = forms.CharField(
min_length=8, max_length=100,
required=True, min_length=8,
initial='', required=True,
widget=forms.PasswordInput(attrs={'autocomplete': 'off'}), initial='',
label=_('Confirm password'), widget=forms.PasswordInput(attrs={'autocomplete': 'off'}),
help_text=_('Confirm new password')) label=_('Confirm password'),
help_text=_('Confirm new password')
)
old_password = forms.CharField(
label=_("Old password"),
strip=False,
widget=forms.PasswordInput(attrs={'autocomplete': 'current-password', 'autofocus': True}),
)
class Meta: class Meta:
"""Metaclass options.""" """Metaclass options."""
@ -146,7 +156,8 @@ class SetPasswordForm(HelperForm):
model = User model = User
fields = [ fields = [
'enter_password', 'enter_password',
'confirm_password' 'confirm_password',
'old_password',
] ]

28
InvenTree/InvenTree/views.py
View File

@ -8,8 +8,10 @@ import json
import os import os
from django.conf import settings from django.conf import settings
from django.contrib.auth import password_validation
from django.contrib.auth.mixins import (LoginRequiredMixin, from django.contrib.auth.mixins import (LoginRequiredMixin,
PermissionRequiredMixin) PermissionRequiredMixin)
from django.core.exceptions import ValidationError
from django.http import HttpResponse, HttpResponseRedirect, JsonResponse from django.http import HttpResponse, HttpResponseRedirect, JsonResponse
from django.shortcuts import redirect from django.shortcuts import redirect
from django.template.loader import render_to_string from django.template.loader import render_to_string
@ -540,6 +542,8 @@ class SetPasswordView(AjaxUpdateView):
p1 = request.POST.get('enter_password', '') p1 = request.POST.get('enter_password', '')
p2 = request.POST.get('confirm_password', '') p2 = request.POST.get('confirm_password', '')
old_password = request.POST.get('old_password', '')
user = self.request.user
if valid: if valid:
# Passwords must match # Passwords must match
@ -548,20 +552,28 @@ class SetPasswordView(AjaxUpdateView):
error = _('Password fields must match') error = _('Password fields must match')
form.add_error('enter_password', error) form.add_error('enter_password', error)
form.add_error('confirm_password', error) form.add_error('confirm_password', error)
valid = False valid = False
data = { if valid:
'form_valid': valid # Old password must be correct
}
if not user.check_password(old_password):
form.add_error('old_password', _('Wrong password provided'))
valid = False
if valid: if valid:
user = self.request.user try:
# Validate password
password_validation.validate_password(p1, user)
user.set_password(p1) # Update the user
user.save() user.set_password(p1)
user.save()
except ValidationError as error:
form.add_error('confirm_password', str(error))
valid = False
return self.renderJsonResponse(request, form, data=data) return self.renderJsonResponse(request, form, data={'form_valid': valid})
class IndexView(TemplateView): class IndexView(TemplateView):