支持通知凭据验证后查看并收紧账号权限

This commit is contained in:
xuans committed 2026-09-26 22:16:47 +08:00
1 parent 85feb38c5d
commit a1dc20af85
9 files changed
+240 -29

No files matched your search

+32 -4
View File
@@ -103,7 +103,7 @@ func GetNotificationStatus(ctx *context.Context, w http.ResponseWriter, req *htt
"user_id": user.ID, "account": user.Account, "enabled": item.Enabled == 1,
"configured": notification.Configured(item, *user), "version": item.CodeVersion,
"can_reveal": notification.Configured(item, *user) && item.CodeCiphertext != "" &&
access.CanManageNotification(ctx.EffectiveRole(), user.EffectiveRole(), ctx.UserID == user.ID),
(ctx.UserID == user.ID || access.CanManageNotification(ctx.EffectiveRole(), user.EffectiveRole(), false)),
"account_available": user.Disabled == 0 && user.MustChangePassword == 0,
"can_manage": access.CanManageNotification(ctx.EffectiveRole(), user.EffectiveRole(), ctx.UserID == user.ID),
"minute_limit": item.MinuteLimit, "day_limit": item.DayLimit,
@@ -216,20 +216,48 @@ func RevealNotificationCredential(ctx *context.Context, w http.ResponseWriter, r
writeSecurityError(w, response.ParamsError, "请填写当前登录密码并选择有效账号")
return
}
user, ok := loadNotificationUser(ctx, w, input.UserID, true)
user, ok := loadNotificationUser(ctx, w, input.UserID, false)
if !ok {
return
}
_, err := auth.AuthenticateUserByID(ctx.UserID, input.Password)
if err := authorizeCapability(ctx, access.CapabilityNotificationReveal, user.EffectiveRole(), ctx.UserID == user.ID); err != nil {
writeSecurityError(w, response.NoAccessPrivileges, "无权查看该账号的通知发信凭据")
return
}
userKey := reauthUserAttempts.accountKey(strconv.Itoa(ctx.UserID))
ipKey := reauthIPAttempts.ipKey(req)
if reauthUserAttempts.blocked(userKey) || reauthIPAttempts.blocked(ipKey) {
writeReauthError(w, http.StatusTooManyRequests, "REAUTH_RATE_LIMITED", "尝试次数过多,请稍后再试")
return
}
actor, err := auth.AuthenticateUserByID(ctx.UserID, input.Password)
input.Password = ""
if err != nil {
recordNotificationManagement(ctx, user.ID, "查看系统通知凭据", err, nil)
if !writePasswordBusy(w, err) {
reauthUserAttempts.recordFailure(userKey)
reauthIPAttempts.recordFailure(ipKey)
writeSecurityError(w, response.ParamsError, "密码验证失败")
}
return
}
code, err := notification.Reveal(db.Instance, *user, input.Version, config.ROOT_PATH, accountWriteGuard(ctx, *user))
if actor.SessionVersion != ctx.SessionVersion || actor.SecurityVersion != ctx.SecurityVersion || actor.EffectiveRole() != ctx.EffectiveRole() {
writeSecurityError(w, response.NeedLogin, "登录状态已变化,请重新登录")
return
}
guard := accountgroup.OwnGuard(ctx.UserID, ctx.EffectiveRole(), ctx.SessionVersion, ctx.SecurityVersion)
if ctx.UserID != user.ID {
verified := *ctx
verified.RecentAuth = true
if _, ok := loadNotificationUser(&verified, w, user.ID, true); !ok {
return
}
guard = accountWriteGuard(ctx, *user)
}
code, err := notification.Reveal(db.Instance, *user, input.Version, config.ROOT_PATH, guard)
if err == nil {
reauthUserAttempts.clear(userKey)
}
recordNotificationManagement(ctx, user.ID, "查看系统通知凭据", err, nil)
if err != nil {
writeNotificationError(w, err)
+4
View File
@@ -63,6 +63,10 @@ func Authorize(request Request) error {
func authorizeResource(request Request) error {
switch request.Capability {
case CapabilityNotificationReveal:
if !request.OwnResource && !CanManageNotification(request.ActorRole, request.TargetRole, false) {
return deny(CodeAccessDenied)
}
case CapabilityNotificationManage:
if !CanManageNotification(request.ActorRole, request.TargetRole, request.OwnResource) {
return deny(CodeTargetRoleDenied)
+5
View File
@@ -26,6 +26,7 @@ const (
CapabilityAuditRead Capability = "audit.read"
CapabilityAuditExport Capability = "audit.export"
CapabilityNotificationManage Capability = "notification.manage"
CapabilityNotificationReveal Capability = "notification.reveal"
CapabilityAccountGroupManage Capability = "account_group.manage"
)
@@ -38,6 +39,7 @@ type Policy struct {
}
var policies = map[Capability]Policy{
CapabilityNotificationReveal: {Capability: CapabilityNotificationReveal, HighRisk: true, RequiresTarget: true},
CapabilityAccountGroupManage: {Capability: CapabilityAccountGroupManage, HighRisk: true, RequiresRecentAuth: true},
CapabilityNotificationManage: {Capability: CapabilityNotificationManage, HighRisk: true, RequiresRecentAuth: true, RequiresRecoveryCode: true, RequiresTarget: true},
CapabilityConfigRead: {Capability: CapabilityConfigRead},
@@ -66,6 +68,7 @@ var policies = map[Capability]Policy{
var grants = map[Role]map[Capability]struct{}{
RoleSuperAdmin: grant(
CapabilityNotificationReveal,
CapabilityAccountGroupManage,
CapabilityNotificationManage,
CapabilityPluginReadGlobal, CapabilityUserCreate, CapabilityProfileWriteOwn,
@@ -77,6 +80,7 @@ var grants = map[Role]map[Capability]struct{}{
CapabilityAuditRead, CapabilityAuditExport,
),
RoleAdmin: grant(
CapabilityNotificationReveal,
CapabilityNotificationManage,
CapabilityPluginReadGlobal, CapabilityPluginRead, CapabilityPluginWriteGlobal, CapabilityProfileWriteOwn,
CapabilityPluginWriteAnyUser, CapabilityPluginWriteOwn, CapabilityUserRead,
@@ -84,6 +88,7 @@ var grants = map[Role]map[Capability]struct{}{
CapabilityAuditRead,
),
RoleUser: grant(
CapabilityNotificationReveal,
CapabilityProfileWriteOwn,
CapabilityPluginRead, CapabilityPluginWriteOwn, CapabilityUserRead,
CapabilityPasswordChangeOwn, CapabilityAuditRead,
+2 -2
View File
@@ -9,8 +9,8 @@ type Endpoint struct {
}
var managementEndpoints = []Endpoint{
{Method: "POST", Path: "/api/system/notification/credential/reveal", Capability: CapabilityNotificationManage},
{Method: "POST", Path: "/api/v1/system/notification/credential/reveal", Capability: CapabilityNotificationManage},
{Method: "POST", Path: "/api/system/notification/credential/reveal", Capability: CapabilityNotificationReveal},
{Method: "POST", Path: "/api/v1/system/notification/credential/reveal", Capability: CapabilityNotificationReveal},
{Method: "POST", Path: "/api/system/notification/authorization", Capability: CapabilityNotificationManage},
{Method: "POST", Path: "/api/system/notification/credential", Capability: CapabilityNotificationManage},
{Method: "POST", Path: "/api/v1/user/groups/save", Capability: CapabilityAccountGroupManage},
+22
View File
@@ -186,6 +186,28 @@ func ReplaceMembership(tx *xorm.Session, userID int, ids []int) error {
type WriteGuard func(*xorm.Session) error
// OwnGuard 只锁定并复核当前账号,不授予管理本人或其他账号的能力。
func OwnGuard(actorID int, role access.Role, sessionVersion, securityVersion int) WriteGuard {
return func(tx *xorm.Session) error {
if tx == nil || actorID <= 0 || !role.Valid() {
return ErrDenied
}
if _, err := tx.ID(actorID).SetExpr("session_version", "session_version").Update(&models.User{}); err != nil {
return err
}
var current models.User
found, err := tx.ID(actorID).Get(&current)
if err != nil {
return err
}
if !found || current.Disabled != 0 || current.MustChangePassword != 0 || current.EffectiveRole() != role ||
current.SessionVersion != sessionVersion || current.SecurityVersion != securityVersion {
return ErrDenied
}
return nil
}
}
func CheckWrite(tx *xorm.Session, guards ...WriteGuard) error {
for _, guard := range guards {
if guard == nil {
+5 -5
View File
@@ -26,11 +26,11 @@ const (
)
var (
ErrDenied = errors.New("notification authorization denied")
ErrConflict = errors.New("notification authorization changed")
ErrQuota = errors.New("notification quota exceeded")
ErrUnavailable = errors.New("notification authorization unavailable")
ErrLimits = errors.New("invalid notification limits")
ErrDenied = errors.New("notification authorization denied")
ErrConflict = errors.New("notification authorization changed")
ErrQuota = errors.New("notification quota exceeded")
ErrUnavailable = errors.New("notification authorization unavailable")
ErrLimits = errors.New("invalid notification limits")
ErrNoCiphertext = errors.New("notification credential must be regenerated before reveal")
)