From b4dd6941d75b09d5c4fbedd484069b60f089c8f6 Mon Sep 17 00:00:00 2001
From: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com>
Date: Thu, 28 Dec 2023 10:06:49 +0000
Subject: [PATCH] core: allow quoted strings (with spaces) in network interface
 of remote hosts (#3592)

---
 .../commonMain/kotlin/chat/simplex/common/model/SimpleXAPI.kt   | 2 +-
 src/Simplex/Chat.hs                                             | 2 +-
 tests/RemoteTests.hs                                            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/SimpleXAPI.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/SimpleXAPI.kt
index 4af3e3f2e..e3f565b77 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/SimpleXAPI.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/SimpleXAPI.kt
@@ -2385,7 +2385,7 @@ sealed class CC {
     is CancelFile -> "/fcancel $fileId"
     is SetLocalDeviceName -> "/set device name $displayName"
     is ListRemoteHosts -> "/list remote hosts"
-    is StartRemoteHost -> "/start remote host " + (if (remoteHostId == null) "new" else "$remoteHostId multicast=${onOff(multicast)}") + (if (address != null) " addr=${address.address} iface=${address.`interface`}" else "") + (if (port != null) " port=$port" else "")
+    is StartRemoteHost -> "/start remote host " + (if (remoteHostId == null) "new" else "$remoteHostId multicast=${onOff(multicast)}") + (if (address != null) " addr=${address.address} iface=${json.encodeToString(address.`interface`)}" else "") + (if (port != null) " port=$port" else "")
     is SwitchRemoteHost -> "/switch remote host " + if (remoteHostId == null) "local" else "$remoteHostId"
     is StopRemoteHost -> "/stop remote host " + if (remoteHostKey == null) "new" else "$remoteHostKey"
     is DeleteRemoteHost -> "/delete remote host $remoteHostId"
diff --git a/src/Simplex/Chat.hs b/src/Simplex/Chat.hs
index eb16a492e..1b61fb748 100644
--- a/src/Simplex/Chat.hs
+++ b/src/Simplex/Chat.hs
@@ -6543,7 +6543,7 @@ chatCommandP =
         (pure Nothing)
     srvCfgP = strP >>= \case AProtocolType p -> APSC p <$> (A.space *> jsonP)
     toServerCfg server = ServerCfg {server, preset = False, tested = Nothing, enabled = True}
-    rcCtrlAddressP = RCCtrlAddress <$> ("addr=" *> strP) <*> (" iface=" *> text1P)
+    rcCtrlAddressP = RCCtrlAddress <$> ("addr=" *> strP) <*> (" iface=" *> (jsonP <|> text1P))
     text1P = safeDecodeUtf8 <$> A.takeTill (== ' ')
     char_ = optional . A.char
 
diff --git a/tests/RemoteTests.hs b/tests/RemoteTests.hs
index ff0e5cb2d..1622ce175 100644
--- a/tests/RemoteTests.hs
+++ b/tests/RemoteTests.hs
@@ -142,7 +142,7 @@ storedBindingsTest = testChat2 aliceProfile aliceDesktopProfile $ \mobile deskto
   mobile ##> "/set device name Mobile"
   mobile <## "ok"
 
-  desktop ##> "/start remote host new addr=127.0.0.1 iface=lo port=52230"
+  desktop ##> "/start remote host new addr=127.0.0.1 iface=\"lo\" port=52230"
   desktop <##. "new remote host started on 127.0.0.1:52230" -- TODO: show ip?
   desktop <## "Remote session invitation:"
   inv <- getTermLine desktop