Merge pull request #1681 from replicatedhq/divolgin/logout

fix deadlock in logout handler
replicatedhq · Mar 29, 2021 · 33329bd · 33329bd
2 parents ce6f8ae + 9908b4a
commit 33329bd
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/pkg/store/kotsstore/session_store.go b/pkg/store/kotsstore/session_store.go
@@ -173,16 +173,17 @@ func (s *KOTSStore) GetSession(id string) (*sessiontypes.Session, error) {
 
 func (s *KOTSStore) DeleteSession(id string) error {
 	sessionLock.Lock()
-	defer sessionLock.Unlock()
-
 	s.sessionSecret = nil
+	sessionLock.Unlock()
 
 	secret, err := s.getSessionSecret()
 	if err != nil {
 		return errors.Wrap(err, "failed to get session secret")
 	}
 
+	sessionLock.Lock()
 	delete(secret.Data, id)
+	sessionLock.Unlock()
 
 	if err := s.updateSessionSecret(secret); err != nil {
 		return errors.Wrap(err, "failed to update session secret")