From afe11dbeef7bb843d0488c4d42478c91f94196d7 Mon Sep 17 00:00:00 2001 From: Qiu Jian Date: Wed, 11 Aug 2021 17:15:29 +0800 Subject: [PATCH] fix: resolve permission issues for samlusers and quotas --- pkg/cloudid/policy/defaults.go | 18 ++++++++++++ pkg/cloudid/policy/resources.go | 1 + pkg/keystone/locale/predefined_policies.go | 32 ++++++++++++++++++++++ 3 files changed, 51 insertions(+) diff --git a/pkg/cloudid/policy/defaults.go b/pkg/cloudid/policy/defaults.go index 7cd9f68e38..410cfc4b1e 100644 --- a/pkg/cloudid/policy/defaults.go +++ b/pkg/cloudid/policy/defaults.go @@ -85,6 +85,24 @@ var ( }, }, }, + { + Auth: true, + Scope: rbacutils.ScopeUser, + Rules: []rbacutils.SRbacRule{ + { + Service: api.SERVICE_TYPE, + Resource: "samlusers", + Action: PolicyActionList, + Result: rbacutils.Allow, + }, + { + Service: api.SERVICE_TYPE, + Resource: "samlusers", + Action: PolicyActionGet, + Result: rbacutils.Allow, + }, + }, + }, } ) diff --git a/pkg/cloudid/policy/resources.go b/pkg/cloudid/policy/resources.go index 1b4478fb5c..da3847ccc8 100644 --- a/pkg/cloudid/policy/resources.go +++ b/pkg/cloudid/policy/resources.go @@ -28,6 +28,7 @@ var ( } cloudidUserResources = []string{ "cloudusers", + "samlusers", } ) diff --git a/pkg/keystone/locale/predefined_policies.go b/pkg/keystone/locale/predefined_policies.go index 13da418549..46a0051093 100644 --- a/pkg/keystone/locale/predefined_policies.go +++ b/pkg/keystone/locale/predefined_policies.go @@ -76,18 +76,50 @@ var ( "list", "get", }, + "quotas": { + "list", + "get", + }, + "zone_quotas": { + "list", + "get", + }, + "region_quotas": { + "list", + "get", + }, + "project_quotas": { + "list", + "get", + }, + "domain_quotas": { + "list", + "get", + }, + "infras_quotas": { + "list", + "get", + }, }, "image": { "usages": { "list", "get", }, + "image_quotas": { + "list", + "get", + }, }, "identity": { "usages": { "list", "get", }, + "identity_quotas": { + "list", + "get", + }, }, "meter": { "bill_conditions": {