Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
this is a manual backport of #13172
This commit is contained in:
cfz 2021-07-11 21:29:04 +08:00
parent c50b7260cc
commit 23e79dbf19
No known key found for this signature in database
GPG Key ID: 557D9FD4346B1312
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
auth/simple_token.go
View File

@ -159,6 +159,11 @@ func (t *tokenSimple) invalidateUser(username string) {
} }
func (t *tokenSimple) enable() { func (t *tokenSimple) enable() {
t.simpleTokensMu.Lock()
defer t.simpleTokensMu.Unlock()
if t.simpleTokenKeeper != nil { // already enabled
return
}
if t.simpleTokenTTL <= 0 { if t.simpleTokenTTL <= 0 {
t.simpleTokenTTL = simpleTokenTTLDefault t.simpleTokenTTL = simpleTokenTTLDefault
} }

3
auth/store.go
View File

@ -400,6 +400,9 @@ func (as *authStore) Recover(be backend.Backend) {
as.enabledMu.Lock() as.enabledMu.Lock()
as.enabled = enabled as.enabled = enabled
if enabled {
as.tokenProvider.enable()
}
as.enabledMu.Unlock() as.enabledMu.Unlock()
} }