feat: 新增超级管理员重置用户密码功能
- 用户列表页 /users/:支持按用户名/姓名/邮箱搜索、按状态筛选、分页 - 重置密码页 /users/<id>/password/:仅超级管理员可访问 - 复用 Django 密码校验器(一致性、长度、相似度、常见/纯数字密码) - 管理员重置自身密码时保持登录会话不失效 - settings 补充 AUTH_PASSWORD_VALIDATORS 配置
This commit is contained in:
@@ -1,4 +1,5 @@
|
||||
from django import forms
|
||||
from django.contrib.auth.password_validation import password_validators_help_text_html, validate_password
|
||||
from .models import Asset, Category
|
||||
|
||||
|
||||
@@ -33,3 +34,39 @@ class CategoryForm(forms.ModelForm):
|
||||
class Meta:
|
||||
model = Category
|
||||
fields = ['name', 'description']
|
||||
|
||||
|
||||
class AdminPasswordResetForm(forms.Form):
|
||||
"""管理员重置指定用户密码的表单"""
|
||||
|
||||
new_password1 = forms.CharField(
|
||||
label='新密码',
|
||||
widget=forms.PasswordInput(attrs={'class': 'form-control', 'autocomplete': 'new-password'}),
|
||||
help_text=password_validators_help_text_html(),
|
||||
)
|
||||
new_password2 = forms.CharField(
|
||||
label='确认新密码',
|
||||
widget=forms.PasswordInput(attrs={'class': 'form-control', 'autocomplete': 'new-password'}),
|
||||
)
|
||||
|
||||
def __init__(self, *args, target_user=None, **kwargs):
|
||||
self.target_user = target_user
|
||||
super().__init__(*args, **kwargs)
|
||||
|
||||
def clean(self):
|
||||
cleaned_data = super().clean()
|
||||
password1 = cleaned_data.get('new_password1')
|
||||
password2 = cleaned_data.get('new_password2')
|
||||
|
||||
if password1 and password2 and password1 != password2:
|
||||
raise forms.ValidationError('两次输入的密码不一致')
|
||||
|
||||
if password1 and self.target_user is not None:
|
||||
validate_password(password1, self.target_user)
|
||||
|
||||
return cleaned_data
|
||||
|
||||
def save(self):
|
||||
self.target_user.set_password(self.cleaned_data['new_password1'])
|
||||
self.target_user.save(update_fields=['password'])
|
||||
return self.target_user
|
||||
|
||||
@@ -29,4 +29,8 @@ urlpatterns = [
|
||||
path('categories/create/', views.category_create, name='category_create'),
|
||||
path('categories/<int:pk>/edit/', views.category_update, name='category_update'),
|
||||
path('categories/<int:pk>/delete/', views.category_delete, name='category_delete'),
|
||||
|
||||
# 用户管理(仅超级管理员)
|
||||
path('users/', views.user_list, name='user_list'),
|
||||
path('users/<int:pk>/password/', views.admin_password_reset, name='admin_password_reset'),
|
||||
]
|
||||
|
||||
+58
-3
@@ -1,6 +1,7 @@
|
||||
from django.shortcuts import render, redirect, get_object_or_404
|
||||
from django.contrib.auth.decorators import login_required
|
||||
from django.contrib.auth import authenticate, login, logout
|
||||
from django.contrib.auth.decorators import login_required, user_passes_test
|
||||
from django.contrib.auth import authenticate, login, logout, update_session_auth_hash
|
||||
from django.contrib.auth.models import User
|
||||
from django.contrib import messages
|
||||
from django.http import HttpResponse, JsonResponse
|
||||
from django.db.models import Count, Q
|
||||
@@ -11,7 +12,7 @@ from io import BytesIO
|
||||
from datetime import date, timedelta
|
||||
|
||||
from .models import Asset, Category, AssetChangeLog
|
||||
from .forms import AssetForm, AssetImportForm, CategoryForm
|
||||
from .forms import AssetForm, AssetImportForm, CategoryForm, AdminPasswordResetForm
|
||||
from .excel_utils import (
|
||||
export_assets_to_excel, generate_import_template,
|
||||
import_assets_from_excel, STATUS_MAP,
|
||||
@@ -437,3 +438,57 @@ def category_delete(request, pk):
|
||||
return redirect('category_list')
|
||||
|
||||
return render(request, 'assetapp/category_confirm_delete.html', {'category': category})
|
||||
|
||||
|
||||
# ─── 用户管理(仅超级管理员) ───────────────────────
|
||||
|
||||
superuser_required = user_passes_test(lambda u: u.is_authenticated and u.is_superuser)
|
||||
|
||||
|
||||
@superuser_required
|
||||
def user_list(request):
|
||||
users = User.objects.order_by('id')
|
||||
|
||||
keyword = request.GET.get('search', '').strip()
|
||||
if keyword:
|
||||
users = users.filter(
|
||||
Q(username__icontains=keyword) |
|
||||
Q(first_name__icontains=keyword) |
|
||||
Q(email__icontains=keyword)
|
||||
)
|
||||
|
||||
is_active = request.GET.get('is_active')
|
||||
if is_active in ('1', '0'):
|
||||
users = users.filter(is_active=(is_active == '1'))
|
||||
|
||||
paginator = Paginator(users, 20)
|
||||
page_obj = paginator.get_page(request.GET.get('page', 1))
|
||||
|
||||
context = {
|
||||
'page_obj': page_obj,
|
||||
'search': keyword,
|
||||
'current_is_active': is_active,
|
||||
}
|
||||
return render(request, 'assetapp/user_list.html', context)
|
||||
|
||||
|
||||
@superuser_required
|
||||
def admin_password_reset(request, pk):
|
||||
target_user = get_object_or_404(User, pk=pk)
|
||||
|
||||
if request.method == 'POST':
|
||||
form = AdminPasswordResetForm(request.POST, target_user=target_user)
|
||||
if form.is_valid():
|
||||
form.save()
|
||||
|
||||
# 如果管理员重置的是自己的密码,保持当前登录会话不失效
|
||||
if request.user.pk == target_user.pk:
|
||||
update_session_auth_hash(request, target_user)
|
||||
|
||||
messages.success(request, f'用户 "{target_user.username}" 的密码已重置')
|
||||
return redirect('user_list')
|
||||
else:
|
||||
form = AdminPasswordResetForm(target_user=target_user)
|
||||
|
||||
context = {'form': form, 'target_user': target_user}
|
||||
return render(request, 'assetapp/user_password_reset.html', context)
|
||||
|
||||
Reference in New Issue
Block a user