mirror of
https://github.com/etcd-io/etcd.git
synced 2024-09-27 06:25:44 +00:00
auth, etcdserver: attaching a fake root token when calling LeaseRevoke
fix LeaseRevoke may fail to apply when authentication is enabled and upgrading cluster from etcd-3.2 to etcd-3.3 (#11691)
This commit is contained in:
parent
b7644ae5f0
commit
6e77b87c06
@ -162,6 +162,9 @@ type AuthStore interface {
|
|||||||
|
|
||||||
// AuthInfoFromTLS gets AuthInfo from TLS info of gRPC's context
|
// AuthInfoFromTLS gets AuthInfo from TLS info of gRPC's context
|
||||||
AuthInfoFromTLS(ctx context.Context) *AuthInfo
|
AuthInfoFromTLS(ctx context.Context) *AuthInfo
|
||||||
|
|
||||||
|
// WithRoot generates and installs a token that can be used as a root credential
|
||||||
|
WithRoot(ctx context.Context) context.Context
|
||||||
}
|
}
|
||||||
|
|
||||||
type TokenProvider interface {
|
type TokenProvider interface {
|
||||||
@ -1070,3 +1073,40 @@ func NewTokenProvider(tokenOpts string, indexWaiter func(uint64) <-chan struct{}
|
|||||||
return nil, ErrInvalidAuthOpts
|
return nil, ErrInvalidAuthOpts
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (as *authStore) WithRoot(ctx context.Context) context.Context {
|
||||||
|
if !as.isAuthEnabled() {
|
||||||
|
return ctx
|
||||||
|
}
|
||||||
|
|
||||||
|
var ctxForAssign context.Context
|
||||||
|
if ts, ok := as.tokenProvider.(*tokenSimple); ok && ts != nil {
|
||||||
|
ctx1 := context.WithValue(ctx, "index", uint64(0))
|
||||||
|
prefix, err := ts.genTokenPrefix()
|
||||||
|
if err != nil {
|
||||||
|
plog.Errorf("failed to generate prefix of internally used token")
|
||||||
|
return ctx
|
||||||
|
}
|
||||||
|
ctxForAssign = context.WithValue(ctx1, "simpleToken", prefix)
|
||||||
|
} else {
|
||||||
|
ctxForAssign = ctx
|
||||||
|
}
|
||||||
|
|
||||||
|
token, err := as.tokenProvider.assign(ctxForAssign, "root", as.Revision())
|
||||||
|
if err != nil {
|
||||||
|
// this must not happen
|
||||||
|
plog.Errorf("failed to assign token for lease revoking: %s", err)
|
||||||
|
return ctx
|
||||||
|
}
|
||||||
|
|
||||||
|
mdMap := map[string]string{
|
||||||
|
"token": token,
|
||||||
|
}
|
||||||
|
tokenMD := metadata.New(mdMap)
|
||||||
|
|
||||||
|
// clean up tls info to ensure using root credential
|
||||||
|
ctx = peer.NewContext(ctx, nil)
|
||||||
|
|
||||||
|
// use "mdIncomingKey{}" since it's called from local etcdserver
|
||||||
|
return metadata.NewIncomingContext(ctx, tokenMD)
|
||||||
|
}
|
||||||
|
|||||||
@ -222,6 +222,9 @@ func (s *EtcdServer) LeaseGrant(ctx context.Context, r *pb.LeaseGrantRequest) (*
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (s *EtcdServer) LeaseRevoke(ctx context.Context, r *pb.LeaseRevokeRequest) (*pb.LeaseRevokeResponse, error) {
|
func (s *EtcdServer) LeaseRevoke(ctx context.Context, r *pb.LeaseRevokeRequest) (*pb.LeaseRevokeResponse, error) {
|
||||||
|
// fix: LeaseRevoke may fail to apply when authentication is enabled and upgrading cluster from etcd-3.2 to etcd-3.3
|
||||||
|
// see https://github.com/etcd-io/etcd/issues/11689
|
||||||
|
ctx = s.authStore.WithRoot(ctx)
|
||||||
resp, err := s.raftRequestOnce(ctx, pb.InternalRaftRequest{LeaseRevoke: r})
|
resp, err := s.raftRequestOnce(ctx, pb.InternalRaftRequest{LeaseRevoke: r})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user