Archives/Cloak
2
0
Fork 0
mirror of https://github.com/cbeuw/Cloak.git synced 2024-11-15 18:13:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix a deadlock on terminating user

Browse Source
This commit is contained in:
Andy Wang 2020-04-24 01:05:37 +01:00
parent e508ade14b
commit 2e945cc416
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
internal/server/userpanel.go
View File

@ -1,6 +1,7 @@
package server package server
import ( import (
"encoding/base64"
"github.com/cbeuw/Cloak/internal/server/usermanager" "github.com/cbeuw/Cloak/internal/server/usermanager"
"sync" "sync"
"sync/atomic" "sync/atomic"
@ -79,6 +80,10 @@ func (panel *userPanel) GetUser(UID []byte) (*ActiveUser, error) {
// TerminateActiveUser terminates a user and deletes its references // TerminateActiveUser terminates a user and deletes its references
func (panel *userPanel) TerminateActiveUser(user *ActiveUser, reason string) { func (panel *userPanel) TerminateActiveUser(user *ActiveUser, reason string) {
log.WithFields(log.Fields{
"UID": base64.StdEncoding.EncodeToString(user.arrUID[:]),
"reason": reason,
}).Info("forcefully terminating user")
panel.updateUsageQueueForOne(user) panel.updateUsageQueueForOne(user)
user.closeAllSessions(reason) user.closeAllSessions(reason)
panel.activeUsersM.Lock() panel.activeUsersM.Lock()
@ -147,7 +152,6 @@ func (panel *userPanel) updateUsageQueueForOne(user *ActiveUser) {
// and act to each user according to the responses // and act to each user according to the responses
func (panel *userPanel) commitUpdate() error { func (panel *userPanel) commitUpdate() error {
panel.usageUpdateQueueM.Lock() panel.usageUpdateQueueM.Lock()
defer panel.usageUpdateQueueM.Unlock()
statuses := make([]usermanager.StatusUpdate, 0, len(panel.usageUpdateQueue)) statuses := make([]usermanager.StatusUpdate, 0, len(panel.usageUpdateQueue))
for arrUID, usage := range panel.usageUpdateQueue { for arrUID, usage := range panel.usageUpdateQueue {
panel.activeUsersM.RLock() panel.activeUsersM.RLock()
@ -155,6 +159,9 @@ func (panel *userPanel) commitUpdate() error {
panel.activeUsersM.RUnlock() panel.activeUsersM.RUnlock()
var numSession int var numSession int
if user != nil { if user != nil {
if user.bypass {
continue
}
numSession = user.NumSession() numSession = user.NumSession()
} }
status := usermanager.StatusUpdate{ status := usermanager.StatusUpdate{
@ -167,6 +174,8 @@ func (panel *userPanel) commitUpdate() error {
} }
statuses = append(statuses, status) statuses = append(statuses, status)
} }
panel.usageUpdateQueue = make(map[[16]byte]*usagePair)
panel.usageUpdateQueueM.Unlock()
responses, err := panel.Manager.UploadStatus(statuses) responses, err := panel.Manager.UploadStatus(statuses)
if err != nil { if err != nil {
@ -185,7 +194,6 @@ func (panel *userPanel) commitUpdate() error {
} }
} }
} }
panel.usageUpdateQueue = make(map[[16]byte]*usagePair)
return nil return nil
} }