scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-03 19:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #39684 from deads2k/rbac-37-subresource-message

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 39684, 39577, 38989, 39534, 39702)

add subresource to forbidden message

Fixes https://github.com/kubernetes/kubernetes/issues/39640

The message will now be `user "username" cannot verb resource.group/subresource in the the namespace "ns"`.
This commit is contained in:
Kubernetes Submit Queue
2017-01-10 22:24:09 -08:00
committed by GitHub
parent c02412450e c49639c53c
commit 49b900a45e
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/genericapiserver/api/handlers/responsewriters/errors.go
View File

@@ -56,6 +56,9 @@ func forbiddenMessage(attributes authorizer.Attributes) string {
if group := attributes.GetAPIGroup(); len(group) > 0 { if group := attributes.GetAPIGroup(); len(group) > 0 {
resource = resource + "." + group resource = resource + "." + group
} }
if subresource := attributes.GetSubresource(); len(subresource) > 0 {
resource = resource + "/" + subresource
}
if ns := attributes.GetNamespace(); len(ns) > 0 { if ns := attributes.GetNamespace(); len(ns) > 0 {
return fmt.Sprintf("User %q cannot %s %s in the namespace %q.", username, attributes.GetVerb(), resource, ns) return fmt.Sprintf("User %q cannot %s %s in the namespace %q.", username, attributes.GetVerb(), resource, ns)