1 parent
05b01bbc83
commit
46572da0f5
9 files changed
+240
-29
No files matched your search
@@ -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)
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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},
|
||||
|
||||
@@ -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(¤t)
|
||||
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 {
|
||||
|
||||
@@ -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")
|
||||
)
|
||||
|
||||
|
||||
Reference in new issue
Block a user