dandri/simplex-chat
1
0
Fork 0
mirror of https://github.com/simplex-chat/simplex-chat.git synced 2026-07-20 22:11:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

core (pq): global flag only affects new connections; api to allow PQ in old contacts (#3869)

Browse Source
This commit is contained in:
spaced4ndy
2024-03-06 19:06:01 +04:00
committed by GitHub
parent 64dc758ffd
commit 61a3eb32ee
4 changed files with 36 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Simplex/Chat.hs
+22 -17
View File
@@ -601,6 +601,18 @@ processChatCommand' vr = \case
APISetPQEnabled onOff -> do
asks pqExperimentalEnabled >>= atomically . (`writeTVar` onOff)
ok_
APIAllowContactPQ contactId -> withUser $ \user -> do
ct@Contact {activeConn} <- withStore $ \db -> getContact db user contactId
-- TODO PQ check different flag?
case activeConn of
Just conn@Connection {connId, enablePQ}
| enablePQ -> pure $ chatCmdError (Just user) "already allowed"
| otherwise -> do
withStore' $ \db -> allowConnEnablePQ db connId
let conn' = conn {enablePQ = True} :: Connection
ct' = ct {activeConn = Just conn'} :: Contact
pure $ CRContactPQAllowed user ct'
Nothing -> throwChatError $ CEContactNotActive ct
APIExportArchive cfg -> checkChatStopped $ exportArchive cfg >> ok_
ExportArchive -> do
ts <- liftIO getCurrentTime
@@ -1294,9 +1306,8 @@ processChatCommand' vr = \case
APISyncContactRatchet contactId force -> withUser $ \user -> withChatLock "syncContactRatchet" $ do
ct <- withStore $ \db -> getContact db user contactId
case contactConn ct of
Just conn -> do
enablePQ <- contactPQEnc conn
cStats@ConnectionStats {ratchetSyncState = rss} <- withAgent $ \a -> synchronizeRatchet a (aConnId conn) enablePQ force
Just conn@Connection {enablePQ} -> do
cStats@ConnectionStats {ratchetSyncState = rss} <- withAgent $ \a -> synchronizeRatchet a (aConnId conn) (CR.PQEncryption enablePQ) force
createInternalChatItem user (CDDirectSnd ct) (CISndConnEvent $ SCERatchetSync rss Nothing) Nothing
pure $ CRContactRatchetSyncStarted user ct cStats
Nothing -> throwChatError $ CEContactNotActive ct
@@ -2201,8 +2212,7 @@ processChatCommand' vr = \case
Nothing -> pure $ UserProfileUpdateSummary 0 0 []
Just changedCts -> do
let idsEvts = L.map ctSndMsg changedCts
enablePQ <- readTVarIO =<< asks pqExperimentalEnabled
msgReqs_ <- L.zipWith (ctMsgReq enablePQ) changedCts <$> createSndMessages idsEvts
msgReqs_ <- L.zipWith ctMsgReq changedCts <$> createSndMessages idsEvts
(errs, cts) <- partitionEithers . L.toList . L.zipWith (second . const) changedCts <$> deliverMessagesB msgReqs_
unless (null errs) $ toView $ CRChatErrors (Just user) errs
let changedCts' = filter (\ChangedProfileContact {ct, ct'} -> directOrUsed ct' && mergedPreferences ct' /= mergedPreferences ct) cts
@@ -2227,11 +2237,11 @@ processChatCommand' vr = \case
ct' = updateMergedPreferences user' ct
mergedProfile' = userProfileToSend user' Nothing (Just ct') False
ctSndMsg :: ChangedProfileContact -> (ConnOrGroupId, PQEncryption, ChatMsgEvent 'Json)
ctSndMsg ChangedProfileContact {mergedProfile', conn = Connection {connId, enablePQ = enablePQConn}} = (ConnectionId connId, CR.PQEncryption enablePQConn, XInfo mergedProfile')
ctMsgReq :: PQFlag -> ChangedProfileContact -> Either ChatError SndMessage -> Either ChatError MsgReq
ctMsgReq enablePQ ChangedProfileContact {conn = conn@Connection {enablePQ = enablePQConn}} =
ctSndMsg ChangedProfileContact {mergedProfile', conn = Connection {connId, enablePQ}} = (ConnectionId connId, CR.PQEncryption enablePQ, XInfo mergedProfile')
ctMsgReq :: ChangedProfileContact -> Either ChatError SndMessage -> Either ChatError MsgReq
ctMsgReq ChangedProfileContact {conn = conn@Connection {enablePQ}} =
fmap $ \SndMessage {msgId, msgBody} ->
(conn, CR.PQEncryption $ enablePQ && enablePQConn, MsgFlags {notification = hasNotification XInfo_}, msgBody, msgId)
(conn, CR.PQEncryption enablePQ, MsgFlags {notification = hasNotification XInfo_}, msgBody, msgId)
updateContactPrefs :: User -> Contact -> Preferences -> m ChatResponse
updateContactPrefs _ ct@Contact {activeConn = Nothing} _ = throwChatError $ CEContactNotActive ct
updateContactPrefs user@User {userId} ct@Contact {activeConn = Just Connection {customUserProfileId}, userPreferences = contactUserPrefs} contactUserPrefs'
@@ -6007,9 +6017,8 @@ deleteOrUpdateMemberRecord user@User {userId} member =
sendDirectContactMessage :: (MsgEncodingI e, ChatMonad m) => User -> Contact -> ChatMsgEvent e -> m (SndMessage, Int64)
sendDirectContactMessage user ct chatMsgEvent = do
conn@Connection {connId} <- liftEither $ contactSendConn_ ct
pqEnc <- contactPQEnc conn
r <- sendDirectMessage conn pqEnc chatMsgEvent (ConnectionId connId)
conn@Connection {connId, enablePQ} <- liftEither $ contactSendConn_ ct
r <- sendDirectMessage conn (CR.PQEncryption enablePQ) chatMsgEvent (ConnectionId connId)
let (sndMessage, msgDeliveryId, CR.PQEncryption pqEnabled') = r
-- TODO PQ use updated ct' and conn'? check downstream if it may affect something, maybe it's not necessary
(_ct', _conn') <- createContactPQSndItem user ct conn pqEnabled'
@@ -6120,11 +6129,6 @@ deliverMessage' conn pqEnc msgFlags msgBody msgId =
type MsgReq = (Connection, CR.PQEncryption, MsgFlags, MsgBody, MessageId)
contactPQEnc :: ChatMonad m => Connection -> m CR.PQEncryption
contactPQEnc Connection {enablePQ = enablePQConn} = do
enablePQ <- readTVarIO =<< asks pqExperimentalEnabled
pure $ CR.PQEncryption $ enablePQ && enablePQConn
deliverMessages :: ChatMonad' m => NonEmpty MsgReq -> m (NonEmpty (Either ChatError (Int64, CR.PQEncryption)))
deliverMessages msgs = deliverMessagesB $ L.map Right msgs
@@ -6708,6 +6712,7 @@ chatCommandP =
"/_files_encrypt " *> (APISetEncryptLocalFiles <$> onOffP),
"/contact_merge " *> (SetContactMergeEnabled <$> onOffP),
"/_pq " *> (APISetPQEnabled <$> onOffP),
"/_pq allow " *> (APIAllowContactPQ <$> A.decimal),
"/_db export " *> (APIExportArchive <$> jsonP),
"/db export" $> ExportArchive,
"/_db import " *> (APIImportArchive <$> jsonP),