kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #73595 from liggitt/authn-message 

Preserve authentication webhook error message, deduplicate aggregated errors when printing

Kubernetes-commit: 4992402fa5bee9f7ac6fe931d101d362a4295cea
This commit is contained in:
Kubernetes Publisher 2019-02-05 00:24:00 -08:00
parent ff64181663 4e95d8b8ee
commit 190756685c
2 changed files with 59 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
Godeps/Godeps.json generated
View File

@ -1072,215 +1072,215 @@
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting",
"Rev": "615495ca8cddee7160e9983067a972e8dd572929"
"Rev": "4b4ea28f279089e0cfafcc2d47479a5bd1a0964f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting/fuzzer",
"Rev": "615495ca8cddee7160e9983067a972e8dd572929"
"Rev": "4b4ea28f279089e0cfafcc2d47479a5bd1a0964f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting/roundtrip",
"Rev": "615495ca8cddee7160e9983067a972e8dd572929"
"Rev": "4b4ea28f279089e0cfafcc2d47479a5bd1a0964f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/equality",
"Rev": "615495ca8cddee7160e9983067a972e8dd572929"
"Rev": "4b4ea28f279089e0cfafcc2d47479a5bd1a0964f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/errors",
"Rev": "615495ca8cddee7160e9983067a972e8dd572929"
"Rev": "4b4ea28f279089e0cfafcc2d47479a5bd1a0964f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/meta",
"Rev": "615495ca8cddee7160e9983067a972e8dd572929"
"Rev": "4b4ea28f279089e0cfafcc2d47479a5bd1a0964f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/resource",
"Rev": "615495ca8cddee7160e9983067a972e8dd572929"
"Rev": "4b4ea28f279089e0cfafcc2d47479a5bd1a0964f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/validation",
"Rev": "615495ca8cddee7160e9983067a972e8dd572929"
"Rev": "4b4ea28f279089e0cfafcc2d47479a5bd1a0964f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/validation/path",
"Rev": "615495ca8cddee7160e9983067a972e8dd572929"
"Rev": "4b4ea28f279089e0cfafcc2d47479a5bd1a0964f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer",
"Rev": "615495ca8cddee7160e9983067a972e8dd572929"
"Rev": "4b4ea28f279089e0cfafcc2d47479a5bd1a0964f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion",
"Rev": "615495ca8cddee7160e9983067a972e8dd572929"
"Rev": "4b4ea28f279089e0cfafcc2d47479a5bd1a0964f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
"Rev": "615495ca8cddee7160e9983067a972e8dd572929"
"Rev": "4b4ea28f279089e0cfafcc2d47479a5bd1a0964f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
"Rev": "615495ca8cddee7160e9983067a972e8dd572929"
"Rev": "4b4ea28f279089e0cfafcc2d47479a5bd1a0964f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/validation",
"Rev": "615495ca8cddee7160e9983067a972e8dd572929"
"Rev": "4b4ea28f279089e0cfafcc2d47479a5bd1a0964f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1",
"Rev": "615495ca8cddee7160e9983067a972e8dd572929"
"Rev": "4b4ea28f279089e0cfafcc2d47479a5bd1a0964f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/conversion",
"Rev": "615495ca8cddee7160e9983067a972e8dd572929"
"Rev": "4b4ea28f279089e0cfafcc2d47479a5bd1a0964f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
"Rev": "615495ca8cddee7160e9983067a972e8dd572929"
"Rev": "4b4ea28f279089e0cfafcc2d47479a5bd1a0964f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/fields",
"Rev": "615495ca8cddee7160e9983067a972e8dd572929"
"Rev": "4b4ea28f279089e0cfafcc2d47479a5bd1a0964f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/labels",
"Rev": "615495ca8cddee7160e9983067a972e8dd572929"
"Rev": "4b4ea28f279089e0cfafcc2d47479a5bd1a0964f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime",
"Rev": "615495ca8cddee7160e9983067a972e8dd572929"
"Rev": "4b4ea28f279089e0cfafcc2d47479a5bd1a0964f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
"Rev": "615495ca8cddee7160e9983067a972e8dd572929"
"Rev": "4b4ea28f279089e0cfafcc2d47479a5bd1a0964f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
"Rev": "615495ca8cddee7160e9983067a972e8dd572929"
"Rev": "4b4ea28f279089e0cfafcc2d47479a5bd1a0964f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
"Rev": "615495ca8cddee7160e9983067a972e8dd572929"
"Rev": "4b4ea28f279089e0cfafcc2d47479a5bd1a0964f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
"Rev": "615495ca8cddee7160e9983067a972e8dd572929"
"Rev": "4b4ea28f279089e0cfafcc2d47479a5bd1a0964f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
"Rev": "615495ca8cddee7160e9983067a972e8dd572929"
"Rev": "4b4ea28f279089e0cfafcc2d47479a5bd1a0964f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
"Rev": "615495ca8cddee7160e9983067a972e8dd572929"
"Rev": "4b4ea28f279089e0cfafcc2d47479a5bd1a0964f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
"Rev": "615495ca8cddee7160e9983067a972e8dd572929"
"Rev": "4b4ea28f279089e0cfafcc2d47479a5bd1a0964f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/selection",
"Rev": "615495ca8cddee7160e9983067a972e8dd572929"
"Rev": "4b4ea28f279089e0cfafcc2d47479a5bd1a0964f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/types",
"Rev": "615495ca8cddee7160e9983067a972e8dd572929"
"Rev": "4b4ea28f279089e0cfafcc2d47479a5bd1a0964f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/cache",
"Rev": "615495ca8cddee7160e9983067a972e8dd572929"
"Rev": "4b4ea28f279089e0cfafcc2d47479a5bd1a0964f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/clock",
"Rev": "615495ca8cddee7160e9983067a972e8dd572929"
"Rev": "4b4ea28f279089e0cfafcc2d47479a5bd1a0964f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/diff",
"Rev": "615495ca8cddee7160e9983067a972e8dd572929"
"Rev": "4b4ea28f279089e0cfafcc2d47479a5bd1a0964f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/errors",
"Rev": "615495ca8cddee7160e9983067a972e8dd572929"
"Rev": "4b4ea28f279089e0cfafcc2d47479a5bd1a0964f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/framer",
"Rev": "615495ca8cddee7160e9983067a972e8dd572929"
"Rev": "4b4ea28f279089e0cfafcc2d47479a5bd1a0964f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
"Rev": "615495ca8cddee7160e9983067a972e8dd572929"
"Rev": "4b4ea28f279089e0cfafcc2d47479a5bd1a0964f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/json",
"Rev": "615495ca8cddee7160e9983067a972e8dd572929"
"Rev": "4b4ea28f279089e0cfafcc2d47479a5bd1a0964f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
"Rev": "615495ca8cddee7160e9983067a972e8dd572929"
"Rev": "4b4ea28f279089e0cfafcc2d47479a5bd1a0964f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/naming",
"Rev": "615495ca8cddee7160e9983067a972e8dd572929"
"Rev": "4b4ea28f279089e0cfafcc2d47479a5bd1a0964f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/net",
"Rev": "615495ca8cddee7160e9983067a972e8dd572929"
"Rev": "4b4ea28f279089e0cfafcc2d47479a5bd1a0964f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/rand",
"Rev": "615495ca8cddee7160e9983067a972e8dd572929"
"Rev": "4b4ea28f279089e0cfafcc2d47479a5bd1a0964f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
"Rev": "615495ca8cddee7160e9983067a972e8dd572929"
"Rev": "4b4ea28f279089e0cfafcc2d47479a5bd1a0964f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/sets",
"Rev": "615495ca8cddee7160e9983067a972e8dd572929"
"Rev": "4b4ea28f279089e0cfafcc2d47479a5bd1a0964f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
"Rev": "615495ca8cddee7160e9983067a972e8dd572929"
"Rev": "4b4ea28f279089e0cfafcc2d47479a5bd1a0964f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/uuid",
"Rev": "615495ca8cddee7160e9983067a972e8dd572929"
"Rev": "4b4ea28f279089e0cfafcc2d47479a5bd1a0964f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/validation",
"Rev": "615495ca8cddee7160e9983067a972e8dd572929"
"Rev": "4b4ea28f279089e0cfafcc2d47479a5bd1a0964f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
"Rev": "615495ca8cddee7160e9983067a972e8dd572929"
"Rev": "4b4ea28f279089e0cfafcc2d47479a5bd1a0964f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/wait",
"Rev": "615495ca8cddee7160e9983067a972e8dd572929"
"Rev": "4b4ea28f279089e0cfafcc2d47479a5bd1a0964f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/waitgroup",
"Rev": "615495ca8cddee7160e9983067a972e8dd572929"
"Rev": "4b4ea28f279089e0cfafcc2d47479a5bd1a0964f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
"Rev": "615495ca8cddee7160e9983067a972e8dd572929"
"Rev": "4b4ea28f279089e0cfafcc2d47479a5bd1a0964f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/version",
"Rev": "615495ca8cddee7160e9983067a972e8dd572929"
"Rev": "4b4ea28f279089e0cfafcc2d47479a5bd1a0964f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/watch",
"Rev": "615495ca8cddee7160e9983067a972e8dd572929"
"Rev": "4b4ea28f279089e0cfafcc2d47479a5bd1a0964f"
},
{
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
"Rev": "615495ca8cddee7160e9983067a972e8dd572929"
"Rev": "4b4ea28f279089e0cfafcc2d47479a5bd1a0964f"
},
{
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
"Rev": "615495ca8cddee7160e9983067a972e8dd572929"
"Rev": "4b4ea28f279089e0cfafcc2d47479a5bd1a0964f"
},
{
"ImportPath": "k8s.io/client-go/discovery",

7
plugin/pkg/authenticator/token/webhook/webhook.go
View File

@ -19,6 +19,7 @@ package webhook
import (
"context"
"errors"
"time"
authentication "k8s.io/api/authentication/v1beta1"
@ -120,7 +121,11 @@ func (w *WebhookTokenAuthenticator) AuthenticateToken(ctx context.Context, token
r.Status = result.Status
if !r.Status.Authenticated {
return nil, false, nil
var err error
if len(r.Status.Error) != 0 {
err = errors.New(r.Status.Error)
}
return nil, false, err
}
var extra map[string][]string