android-apps-mirrors/SimpleX-Chat
0
0
Fork 0
mirror of https://github.com/simplex-chat/simplex-chat.git synced 2025-06-29 20:59:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

core: terminate remote control TLS connection on both sides (#3338)

Browse source 
* handle session setup errors

* add command/async wrapper

* move furniture around

* detect disconnects and force them with closeConnection

* simplify http server log

* close TLS in other cases

---------

Co-authored-by: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com>
This commit is contained in:
Alexander Bondarenko 2023-11-10 00:43:44 +02:00 • committed by GitHub
parent 6d4febb669
commit f41861c026
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 47 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

22
tests/RemoteTests.hs
View file

@ -34,8 +34,8 @@ import UnliftIO.Directory
remoteTests :: SpecWith FilePath
remoteTests = describe "Remote" $ do
describe "protocol handshake" $ do
it "connects with new pairing" remoteHandshakeTest
it "connects with new pairing (again)" remoteHandshakeTest -- leaking servers regression check
it "connects with new pairing (stops mobile)" $ remoteHandshakeTest False
it "connects with new pairing (stops desktop)" $ remoteHandshakeTest True
it "connects with stored pairing" remoteHandshakeStoredTest
it "sends messages" remoteMessageTest
describe "remote files" $ do
@ -44,8 +44,8 @@ remoteTests = describe "Remote" $ do
-- * Chat commands
remoteHandshakeTest :: HasCallStack => FilePath -> IO ()
remoteHandshakeTest = testChat2 aliceProfile aliceDesktopProfile $ \mobile desktop -> do
remoteHandshakeTest :: HasCallStack => Bool -> FilePath -> IO ()
remoteHandshakeTest viaDesktop = testChat2 aliceProfile aliceDesktopProfile $ \mobile desktop -> do
desktop ##> "/list remote hosts"
desktop <## "No remote hosts"
mobile ##> "/list remote ctrls"
@ -61,7 +61,7 @@ remoteHandshakeTest = testChat2 aliceProfile aliceDesktopProfile $ \mobile deskt
mobile <## "Remote controllers:"
mobile <## "1. My desktop (active)"
stopMobile mobile desktop `catchAny` (logError . tshow)
if viaDesktop then stopDesktop mobile desktop else stopMobile mobile desktop
desktop ##> "/delete remote host 1"
desktop <## "ok"
@ -81,7 +81,7 @@ remoteHandshakeStoredTest = testChat2 aliceProfile aliceDesktopProfile $ \mobile
logNote "Starting stored session"
startRemoteStored mobile desktop
stopMobile mobile desktop `catchAny` (logError . tshow)
stopDesktop mobile desktop `catchAny` (logError . tshow)
desktop ##> "/list remote hosts"
desktop <## "Remote hosts:"
@ -398,10 +398,12 @@ stopMobile :: HasCallStack => TestCC -> TestCC -> IO ()
stopMobile mobile desktop = do
logWarn "stopping via mobile"
mobile ##> "/stop remote ctrl"
mobile <## "ok"
concurrently_
(mobile <## "remote controller stopped")
(eventually 3 $ desktop <## "remote host 1 stopped")
concurrentlyN_
[ do
mobile <## "remote controller stopped"
mobile <## "ok",
eventually 3 $ desktop <## "remote host 1 stopped"
]
-- | Run action with extended timeout
eventually :: Int -> IO a -> IO a