1
0
forked from baron/baron-sso

사용자 삭제 RP 관계 정리 로그 미표시 수정

This commit is contained in:
2026-05-28 15:42:14 +09:00
parent a156713db7
commit 5648b7ec45
2 changed files with 126 additions and 3 deletions

View File

@@ -8,6 +8,7 @@ import (
"baron-sso-backend/internal/utils"
"context"
"encoding/csv"
"encoding/json"
"errors"
"fmt"
"log/slog"
@@ -1768,7 +1769,7 @@ func (h *UserHandler) BulkDeleteUsers(c *fiber.Ctx) error {
}
}
if err := h.enqueueDeletedUserRelyingPartyCleanup(c.Context(), id); err != nil {
if err := h.enqueueDeletedUserRelyingPartyCleanup(c.Context(), requester, id); err != nil {
results = append(results, map[string]any{"id": id, "success": false, "message": err.Error()})
continue
}
@@ -2227,7 +2228,7 @@ func (h *UserHandler) DeleteUser(c *fiber.Ctx) error {
}
}
if err := h.enqueueDeletedUserRelyingPartyCleanup(c.Context(), userID); err != nil {
if err := h.enqueueDeletedUserRelyingPartyCleanup(c.Context(), requester, userID); err != nil {
return errorJSON(c, fiber.StatusInternalServerError, err.Error())
}
@@ -2264,11 +2265,20 @@ func (h *UserHandler) DeleteUser(c *fiber.Ctx) error {
return c.SendStatus(fiber.StatusNoContent)
}
func (h *UserHandler) enqueueDeletedUserRelyingPartyCleanup(ctx context.Context, userID string) error {
func (h *UserHandler) enqueueDeletedUserRelyingPartyCleanup(ctx context.Context, requester *domain.UserProfileResponse, userID string) error {
if h.KetoService == nil || h.KetoOutboxRepo == nil {
return nil
}
actorID := ""
tenantID := ""
if requester != nil {
actorID = strings.TrimSpace(requester.ID)
if requester.TenantID != nil {
tenantID = strings.TrimSpace(*requester.TenantID)
}
}
subject := "User:" + strings.TrimSpace(userID)
tuples, err := h.listDeletedUserRelyingPartyRelations(ctx, subject)
if err != nil {
@@ -2314,12 +2324,65 @@ func (h *UserHandler) enqueueDeletedUserRelyingPartyCleanup(ctx context.Context,
Action: domain.KetoOutboxActionDelete,
}); err != nil {
slog.Warn("[UserHandler] Failed to enqueue RelyingParty relation cleanup", "userID", userID, "namespace", namespace, "object", tuple.Object, "relation", tuple.Relation, "subject", relSubject, "error", err)
continue
}
if err := h.recordDeletedUserRelyingPartyCleanupAudit(actorID, tenantID, userID, tuple, relSubject); err != nil {
slog.Warn("[UserHandler] Failed to record RelyingParty cleanup audit", "userID", userID, "namespace", namespace, "object", tuple.Object, "relation", tuple.Relation, "subject", relSubject, "error", err)
}
}
return nil
}
func (h *UserHandler) recordDeletedUserRelyingPartyCleanupAudit(
actorID string,
tenantID string,
deletedUserID string,
tuple service.RelationTuple,
relSubject string,
) error {
if h.AuditRepo == nil {
return nil
}
details := map[string]any{
"action": "REMOVE_RELATION",
"target_id": strings.TrimSpace(tuple.Object),
"source": "user_delete",
"deleted_user_id": strings.TrimSpace(deletedUserID),
"cascade_cleanup": true,
"relation_subject": strings.TrimSpace(relSubject),
"before": map[string]any{
"relation": strings.TrimSpace(tuple.Relation),
"subject": strings.TrimSpace(relSubject),
},
}
if strings.TrimSpace(tenantID) != "" {
details["tenant_id"] = strings.TrimSpace(tenantID)
}
raw, err := json.Marshal(details)
if err != nil {
return err
}
eventType := fmt.Sprintf("DELETE /api/v1/dev/clients/%s/relations", strings.TrimSpace(tuple.Object))
if strings.TrimSpace(tuple.Relation) != "" {
eventType = fmt.Sprintf("%s/%s", eventType, strings.TrimSpace(tuple.Relation))
}
return h.AuditRepo.Create(&domain.AuditLog{
EventID: fmt.Sprintf("user-delete-rp-cleanup-%d", time.Now().UnixNano()),
Timestamp: time.Now().UTC(),
UserID: strings.TrimSpace(actorID),
TenantID: strings.TrimSpace(tenantID),
EventType: eventType,
Status: "success",
Details: string(raw),
})
}
func (h *UserHandler) listDeletedUserRelyingPartyRelations(ctx context.Context, subject string) ([]service.RelationTuple, error) {
var tuples []service.RelationTuple
var err error