Skip to content

agent: fix three races that closing clients on a network change makes reachable #1928

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Narasimha-sc wants to merge 1 commit into from
Closed

agent: fix three races that closing clients on a network change makes reachable #1928

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions src/Simplex/Messaging/Agent/Client.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -781,7 +781,9 @@ smpConnectClient c@AgentClient {smpClients, msgQ, proxySessTs, presetDomains} nm
when current $ updateClientService service smp
pure SMPConnectedClient {connectedClient = smp, proxiedRelays = prs}
updateClientService service smp = case (service, smpClientServiceId smp) of
(Just (_, serviceId_), Just serviceId) -> withStore' c $ \db -> do
(Just _, Just serviceId) -> withStore' c $ \db -> do
-- the id read before the handshake can be stale - this transaction can commit after another client's
serviceId_ <- (>>= snd) <$> getClientServiceCredentials db userId srv
setClientServiceId db userId srv serviceId
forM_ serviceId_ $ \sId -> when (sId /= serviceId) $ removeRcvServiceAssocs db userId srv
(Just _, Nothing) -> withStore' c $ \db -> deleteClientService db userId srv -- e.g., server version downgrade
Expand All @@ -807,9 +809,11 @@ smpClientDisconnected c@AgentClient {active, smpClients, smpProxiedRelays} tSess
(subs, serviceSub_) <- SS.setSubsPending mode tSess sessId $ currentSubs c
let qs = M.elems subs
cs = nubOrd $ map qConnId qs
-- this removes proxied relays that this client created sessions to
destSrvs <- M.keys <$> readTVar prs
forM_ destSrvs $ \destSrv -> TM.delete (userId, destSrv, cId) smpProxiedRelays
-- this removes proxied relays that this client created sessions to, unless another client
-- replaced this one, e.g. when the network changed - those sessions are now its sessions
unlessM (TM.member tSess smpClients) $ do
destSrvs <- M.keys <$> readTVar prs
forM_ destSrvs $ \destSrv -> TM.delete (userId, destSrv, cId) smpProxiedRelays
pure (qs, cs, serviceSub_)

serverDown :: ([RcvQueueSub], [ConnId], Maybe ServiceSub) -> IO ()
Expand Down
4 changes: 3 additions & 1 deletion src/Simplex/Messaging/Agent/TSessionSubs.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,9 @@ setSubsPending mode tSess@(uId, srv, connId_) sessId tss@(TSessionSubs ss)
| entitySession == isJust connId_ =
TM.lookup tSess ss >>= withSessSubs (`setSubsPending_` Nothing)
| otherwise =
TM.lookupDelete tSess ss >>= withSessSubs setPendingChangeMode
-- the subscriptions are removed only when the session matches - a client that is no longer
-- the one in the map never set its session id, and its disconnection must not remove them
TM.lookup tSess ss >>= withSessSubs (\s -> TM.delete tSess ss >> setPendingChangeMode s)
where
entitySession = mode == TSMEntity
sessEntId = if entitySession then Just else const Nothing
Expand Down
Loading