Merge pull request #13205 from cfz/cherry-pick-#13172

[backport 3.5]: server/auth: enable tokenProvider if recoved store enables auth
etcd-io · May 6, 2022 · b57881a · b57881a
2 parents 8453b10 + cceb25d
commit b57881a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/server/auth/simple_token.go b/server/auth/simple_token.go
@@ -156,6 +156,11 @@ func (t *tokenSimple) invalidateUser(username string) {
 }
 
 func (t *tokenSimple) enable() {
+	t.simpleTokensMu.Lock()
+	defer t.simpleTokensMu.Unlock()
+	if t.simpleTokenKeeper != nil { // already enabled
+		return
+	}
 	if t.simpleTokenTTL <= 0 {
 		t.simpleTokenTTL = simpleTokenTTLDefault
 	}

diff --git a/server/auth/store.go b/server/auth/store.go
@@ -368,6 +368,9 @@ func (as *authStore) Recover(be backend.Backend) {
 
 	as.enabledMu.Lock()
 	as.enabled = enabled
+	if enabled {
+		as.tokenProvider.enable()
+	}
 	as.enabledMu.Unlock()
 }