Merge pull request #49006 from CaoShuFeng/is_forbidden

Automatic merge from submit-queue Fix forbidden message format Before this change: $ kubectl get pods --as=tom Error from server (Forbidden): pods "" is forbidden: User "tom" cannot list pods in the namespace "default". After this change: $ kubectl get pods --as=tom Error from server (Forbidden): pods is forbidden: User "tom" cannot list pods in the namespace "default". **What this PR does / why we need it**: **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes # **Special notes for your reviewer**: **Release note**: ``` Fix forbidden message format, remove extra "" ``` Kubernetes-commit: 562d2be7a08c5cfb0f78331b0225acdf73bf9d94
2017-08-26 19:01:21 -07:00 · 2017-08-26 19:01:21 -07:00 · d63053d0e4
parent 26ddb013b9 892932fb62
commit d63053d0e4
2 changed files with 64 additions and 62 deletions
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@ -840,235 +840,235 @@
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/api/equality",
-      "Rev": "b63e1e4b3f7d0681e9a6e15bd4729d3014049e4e"
+      "Rev": "d2435b594d2ea04e92a664649fb7b3e131802cdd"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/api/errors",
-      "Rev": "b63e1e4b3f7d0681e9a6e15bd4729d3014049e4e"
+      "Rev": "d2435b594d2ea04e92a664649fb7b3e131802cdd"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/api/meta",
-      "Rev": "b63e1e4b3f7d0681e9a6e15bd4729d3014049e4e"
+      "Rev": "d2435b594d2ea04e92a664649fb7b3e131802cdd"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/api/resource",
-      "Rev": "b63e1e4b3f7d0681e9a6e15bd4729d3014049e4e"
+      "Rev": "d2435b594d2ea04e92a664649fb7b3e131802cdd"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/api/testing",
-      "Rev": "b63e1e4b3f7d0681e9a6e15bd4729d3014049e4e"
+      "Rev": "d2435b594d2ea04e92a664649fb7b3e131802cdd"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/api/testing/fuzzer",
-      "Rev": "b63e1e4b3f7d0681e9a6e15bd4729d3014049e4e"
+      "Rev": "d2435b594d2ea04e92a664649fb7b3e131802cdd"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/api/testing/roundtrip",
-      "Rev": "b63e1e4b3f7d0681e9a6e15bd4729d3014049e4e"
+      "Rev": "d2435b594d2ea04e92a664649fb7b3e131802cdd"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/api/validation",
-      "Rev": "b63e1e4b3f7d0681e9a6e15bd4729d3014049e4e"
+      "Rev": "d2435b594d2ea04e92a664649fb7b3e131802cdd"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/api/validation/path",
-      "Rev": "b63e1e4b3f7d0681e9a6e15bd4729d3014049e4e"
+      "Rev": "d2435b594d2ea04e92a664649fb7b3e131802cdd"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/apimachinery",
-      "Rev": "b63e1e4b3f7d0681e9a6e15bd4729d3014049e4e"
+      "Rev": "d2435b594d2ea04e92a664649fb7b3e131802cdd"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/apimachinery/announced",
-      "Rev": "b63e1e4b3f7d0681e9a6e15bd4729d3014049e4e"
+      "Rev": "d2435b594d2ea04e92a664649fb7b3e131802cdd"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/apimachinery/registered",
-      "Rev": "b63e1e4b3f7d0681e9a6e15bd4729d3014049e4e"
+      "Rev": "d2435b594d2ea04e92a664649fb7b3e131802cdd"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer",
-      "Rev": "b63e1e4b3f7d0681e9a6e15bd4729d3014049e4e"
+      "Rev": "d2435b594d2ea04e92a664649fb7b3e131802cdd"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion",
-      "Rev": "b63e1e4b3f7d0681e9a6e15bd4729d3014049e4e"
+      "Rev": "d2435b594d2ea04e92a664649fb7b3e131802cdd"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
-      "Rev": "b63e1e4b3f7d0681e9a6e15bd4729d3014049e4e"
+      "Rev": "d2435b594d2ea04e92a664649fb7b3e131802cdd"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
-      "Rev": "b63e1e4b3f7d0681e9a6e15bd4729d3014049e4e"
+      "Rev": "d2435b594d2ea04e92a664649fb7b3e131802cdd"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/validation",
-      "Rev": "b63e1e4b3f7d0681e9a6e15bd4729d3014049e4e"
+      "Rev": "d2435b594d2ea04e92a664649fb7b3e131802cdd"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1alpha1",
-      "Rev": "b63e1e4b3f7d0681e9a6e15bd4729d3014049e4e"
+      "Rev": "d2435b594d2ea04e92a664649fb7b3e131802cdd"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/conversion",
-      "Rev": "b63e1e4b3f7d0681e9a6e15bd4729d3014049e4e"
+      "Rev": "d2435b594d2ea04e92a664649fb7b3e131802cdd"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
-      "Rev": "b63e1e4b3f7d0681e9a6e15bd4729d3014049e4e"
+      "Rev": "d2435b594d2ea04e92a664649fb7b3e131802cdd"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/conversion/unstructured",
-      "Rev": "b63e1e4b3f7d0681e9a6e15bd4729d3014049e4e"
+      "Rev": "d2435b594d2ea04e92a664649fb7b3e131802cdd"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/fields",
-      "Rev": "b63e1e4b3f7d0681e9a6e15bd4729d3014049e4e"
+      "Rev": "d2435b594d2ea04e92a664649fb7b3e131802cdd"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/labels",
-      "Rev": "b63e1e4b3f7d0681e9a6e15bd4729d3014049e4e"
+      "Rev": "d2435b594d2ea04e92a664649fb7b3e131802cdd"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/runtime",
-      "Rev": "b63e1e4b3f7d0681e9a6e15bd4729d3014049e4e"
+      "Rev": "d2435b594d2ea04e92a664649fb7b3e131802cdd"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
-      "Rev": "b63e1e4b3f7d0681e9a6e15bd4729d3014049e4e"
+      "Rev": "d2435b594d2ea04e92a664649fb7b3e131802cdd"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
-      "Rev": "b63e1e4b3f7d0681e9a6e15bd4729d3014049e4e"
+      "Rev": "d2435b594d2ea04e92a664649fb7b3e131802cdd"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
-      "Rev": "b63e1e4b3f7d0681e9a6e15bd4729d3014049e4e"
+      "Rev": "d2435b594d2ea04e92a664649fb7b3e131802cdd"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
-      "Rev": "b63e1e4b3f7d0681e9a6e15bd4729d3014049e4e"
+      "Rev": "d2435b594d2ea04e92a664649fb7b3e131802cdd"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
-      "Rev": "b63e1e4b3f7d0681e9a6e15bd4729d3014049e4e"
+      "Rev": "d2435b594d2ea04e92a664649fb7b3e131802cdd"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
-      "Rev": "b63e1e4b3f7d0681e9a6e15bd4729d3014049e4e"
+      "Rev": "d2435b594d2ea04e92a664649fb7b3e131802cdd"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
-      "Rev": "b63e1e4b3f7d0681e9a6e15bd4729d3014049e4e"
+      "Rev": "d2435b594d2ea04e92a664649fb7b3e131802cdd"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/selection",
-      "Rev": "b63e1e4b3f7d0681e9a6e15bd4729d3014049e4e"
+      "Rev": "d2435b594d2ea04e92a664649fb7b3e131802cdd"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/types",
-      "Rev": "b63e1e4b3f7d0681e9a6e15bd4729d3014049e4e"
+      "Rev": "d2435b594d2ea04e92a664649fb7b3e131802cdd"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/cache",
-      "Rev": "b63e1e4b3f7d0681e9a6e15bd4729d3014049e4e"
+      "Rev": "d2435b594d2ea04e92a664649fb7b3e131802cdd"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/clock",
-      "Rev": "b63e1e4b3f7d0681e9a6e15bd4729d3014049e4e"
+      "Rev": "d2435b594d2ea04e92a664649fb7b3e131802cdd"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/diff",
-      "Rev": "b63e1e4b3f7d0681e9a6e15bd4729d3014049e4e"
+      "Rev": "d2435b594d2ea04e92a664649fb7b3e131802cdd"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/errors",
-      "Rev": "b63e1e4b3f7d0681e9a6e15bd4729d3014049e4e"
+      "Rev": "d2435b594d2ea04e92a664649fb7b3e131802cdd"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/framer",
-      "Rev": "b63e1e4b3f7d0681e9a6e15bd4729d3014049e4e"
+      "Rev": "d2435b594d2ea04e92a664649fb7b3e131802cdd"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/httpstream",
-      "Rev": "b63e1e4b3f7d0681e9a6e15bd4729d3014049e4e"
+      "Rev": "d2435b594d2ea04e92a664649fb7b3e131802cdd"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
-      "Rev": "b63e1e4b3f7d0681e9a6e15bd4729d3014049e4e"
+      "Rev": "d2435b594d2ea04e92a664649fb7b3e131802cdd"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/json",
-      "Rev": "b63e1e4b3f7d0681e9a6e15bd4729d3014049e4e"
+      "Rev": "d2435b594d2ea04e92a664649fb7b3e131802cdd"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
-      "Rev": "b63e1e4b3f7d0681e9a6e15bd4729d3014049e4e"
+      "Rev": "d2435b594d2ea04e92a664649fb7b3e131802cdd"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/net",
-      "Rev": "b63e1e4b3f7d0681e9a6e15bd4729d3014049e4e"
+      "Rev": "d2435b594d2ea04e92a664649fb7b3e131802cdd"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/proxy",
-      "Rev": "b63e1e4b3f7d0681e9a6e15bd4729d3014049e4e"
+      "Rev": "d2435b594d2ea04e92a664649fb7b3e131802cdd"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/rand",
-      "Rev": "b63e1e4b3f7d0681e9a6e15bd4729d3014049e4e"
+      "Rev": "d2435b594d2ea04e92a664649fb7b3e131802cdd"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
-      "Rev": "b63e1e4b3f7d0681e9a6e15bd4729d3014049e4e"
+      "Rev": "d2435b594d2ea04e92a664649fb7b3e131802cdd"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/sets",
-      "Rev": "b63e1e4b3f7d0681e9a6e15bd4729d3014049e4e"
+      "Rev": "d2435b594d2ea04e92a664649fb7b3e131802cdd"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
-      "Rev": "b63e1e4b3f7d0681e9a6e15bd4729d3014049e4e"
+      "Rev": "d2435b594d2ea04e92a664649fb7b3e131802cdd"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/uuid",
-      "Rev": "b63e1e4b3f7d0681e9a6e15bd4729d3014049e4e"
+      "Rev": "d2435b594d2ea04e92a664649fb7b3e131802cdd"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/validation",
-      "Rev": "b63e1e4b3f7d0681e9a6e15bd4729d3014049e4e"
+      "Rev": "d2435b594d2ea04e92a664649fb7b3e131802cdd"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
-      "Rev": "b63e1e4b3f7d0681e9a6e15bd4729d3014049e4e"
+      "Rev": "d2435b594d2ea04e92a664649fb7b3e131802cdd"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/wait",
-      "Rev": "b63e1e4b3f7d0681e9a6e15bd4729d3014049e4e"
+      "Rev": "d2435b594d2ea04e92a664649fb7b3e131802cdd"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
-      "Rev": "b63e1e4b3f7d0681e9a6e15bd4729d3014049e4e"
+      "Rev": "d2435b594d2ea04e92a664649fb7b3e131802cdd"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/version",
-      "Rev": "b63e1e4b3f7d0681e9a6e15bd4729d3014049e4e"
+      "Rev": "d2435b594d2ea04e92a664649fb7b3e131802cdd"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/watch",
-      "Rev": "b63e1e4b3f7d0681e9a6e15bd4729d3014049e4e"
+      "Rev": "d2435b594d2ea04e92a664649fb7b3e131802cdd"
    },
    {
      "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
-      "Rev": "b63e1e4b3f7d0681e9a6e15bd4729d3014049e4e"
+      "Rev": "d2435b594d2ea04e92a664649fb7b3e131802cdd"
    },
    {
      "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil",
-      "Rev": "b63e1e4b3f7d0681e9a6e15bd4729d3014049e4e"
+      "Rev": "d2435b594d2ea04e92a664649fb7b3e131802cdd"
    },
    {
      "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
-      "Rev": "b63e1e4b3f7d0681e9a6e15bd4729d3014049e4e"
+      "Rev": "d2435b594d2ea04e92a664649fb7b3e131802cdd"
    },
    {
      "ImportPath": "k8s.io/client-go/discovery",
--- a/pkg/endpoints/handlers/responsewriters/errors_test.go
+++ b/pkg/endpoints/handlers/responsewriters/errors_test.go
@ -68,13 +68,15 @@ func TestForbidden(t *testing.T) {
 		reason      string
 		contentType string
 	}{
-		{`{"metadata":{},"status":"Failure","message":" \"\" is forbidden: User \"NAME\" cannot GET path \"/whatever\".","reason":"Forbidden","details":{},"code":403}
+		{`{"metadata":{},"status":"Failure","message":"forbidden: User \"NAME\" cannot GET path \"/whatever\".","reason":"Forbidden","details":{},"code":403}
 `, authorizer.AttributesRecord{User: u, Verb: "GET", Path: "/whatever"}, "", "application/json"},
-		{`{"metadata":{},"status":"Failure","message":" \"\" is forbidden: User \"NAME\" cannot GET path \"/\u0026lt;script\u0026gt;\".","reason":"Forbidden","details":{},"code":403}
+		{`{"metadata":{},"status":"Failure","message":"forbidden: User \"NAME\" cannot GET path \"/\u0026lt;script\u0026gt;\".","reason":"Forbidden","details":{},"code":403}
 `, authorizer.AttributesRecord{User: u, Verb: "GET", Path: "/<script>"}, "", "application/json"},
-		{`{"metadata":{},"status":"Failure","message":"pod \"\" is forbidden: User \"NAME\" cannot GET pod at the cluster scope.","reason":"Forbidden","details":{"kind":"pod"},"code":403}
+		{`{"metadata":{},"status":"Failure","message":"pod is forbidden: User \"NAME\" cannot GET pod at the cluster scope.","reason":"Forbidden","details":{"kind":"pod"},"code":403}
 `, authorizer.AttributesRecord{User: u, Verb: "GET", Resource: "pod", ResourceRequest: true}, "", "application/json"},
-		{`{"metadata":{},"status":"Failure","message":"pod.v2 \"\" is forbidden: User \"NAME\" cannot GET pod.v2/quota in the namespace \"test\".","reason":"Forbidden","details":{"group":"v2","kind":"pod"},"code":403}
+		{`{"metadata":{},"status":"Failure","message":"pod \"mypod\" is forbidden: User \"NAME\" cannot GET pod at the cluster scope.","reason":"Forbidden","details":{"name":"mypod","kind":"pod"},"code":403}
+`, authorizer.AttributesRecord{User: u, Verb: "GET", Resource: "pod", ResourceRequest: true, Name: "mypod"}, "", "application/json"},
+		{`{"metadata":{},"status":"Failure","message":"pod.v2 is forbidden: User \"NAME\" cannot GET pod.v2/quota in the namespace \"test\".","reason":"Forbidden","details":{"group":"v2","kind":"pod"},"code":403}
 `, authorizer.AttributesRecord{User: u, Verb: "GET", Namespace: "test", APIGroup: "v2", Resource: "pod", Subresource: "quota", ResourceRequest: true}, "", "application/json"},
 	}
 	for _, test := range cases {