sigb.us/dendrite
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases 1 Wiki Activity

Maybe fix concurrent map write

Browse source
This commit is contained in:
Neil Alexander 2022-08-02 16:33:20 +01:00
parent 060b54add9
commit da0dbb8362
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
keyserver/internal/internal.go
View file

@ -430,23 +430,28 @@ func (a *KeyInternalAPI) queryRemoteKeys(
for result := range resultCh { for result := range resultCh {
for userID, nest := range result.DeviceKeys { for userID, nest := range result.DeviceKeys {
respMu.Lock()
res.DeviceKeys[userID] = make(map[string]json.RawMessage) res.DeviceKeys[userID] = make(map[string]json.RawMessage)
respMu.Unlock()
for deviceID, deviceKey := range nest { for deviceID, deviceKey := range nest {
keyJSON, err := json.Marshal(deviceKey) keyJSON, err := json.Marshal(deviceKey)
if err != nil { if err != nil {
continue continue
} }
respMu.Lock()
res.DeviceKeys[userID][deviceID] = keyJSON res.DeviceKeys[userID][deviceID] = keyJSON
respMu.Unlock()
} }
} }
respMu.Lock()
for userID, body := range result.MasterKeys { for userID, body := range result.MasterKeys {
res.MasterKeys[userID] = body res.MasterKeys[userID] = body
} }
for userID, body := range result.SelfSigningKeys { for userID, body := range result.SelfSigningKeys {
res.SelfSigningKeys[userID] = body res.SelfSigningKeys[userID] = body
} }
respMu.Unlock()
// TODO: do we want to persist these somewhere now // TODO: do we want to persist these somewhere now
// that we have fetched them? // that we have fetched them?
@ -520,7 +525,10 @@ func (a *KeyInternalAPI) queryRemoteKeysOnServer(
resultCh <- &queryKeysResp resultCh <- &queryKeysResp
return return
} }
respMu.Lock() respMu.Lock()
defer respMu.Unlock()
res.Failures[serverName] = map[string]interface{}{ res.Failures[serverName] = map[string]interface{}{
"message": err.Error(), "message": err.Error(),
} }
@ -537,8 +545,6 @@ func (a *KeyInternalAPI) queryRemoteKeysOnServer(
if len(res.DeviceKeys) > 0 { if len(res.DeviceKeys) > 0 {
delete(res.Failures, serverName) delete(res.Failures, serverName)
} }
respMu.Unlock()
} }
func (a *KeyInternalAPI) populateResponseWithDeviceKeysFromDatabase( func (a *KeyInternalAPI) populateResponseWithDeviceKeysFromDatabase(