feat: add account self-service safeguards
This commit is contained in:
@@ -1,7 +1,20 @@
|
||||
from django.contrib.auth import authenticate, get_user_model, login, logout
|
||||
from datetime import timedelta
|
||||
from ipaddress import ip_address
|
||||
|
||||
from django.contrib.auth import (
|
||||
authenticate,
|
||||
get_user_model,
|
||||
login,
|
||||
logout,
|
||||
update_session_auth_hash,
|
||||
)
|
||||
from django.contrib.auth.models import Group, Permission
|
||||
from django.contrib.auth.password_validation import validate_password
|
||||
from django.contrib.contenttypes.models import ContentType
|
||||
from django.core.exceptions import ValidationError
|
||||
from django.db.models import Q
|
||||
from django.middleware.csrf import get_token
|
||||
from django.utils import timezone
|
||||
from ninja import Router
|
||||
from ninja.errors import HttpError
|
||||
|
||||
@@ -14,9 +27,12 @@ from apps.accounts.schemas import (
|
||||
LoginIn,
|
||||
MenuOut,
|
||||
MenuUpdateIn,
|
||||
PasswordChangeIn,
|
||||
PasswordResetIn,
|
||||
PermissionCodesIn,
|
||||
PermissionOut,
|
||||
ProfileStatsOut,
|
||||
ProfileUpdateIn,
|
||||
RoleCreateIn,
|
||||
RoleDetailOut,
|
||||
RoleUpdateIn,
|
||||
@@ -26,6 +42,8 @@ from apps.accounts.schemas import (
|
||||
UserGroupUpdateIn,
|
||||
UserUpdateIn,
|
||||
)
|
||||
from apps.audit.models import OperationAuditLog
|
||||
from apps.tickets.models import Ticket, TicketEvent, TicketStatus
|
||||
|
||||
router = Router(tags=["accounts"])
|
||||
|
||||
@@ -88,6 +106,8 @@ def serialize_current_user(user) -> dict:
|
||||
"username": user.username,
|
||||
"display_name": user.get_full_name() or user.username,
|
||||
"email": user.email,
|
||||
"last_login": user.last_login,
|
||||
"date_joined": user.date_joined,
|
||||
"is_superuser": user.is_superuser,
|
||||
"roles": [{"id": group.id, "name": group.name} for group in user.groups.all()],
|
||||
"user_groups": [
|
||||
@@ -166,6 +186,38 @@ def require_permission(request, codename: str):
|
||||
raise HttpError(403, "Permission denied")
|
||||
|
||||
|
||||
def validate_user_password(password: str, user) -> None:
|
||||
try:
|
||||
validate_password(password, user=user)
|
||||
except ValidationError as error:
|
||||
raise HttpError(400, ";".join(error.messages)) from error
|
||||
|
||||
|
||||
def account_audit(request, action: str, target, snapshot: dict) -> None:
|
||||
forwarded_for = request.META.get("HTTP_X_FORWARDED_FOR", "")
|
||||
raw_ip_address = forwarded_for.split(",")[0].strip() or request.META.get("REMOTE_ADDR", "")
|
||||
try:
|
||||
audit_ip_address = str(ip_address(raw_ip_address))
|
||||
except ValueError:
|
||||
audit_ip_address = None
|
||||
OperationAuditLog.objects.create(
|
||||
user=request.user if getattr(request.user, "is_authenticated", False) else None,
|
||||
module="accounts",
|
||||
action=action,
|
||||
target_type="user",
|
||||
target_id=str(target.id),
|
||||
request_snapshot=snapshot,
|
||||
result="success",
|
||||
ip_address=audit_ip_address,
|
||||
user_agent=request.META.get("HTTP_USER_AGENT", ""),
|
||||
)
|
||||
|
||||
|
||||
def protect_admin_target(actor, target) -> None:
|
||||
if target.is_superuser and not actor.is_superuser:
|
||||
raise HttpError(403, "只有超级管理员可以管理其他超级管理员账号")
|
||||
|
||||
|
||||
@router.get("/auth/csrf")
|
||||
def csrf(request):
|
||||
return {"csrfToken": get_token(request)}
|
||||
@@ -192,6 +244,73 @@ def current_user(request):
|
||||
return serialize_current_user(user)
|
||||
|
||||
|
||||
@router.patch("/auth/me", response=CurrentUserOut)
|
||||
def update_current_user(request, payload: ProfileUpdateIn):
|
||||
user = require_login(request)
|
||||
values = payload.dict(exclude_unset=True)
|
||||
update_fields = []
|
||||
if "display_name" in values:
|
||||
user.first_name = values["display_name"] or ""
|
||||
update_fields.append("first_name")
|
||||
if "email" in values:
|
||||
user.email = values["email"] or ""
|
||||
update_fields.append("email")
|
||||
if update_fields:
|
||||
user.save(update_fields=update_fields)
|
||||
account_audit(request, "update_profile", user, {"fields": sorted(update_fields)})
|
||||
return serialize_current_user(user)
|
||||
|
||||
|
||||
@router.post("/auth/change-password")
|
||||
def change_current_user_password(request, payload: PasswordChangeIn):
|
||||
user = require_login(request)
|
||||
if not user.check_password(payload.current_password):
|
||||
raise HttpError(400, "当前密码不正确")
|
||||
validate_user_password(payload.new_password, user)
|
||||
user.set_password(payload.new_password)
|
||||
user.save(update_fields=["password"])
|
||||
update_session_auth_hash(request, user)
|
||||
account_audit(request, "change_password", user, {"fields": ["password"]})
|
||||
return {"status": "ok"}
|
||||
|
||||
|
||||
@router.get("/auth/me/stats", response=ProfileStatsOut)
|
||||
def current_user_stats(request):
|
||||
user = require_login(request)
|
||||
completed_statuses = [TicketStatus.RESOLVED, TicketStatus.CLOSED]
|
||||
assigned = Ticket.objects.filter(assignee=user)
|
||||
assigned_total = assigned.count()
|
||||
completed_total = assigned.filter(status__in=completed_statuses).count()
|
||||
completed_cutoff = timezone.now() - timedelta(days=30)
|
||||
completed_30d = assigned.filter(status__in=completed_statuses).filter(
|
||||
Q(resolved_at__gte=completed_cutoff) | Q(closed_at__gte=completed_cutoff)
|
||||
).count()
|
||||
activity = (
|
||||
TicketEvent.objects.select_related("ticket")
|
||||
.filter(operator=user)
|
||||
.order_by("-created_at")[:8]
|
||||
)
|
||||
return {
|
||||
"created_total": Ticket.objects.filter(created_by=user).count(),
|
||||
"active_assigned": assigned.exclude(status__in=completed_statuses).count(),
|
||||
"completed_30d": completed_30d,
|
||||
"completion_rate": round(completed_total * 100 / assigned_total, 1)
|
||||
if assigned_total
|
||||
else 0,
|
||||
"recent_activity": [
|
||||
{
|
||||
"id": event.id,
|
||||
"ticket_id": event.ticket_id,
|
||||
"ticket_no": event.ticket.ticket_no,
|
||||
"ticket_title": event.ticket.title,
|
||||
"event_type": event.event_type,
|
||||
"created_at": event.created_at,
|
||||
}
|
||||
for event in activity
|
||||
],
|
||||
}
|
||||
|
||||
|
||||
@router.get("/users", response=list[BasicUserOut])
|
||||
def list_users(request):
|
||||
require_permission(request, "system.user.view")
|
||||
@@ -201,6 +320,12 @@ def list_users(request):
|
||||
@router.post("/users", response=BasicUserOut)
|
||||
def create_user(request, payload: UserCreateIn):
|
||||
require_permission(request, "system.user.manage")
|
||||
candidate = get_user_model()(
|
||||
username=payload.username,
|
||||
email=payload.email,
|
||||
first_name=payload.display_name,
|
||||
)
|
||||
validate_user_password(payload.password, candidate)
|
||||
user = get_user_model().objects.create_user(
|
||||
username=payload.username,
|
||||
email=payload.email,
|
||||
@@ -210,6 +335,12 @@ def create_user(request, payload: UserCreateIn):
|
||||
if payload.display_name:
|
||||
user.first_name = payload.display_name
|
||||
user.save(update_fields=["first_name"])
|
||||
account_audit(
|
||||
request,
|
||||
"create_user",
|
||||
user,
|
||||
{"fields": ["username", "display_name", "email", "is_active"]},
|
||||
)
|
||||
return serialize_basic_user(user)
|
||||
|
||||
|
||||
@@ -221,8 +352,11 @@ def get_user(request, user_id: int):
|
||||
|
||||
@router.patch("/users/{user_id}", response=BasicUserOut)
|
||||
def update_user(request, user_id: int, payload: UserUpdateIn):
|
||||
require_permission(request, "system.user.manage")
|
||||
actor = require_permission(request, "system.user.manage")
|
||||
user = get_user_model().objects.get(id=user_id)
|
||||
protect_admin_target(actor, user)
|
||||
if actor.id == user.id and payload.is_active is False:
|
||||
raise HttpError(400, "不能停用当前登录账号")
|
||||
update_fields = []
|
||||
if payload.display_name is not None:
|
||||
user.first_name = payload.display_name
|
||||
@@ -235,31 +369,41 @@ def update_user(request, user_id: int, payload: UserUpdateIn):
|
||||
update_fields.append("is_active")
|
||||
if update_fields:
|
||||
user.save(update_fields=update_fields)
|
||||
account_audit(request, "update_user", user, {"fields": sorted(update_fields)})
|
||||
return serialize_basic_user(user)
|
||||
|
||||
|
||||
@router.post("/users/{user_id}/reset-password", response=BasicUserOut)
|
||||
def reset_user_password(request, user_id: int, payload: PasswordResetIn):
|
||||
require_permission(request, "system.user.manage")
|
||||
actor = require_permission(request, "system.user.manage")
|
||||
user = get_user_model().objects.get(id=user_id)
|
||||
protect_admin_target(actor, user)
|
||||
if actor.id == user.id:
|
||||
raise HttpError(400, "请前往个人中心修改当前账号密码")
|
||||
validate_user_password(payload.password, user)
|
||||
user.set_password(payload.password)
|
||||
user.save(update_fields=["password"])
|
||||
account_audit(request, "reset_password", user, {"fields": ["password"]})
|
||||
return serialize_basic_user(user)
|
||||
|
||||
|
||||
@router.post("/users/{user_id}/roles", response=BasicUserOut)
|
||||
def set_user_roles(request, user_id: int, payload: IdsIn):
|
||||
require_permission(request, "system.user.manage")
|
||||
actor = require_permission(request, "system.user.manage")
|
||||
user = get_user_model().objects.get(id=user_id)
|
||||
protect_admin_target(actor, user)
|
||||
user.groups.set(Group.objects.filter(id__in=payload.role_ids))
|
||||
account_audit(request, "set_roles", user, {"role_count": len(payload.role_ids)})
|
||||
return serialize_basic_user(user)
|
||||
|
||||
|
||||
@router.post("/users/{user_id}/user-groups", response=BasicUserOut)
|
||||
def set_user_groups(request, user_id: int, payload: IdsIn):
|
||||
require_permission(request, "system.user.manage")
|
||||
actor = require_permission(request, "system.user.manage")
|
||||
user = get_user_model().objects.get(id=user_id)
|
||||
protect_admin_target(actor, user)
|
||||
user.business_groups.set(UserGroup.objects.filter(id__in=payload.user_ids))
|
||||
account_audit(request, "set_user_groups", user, {"user_group_count": len(payload.user_ids)})
|
||||
return serialize_basic_user(user)
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user