From 1fc259d655349b5ac43e0c54fb4b0676d580ec89 Mon Sep 17 00:00:00 2001
From: CFC4N <cfc4n@cnxct.com>
Date: Mon, 17 Aug 2020 21:40:31 +0800
Subject: [PATCH] etcdserver: check authinfo if it is not
 InternalAuthenticateRequest.

Signed-off-by: Chao Chen <chaochn@amazon.com>
---
 etcdserver/v3_server.go | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/etcdserver/v3_server.go b/etcdserver/v3_server.go
index 221e2b779..955399fc8 100644
--- a/etcdserver/v3_server.go
+++ b/etcdserver/v3_server.go
@@ -703,13 +703,16 @@ func (s *EtcdServer) processInternalRaftRequestOnce(ctx context.Context, r pb.In
 		ID: s.reqIDGen.Next(),
 	}
 
-	authInfo, err := s.AuthInfoFromCtx(ctx)
-	if err != nil {
-		return nil, err
-	}
-	if authInfo != nil {
-		r.Header.Username = authInfo.Username
-		r.Header.AuthRevision = authInfo.Revision
+	// check authinfo if it is not InternalAuthenticateRequest
+	if r.Authenticate == nil {
+		authInfo, err := s.AuthInfoFromCtx(ctx)
+		if err != nil {
+			return nil, err
+		}
+		if authInfo != nil {
+			r.Header.Username = authInfo.Username
+			r.Header.AuthRevision = authInfo.Revision
+		}
 	}
 
 	data, err := r.Marshal()