[backport 3.4]: server/auth: enable tokenProvider if recoved store en…

…ables auth this is a manual backport of etcd-io#13172
tjungblu · Sep 8, 2022 · fc976c7 · fc976c7
1 parent 4ebab56
commit fc976c7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/auth/simple_token.go b/auth/simple_token.go
@@ -159,6 +159,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/auth/store.go b/auth/store.go
@@ -400,6 +400,9 @@ func (as *authStore) Recover(be backend.Backend) {
 
 	as.enabledMu.Lock()
 	as.enabled = enabled
+	if enabled {
+		as.tokenProvider.enable()
+	}
 	as.enabledMu.Unlock()
 }