1 parent
6ec462895f
commit
18b6dfbdf7
26 files changed
+1913
-169
No files matched your search
@@ -57,12 +57,12 @@ func TestRecoveryAndRecentAuthentication(t *testing.T) {
|
||||
t.Fatalf("expected recent authentication requirement, got %v", err)
|
||||
}
|
||||
superAdmin := Request{ActorRole: RoleSuperAdmin, Capability: CapabilityConfigRollback, RecentAuth: true}
|
||||
if err := Authorize(superAdmin); !IsDenied(err, CodeRecoveryCodeRequired) {
|
||||
t.Fatalf("super admin without recovery code must be denied: %v", err)
|
||||
}
|
||||
superAdmin.RecoveryCodeConfigured = true
|
||||
if err := Authorize(superAdmin); err != nil {
|
||||
t.Fatalf("super admin with recovery code should be allowed: %v", err)
|
||||
t.Fatalf("super admin should be exempt from recovery code precondition: %v", err)
|
||||
}
|
||||
adminRollback := Request{ActorRole: RoleAdmin, Capability: CapabilityConfigRollback, RecentAuth: true}
|
||||
if err := Authorize(adminRollback); !IsDenied(err, CodeAccessDenied) {
|
||||
t.Fatalf("admin must not receive a recovery-code bypass for a super-admin capability: %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -90,7 +90,7 @@ func TestAdminPluginRestartScope(t *testing.T) {
|
||||
|
||||
func TestManagementEndpointCatalog(t *testing.T) {
|
||||
endpoints := ManagementEndpoints()
|
||||
if len(endpoints) != 7 {
|
||||
if len(endpoints) != 18 {
|
||||
t.Fatalf("unexpected endpoint count: %d", len(endpoints))
|
||||
}
|
||||
seen := map[string]struct{}{}
|
||||
@@ -108,6 +108,22 @@ func TestManagementEndpointCatalog(t *testing.T) {
|
||||
if !ok || endpoint.Capability != CapabilityPluginWriteOwn {
|
||||
t.Fatal("plugin settings endpoint was not matched")
|
||||
}
|
||||
endpoint, ok = LookupEndpoint("POST", "/api/v1/config/smtp/validate")
|
||||
if !ok || endpoint.Capability != CapabilityConfigWriteGlobal {
|
||||
t.Fatal("configuration validation endpoint was not matched")
|
||||
}
|
||||
endpoint, ok = LookupEndpoint("GET", "/api/v1/config/email")
|
||||
if !ok || endpoint.Capability != CapabilityConfigRead {
|
||||
t.Fatal("configuration section endpoint was not matched")
|
||||
}
|
||||
endpoint, ok = LookupEndpoint("PUT", "/api/v1/config/email")
|
||||
if !ok || endpoint.Capability != CapabilityConfigWriteGlobal {
|
||||
t.Fatal("configuration update endpoint was not matched")
|
||||
}
|
||||
endpoint, ok = LookupEndpoint("GET", "/api/v1/config/backups")
|
||||
if !ok || endpoint.Capability != CapabilityConfigRollback {
|
||||
t.Fatal("configuration backup endpoint did not require rollback capability")
|
||||
}
|
||||
}
|
||||
|
||||
func TestEveryManagementEndpointHasAllowAndDeny(t *testing.T) {
|
||||
|
||||
@@ -55,7 +55,7 @@ func Authorize(request Request) error {
|
||||
if policy.RequiresRecentAuth && !request.RecentAuth {
|
||||
return deny(CodeRecentAuthRequired)
|
||||
}
|
||||
if policy.RequiresRecoveryCode && !request.RecoveryCodeConfigured && !request.DeploymentChannel {
|
||||
if policy.RequiresRecoveryCode && request.ActorRole != RoleSuperAdmin && !request.RecoveryCodeConfigured && !request.DeploymentChannel {
|
||||
return deny(CodeRecoveryCodeRequired)
|
||||
}
|
||||
return authorizeResource(request)
|
||||
|
||||
@@ -20,6 +20,7 @@ const (
|
||||
CapabilityPasswordChangeOwn Capability = "password.change_own"
|
||||
CapabilityPasswordReset Capability = "password.reset"
|
||||
CapabilityAuditRead Capability = "audit.read"
|
||||
CapabilityAuditExport Capability = "audit.export"
|
||||
)
|
||||
|
||||
type Policy struct {
|
||||
@@ -48,6 +49,7 @@ var policies = map[Capability]Policy{
|
||||
CapabilityPasswordChangeOwn: {Capability: CapabilityPasswordChangeOwn},
|
||||
CapabilityPasswordReset: {Capability: CapabilityPasswordReset, HighRisk: true, RequiresRecentAuth: true, RequiresRecoveryCode: true, RequiresTarget: true},
|
||||
CapabilityAuditRead: {Capability: CapabilityAuditRead},
|
||||
CapabilityAuditExport: {Capability: CapabilityAuditExport, HighRisk: true, RequiresRecentAuth: true},
|
||||
}
|
||||
|
||||
var grants = map[Role]map[Capability]struct{}{
|
||||
@@ -57,7 +59,7 @@ var grants = map[Role]map[Capability]struct{}{
|
||||
CapabilityPluginRestart, CapabilityServiceRestart, CapabilityPluginWriteGlobal, CapabilityPluginWriteAnyUser,
|
||||
CapabilityPluginWriteOwn, CapabilityUserRead, CapabilityUserManage,
|
||||
CapabilityRoleManage, CapabilityPasswordChangeOwn, CapabilityPasswordReset,
|
||||
CapabilityAuditRead,
|
||||
CapabilityAuditRead, CapabilityAuditExport,
|
||||
),
|
||||
RoleAdmin: grant(
|
||||
CapabilityConfigRead, CapabilityPluginRead, CapabilityPluginRestart,
|
||||
|
||||
@@ -16,6 +16,17 @@ var managementEndpoints = []Endpoint{
|
||||
{Method: "POST", Path: "/api/user/list", Capability: CapabilityUserRead},
|
||||
{Method: "GET", Path: "/api/plugin/list", Capability: CapabilityPluginRead},
|
||||
{Method: "*", Path: "/api/plugin/settings/", Capability: CapabilityPluginWriteOwn},
|
||||
{Method: "GET", Path: "/api/v1/config/status", Capability: CapabilityConfigRead},
|
||||
{Method: "GET", Path: "/api/v1/config/backups", Capability: CapabilityConfigRollback},
|
||||
{Method: "POST", Path: "/api/v1/config/rollback/preview", Capability: CapabilityConfigRollback},
|
||||
{Method: "POST", Path: "/api/v1/config/rollback/ticket", Capability: CapabilityConfigRollback},
|
||||
{Method: "POST", Path: "/api/v1/config/rollback", Capability: CapabilityConfigRollback},
|
||||
{Method: "POST", Path: "/api/v1/config/:section/validate", Capability: CapabilityConfigWriteGlobal},
|
||||
{Method: "POST", Path: "/api/v1/config/:section/apply", Capability: CapabilityConfigWriteGlobal},
|
||||
{Method: "GET", Path: "/api/v1/config/:section", Capability: CapabilityConfigRead},
|
||||
{Method: "PUT", Path: "/api/v1/config/:section", Capability: CapabilityConfigWriteGlobal},
|
||||
{Method: "GET", Path: "/api/v1/audits/config", Capability: CapabilityAuditRead},
|
||||
{Method: "POST", Path: "/api/v1/audits/config", Capability: CapabilityAuditExport},
|
||||
}
|
||||
|
||||
func ManagementEndpoints() []Endpoint {
|
||||
@@ -28,13 +39,36 @@ func LookupEndpoint(method string, path string) (Endpoint, bool) {
|
||||
method = strings.ToUpper(strings.TrimSpace(method))
|
||||
for _, endpoint := range managementEndpoints {
|
||||
methodMatches := endpoint.Method == "*" || endpoint.Method == method
|
||||
pathMatches := endpoint.Path == path
|
||||
if strings.HasSuffix(endpoint.Path, "/") {
|
||||
pathMatches = strings.HasPrefix(path, endpoint.Path)
|
||||
}
|
||||
pathMatches := matchEndpointPath(endpoint.Path, path)
|
||||
if methodMatches && pathMatches {
|
||||
return endpoint, true
|
||||
}
|
||||
}
|
||||
return Endpoint{}, false
|
||||
}
|
||||
|
||||
func matchEndpointPath(pattern, path string) bool {
|
||||
if pattern == path {
|
||||
return true
|
||||
}
|
||||
if strings.HasSuffix(pattern, "/") {
|
||||
return strings.HasPrefix(path, pattern)
|
||||
}
|
||||
patternParts := strings.Split(strings.Trim(pattern, "/"), "/")
|
||||
pathParts := strings.Split(strings.Trim(path, "/"), "/")
|
||||
if len(patternParts) != len(pathParts) {
|
||||
return false
|
||||
}
|
||||
for index := range patternParts {
|
||||
if strings.HasPrefix(patternParts[index], ":") && patternParts[index] != ":" {
|
||||
if pathParts[index] == "" {
|
||||
return false
|
||||
}
|
||||
continue
|
||||
}
|
||||
if patternParts[index] != pathParts[index] {
|
||||
return false
|
||||
}
|
||||
}
|
||||
return true
|
||||
}
|
||||
@@ -12,6 +12,7 @@ func TestCapabilityMatrix(t *testing.T) {
|
||||
{name: "admin reads config", req: Request{ActorRole: RoleAdmin, Capability: CapabilityConfigRead}, allowed: true},
|
||||
{name: "user cannot read config", req: Request{ActorRole: RoleUser, Capability: CapabilityConfigRead}},
|
||||
{name: "super admin controls plugin", req: Request{ActorRole: RoleSuperAdmin, Capability: CapabilityPluginControl, RecentAuth: true, RecoveryCodeConfigured: true}, allowed: true},
|
||||
{name: "super admin controls plugin without recovery code", req: Request{ActorRole: RoleSuperAdmin, Capability: CapabilityPluginControl, RecentAuth: true}, allowed: true},
|
||||
{name: "admin cannot control plugin", req: Request{ActorRole: RoleAdmin, Capability: CapabilityPluginControl, RecentAuth: true, RecoveryCodeConfigured: true}},
|
||||
{name: "super admin writes global plugin settings", req: Request{ActorRole: RoleSuperAdmin, Capability: CapabilityPluginWriteGlobal, RecentAuth: true, RecoveryCodeConfigured: true}, allowed: true},
|
||||
{name: "admin cannot write global plugin settings", req: Request{ActorRole: RoleAdmin, Capability: CapabilityPluginWriteGlobal, RecentAuth: true, RecoveryCodeConfigured: true}},
|
||||
|
||||
Reference in new issue
Block a user