Skip to content

Commit 7dd82bf

Browse files
epoberezkinepoberezkin
committed
server pages, link encoding
1 parent a8b1bf6 commit 7dd82bf

8 files changed

Lines changed: 112 additions & 60 deletions

File tree

‎apps/smp-server/static/a/index.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
./apps/smp-server/static/link.html

‎apps/smp-server/static/c/index.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
./apps/smp-server/static/link.html

‎apps/smp-server/static/i/index.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
./apps/smp-server/static/link.html

‎apps/smp-server/web/Static.hs‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,16 @@ generateSite si onionHost sitePath = do
8484
B.writeFile (sitePath </> "index.html") $ serverInformation si onionHost
8585
createDirectoryIfMissing True $ sitePath </> "media"
8686
forM_ E.mediaContent $ \(path, bs) -> B.writeFile (sitePath </> "media" </> path) bs
87-
createDirectoryIfMissing True $ sitePath </> "contact"
88-
B.writeFile (sitePath </> "contact" </> "index.html") E.linkHtml
89-
createDirectoryIfMissing True $ sitePath </> "invitation"
90-
B.writeFile (sitePath </> "invitation" </> "index.html") E.linkHtml
87+
createLinkPage "contact"
88+
createLinkPage "invitation"
89+
createLinkPage "a"
90+
createLinkPage "c"
91+
createLinkPage "i"
9192
logInfo $ "Generated static site contents at " <> tshow sitePath
93+
where
94+
createLinkPage path = do
95+
createDirectoryIfMissing True $ sitePath </> path
96+
B.writeFile (sitePath </> path </> "index.html") E.linkHtml
9297

9398
serverInformation :: ServerInformation -> Maybe TransportHost -> ByteString
9499
serverInformation ServerInformation {config, information} onionHost = render E.indexHtml substs

‎src/Simplex/Messaging/Agent.hs‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,7 @@ import Simplex.Messaging.Protocol
200200
MsgFlags (..),
201201
NtfServer,
202202
ProtoServerWithAuth (..),
203+
ProtocolServer (..),
203204
ProtocolType (..),
204205
ProtocolTypeI (..),
205206
QueueLinkData,
@@ -838,7 +839,7 @@ setContactShortLink' c connId userData =
838839
SomeConn _ (ContactConnection _ rq) -> do
839840
(lnkId, linkKey, d) <- prepareLinkData rq
840841
addQueueLink c rq lnkId d
841-
pure $ CSLContact CCTContact (qServer rq) linkKey
842+
pure $ CSLContact SLSServer CCTContact (qServer rq) linkKey
842843
_ -> throwE $ CMD PROHIBITED "setContactShortLink: not contact address"
843844
where
844845
prepareLinkData :: RcvQueue -> AM (SMP.LinkId, LinkKey, QueueLinkData)
@@ -872,7 +873,7 @@ deleteContactShortLink' c connId =
872873
-- TODO [short links] remove 1-time invitation data and link ID from the server after the message is sent.
873874
getConnShortLink' :: forall c. AgentClient -> UserId -> ConnShortLink c -> AM (ConnectionRequestUri c, ConnLinkData c)
874875
getConnShortLink' c userId = \case
875-
CSLInvitation srv linkId linkKey -> do
876+
CSLInvitation _ srv linkId linkKey -> do
876877
g <- asks random
877878
invLink <- withStore' c $ \db -> do
878879
getInvShortLink db srv linkId >>= \case
@@ -886,20 +887,22 @@ getConnShortLink' c userId = \case
886887
ld@(sndId, _) <- secureGetQueueLink c userId invLink
887888
withStore' c $ \db -> setInvShortLinkSndId db invLink sndId
888889
decryptData srv linkKey k ld
889-
CSLContact _ srv linkKey -> do
890+
CSLContact _ _ srv linkKey -> do
890891
let (linkId, k) = SL.contactShortLinkKdf linkKey
891892
ld <- getQueueLink c userId srv linkId
892893
decryptData srv linkKey k ld
893894
where
894895
decryptData :: ConnectionModeI c => SMPServer -> LinkKey -> C.SbKey -> (SMP.SenderId, QueueLinkData) -> AM (ConnectionRequestUri c, ConnLinkData c)
895896
decryptData srv linkKey k (sndId, d) = do
896897
r@(cReq, _) <- liftEither $ SL.decryptLinkData @c linkKey k d
897-
unless ((srv, sndId) `sameQAddress` qAddress (connReqQueue cReq)) $
898+
let (srv', sndId') = qAddress (connReqQueue cReq)
899+
unless (srv `sameSrvHost` srv' && sndId == sndId') $
898900
throwE $ AGENT $ A_LINK "different address"
899901
pure r
902+
sameSrvHost ProtocolServer {host = h :| _} ProtocolServer {host = hs} = h `elem` hs
900903

901904
deleteLocalInvShortLink' :: AgentClient -> ConnShortLink 'CMInvitation -> AM ()
902-
deleteLocalInvShortLink' c (CSLInvitation srv linkId _) = withStore' c $ \db -> deleteInvShortLink db srv linkId
905+
deleteLocalInvShortLink' c (CSLInvitation _ srv linkId _) = withStore' c $ \db -> deleteInvShortLink db srv linkId
903906

904907
changeConnectionUser' :: AgentClient -> UserId -> ConnId -> UserId -> AM ()
905908
changeConnectionUser' c oldUserId connId newUserId = do
@@ -978,8 +981,8 @@ newRcvConnSrv c userId connId enableNtfs cMode userData_ clientData pqInitKeys s
978981
Just ShortLinkCreds {shortLinkId, shortLinkKey}
979982
| qUri == qUri' ->
980983
let link = case cReq of
981-
CRContactUri _ -> CSLContact CCTContact srv shortLinkKey
982-
CRInvitationUri {} -> CSLInvitation srv shortLinkId shortLinkKey
984+
CRContactUri _ -> CSLContact SLSServer CCTContact srv shortLinkKey
985+
CRInvitationUri {} -> CSLInvitation SLSServer srv shortLinkId shortLinkKey
983986
in pure $ CCLink cReq (Just link)
984987
| otherwise -> throwE $ INTERNAL "different rcv queue address"
985988
Nothing ->

‎src/Simplex/Messaging/Agent/Protocol.hs‎

Lines changed: 67 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,13 @@ module Simplex.Messaging.Agent.Protocol
118118
AConnShortLink (..),
119119
CreatedConnLink (..),
120120
ContactConnType (..),
121+
ShortLinkScheme (..),
121122
LinkKey (..),
122123
sameConnReqContact,
123124
simplexChat,
124125
connReqUriP',
126+
simplexConnReqUri,
127+
simplexShortLink,
125128
AgentErrorType (..),
126129
CommandErrorType (..),
127130
ConnectionErrorType (..),
@@ -168,7 +171,7 @@ import qualified Data.Attoparsec.ByteString.Char8 as A
168171
import qualified Data.ByteString.Base64.URL as B64
169172
import Data.ByteString.Char8 (ByteString)
170173
import qualified Data.ByteString.Char8 as B
171-
import Data.Char (isDigit, toLower, toUpper)
174+
import Data.Char (toLower, toUpper)
172175
import Data.Foldable (find)
173176
import Data.Functor (($>))
174177
import Data.Int (Int64)
@@ -1335,6 +1338,11 @@ data ConnectionRequestUri (m :: ConnectionMode) where
13351338
-- they are passed in AgentInvitation message
13361339
CRContactUri :: ConnReqUriData -> ConnectionRequestUri CMContact
13371340

1341+
simplexConnReqUri :: ConnectionRequestUri m -> ConnectionRequestUri m
1342+
simplexConnReqUri = \case
1343+
CRInvitationUri crData e2eParams -> CRInvitationUri crData {crScheme = SSSimplex} e2eParams
1344+
CRContactUri crData -> CRContactUri crData {crScheme = SSSimplex}
1345+
13381346
deriving instance Eq (ConnectionRequestUri m)
13391347

13401348
deriving instance Show (ConnectionRequestUri m)
@@ -1348,14 +1356,21 @@ instance Eq AConnectionRequestUri where
13481356

13491357
deriving instance Show AConnectionRequestUri
13501358

1359+
data ShortLinkScheme = SLSSimplex | SLSServer deriving (Eq, Show)
1360+
13511361
data ConnShortLink (m :: ConnectionMode) where
1352-
CSLInvitation :: SMPServer -> SMP.LinkId -> LinkKey -> ConnShortLink 'CMInvitation
1353-
CSLContact :: ContactConnType -> SMPServer -> LinkKey -> ConnShortLink 'CMContact
1362+
CSLInvitation :: ShortLinkScheme -> SMPServer -> SMP.LinkId -> LinkKey -> ConnShortLink 'CMInvitation
1363+
CSLContact :: ShortLinkScheme -> ContactConnType -> SMPServer -> LinkKey -> ConnShortLink 'CMContact
13541364

13551365
deriving instance Eq (ConnShortLink m)
13561366

13571367
deriving instance Show (ConnShortLink m)
13581368

1369+
simplexShortLink :: ConnShortLink m -> ConnShortLink m
1370+
simplexShortLink = \case
1371+
CSLInvitation _ srv lnkId k -> CSLInvitation SLSSimplex srv lnkId k
1372+
CSLContact _ ct srv k -> CSLContact SLSSimplex ct srv k
1373+
13591374
newtype LinkKey = LinkKey ByteString -- sha3-256(fixed_data)
13601375
deriving (Eq, Show)
13611376
deriving newtype (FromField, StrEncoding)
@@ -1407,47 +1422,64 @@ instance ConnectionModeI m => FromJSON (ConnectionLink m) where
14071422

14081423
instance ConnectionModeI m => StrEncoding (ConnShortLink m) where
14091424
strEncode = \case
1410-
CSLInvitation srv (SMP.EntityId lnkId) (LinkKey k) -> encLink srv lnkId k 'i'
1411-
CSLContact ct srv (LinkKey k) -> encLink srv "" k $ toLower $ ctTypeChar ct
1425+
CSLInvitation sch srv (SMP.EntityId lnkId) (LinkKey k) -> slEncode sch srv 'i' lnkId k
1426+
CSLContact sch ct srv (LinkKey k) -> slEncode sch srv (toLower $ ctTypeChar ct) "" k
14121427
where
1413-
encLink (SMPServer (h :| hs) port (C.KeyHash kh)) lnkId k linkType =
1414-
B.concat ["https://", strEncode h, port', "/", B.singleton linkType, "#", khStr, hosts, lnkIdStr, B64.encodeUnpadded k]
1428+
slEncode sch (SMPServer (h :| hs) port (C.KeyHash kh)) linkType lnkId k =
1429+
B.concat [authority, "/", B.singleton linkType, "#", lnkIdStr, B64.encodeUnpadded k, queryStr]
14151430
where
1416-
port' = if null port then "" else B.pack (':' : port)
1417-
khStr = if B.null kh then "" else B64.encodeUnpadded kh <> "&"
1418-
hosts = if null hs then "" else strEncode (TransportHosts_ hs) <> "/"
1419-
lnkIdStr = if B.null lnkId then "" else B64.encodeUnpadded lnkId <> "."
1431+
(authority, paramHosts) = case sch of
1432+
SLSSimplex -> ("simplex:", h : hs)
1433+
SLSServer -> ("https://" <> strEncode h, hs)
1434+
lnkIdStr = if B.null lnkId then "" else B64.encodeUnpadded lnkId <> "/"
1435+
queryStr = if B.null query then "" else "?" <> query
1436+
query =
1437+
strEncode . QSP QEscape $
1438+
[("h", strEncode (TransportHosts_ paramHosts)) | not (null paramHosts)]
1439+
<> [("p", B.pack port) | not (null port)]
1440+
<> [("c", B64.encodeUnpadded kh) | not (B.null kh)]
14201441
strP = (\(ACSL _ l) -> checkConnMode l) <$?> strP
14211442
{-# INLINE strP #-}
14221443

14231444
instance StrEncoding AConnShortLink where
14241445
strEncode (ACSL _ l) = strEncode l
14251446
{-# INLINE strEncode #-}
14261447
strP = do
1427-
h <- "https://" *> strP
1428-
port <- A.char ':' *> (B.unpack <$> A.takeWhile1 isDigit) <|> pure ""
1429-
contactType <- A.char '/' *> contactTypeP
1430-
keyHash <- optional (A.char '/') *> A.char '#' *> (strP <* A.char '&' <|> pure (C.KeyHash ""))
1431-
TransportHosts_ hs <- strP <* "/" <|> pure (TransportHosts_ [])
1432-
let srv = SMPServer (h :| hs) port keyHash
1433-
case contactType of
1448+
(sch, h_) <- authorityP <* A.char '/'
1449+
ct_ <- contactTypeP <* optional (A.char '/') <* A.char '#'
1450+
case ct_ of
14341451
Nothing -> do
1435-
lnkId <- strP <* A.char '.'
1452+
lnkId <- strP <* A.char '/'
14361453
k <- strP
1437-
pure $ ACSL SCMInvitation $ CSLInvitation srv (SMP.EntityId lnkId) (LinkKey k)
1454+
srv <- serverQueryP h_
1455+
pure $ ACSL SCMInvitation $ CSLInvitation sch srv (SMP.EntityId lnkId) (LinkKey k)
14381456
Just ct -> do
14391457
k <- strP
1440-
pure $ ACSL SCMContact $ CSLContact ct srv (LinkKey k)
1458+
srv <- serverQueryP h_
1459+
pure $ ACSL SCMContact $ CSLContact sch ct srv (LinkKey k)
14411460
where
1461+
authorityP =
1462+
"simplex:" $> (SLSSimplex, Nothing)
1463+
<|> "https://" *> ((SLSServer,) . Just <$> strP)
1464+
<|> fail "bad short link scheme"
14421465
contactTypeP = do
14431466
Just <$> (A.anyChar >>= ctTypeP . toUpper)
14441467
<|> A.char 'i' $> Nothing
1445-
<|> fail "unknown link type"
1468+
<|> fail "unknown short link type"
1469+
serverQueryP h_ =
1470+
optional (A.char '?' *> strP) >>= \case
1471+
Nothing -> maybe noServer (pure . SMPServerOnlyHost) h_
1472+
Just query -> do
1473+
hs <- maybe noServer pure . L.nonEmpty . maybe id (:) h_ . maybe [] thList_ =<< queryParam_ "h" query
1474+
p <- maybe "" show <$> queryParam_ @Word16 "p" query
1475+
kh <- fromMaybe (C.KeyHash "") <$> queryParam_ "c" query
1476+
pure $ SMPServer hs p kh
1477+
noServer = fail "short link without server"
14461478

14471479
instance ConnectionModeI m => Encoding (ConnShortLink m) where
14481480
smpEncode = \case
1449-
CSLInvitation srv lnkId (LinkKey k) -> smpEncode (CMInvitation, srv, lnkId, k)
1450-
CSLContact ct srv (LinkKey k) -> smpEncode (CMContact, ctTypeChar ct, srv, k)
1481+
CSLInvitation _ srv lnkId (LinkKey k) -> smpEncode (CMInvitation, srv, lnkId, k)
1482+
CSLContact _ ct srv (LinkKey k) -> smpEncode (CMContact, ctTypeChar ct, srv, k)
14511483
smpP = (\(ACSL _ l) -> checkConnMode l) <$?> smpP
14521484
{-# INLINE smpP #-}
14531485

@@ -1458,11 +1490,11 @@ instance Encoding AConnShortLink where
14581490
smpP >>= \case
14591491
CMInvitation -> do
14601492
(srv, lnkId, k) <- smpP
1461-
pure $ ACSL SCMInvitation $ CSLInvitation srv lnkId (LinkKey k)
1493+
pure $ ACSL SCMInvitation $ CSLInvitation SLSServer srv lnkId (LinkKey k)
14621494
CMContact -> do
14631495
ct <- ctTypeP =<< A.anyChar
14641496
(srv, k) <- smpP
1465-
pure $ ACSL SCMContact $ CSLContact ct srv (LinkKey k)
1497+
pure $ ACSL SCMContact $ CSLContact SLSServer ct srv (LinkKey k)
14661498

14671499
ctTypeP :: Char -> Parser ContactConnType
14681500
ctTypeP = \case
@@ -1482,11 +1514,11 @@ ctTypeChar = \case
14821514
-- the servers passed to this function should be all preset servers, not servers configured by the user.
14831515
shortenShortLink :: NonEmpty SMPServer -> ConnShortLink m -> ConnShortLink m
14841516
shortenShortLink presetSrvs = \case
1485-
CSLInvitation srv lnkId linkKey -> CSLInvitation (shortServer srv) lnkId linkKey
1486-
CSLContact ct srv linkKey -> CSLContact ct (shortServer srv) linkKey
1517+
CSLInvitation sch srv lnkId linkKey -> CSLInvitation sch (shortServer srv) lnkId linkKey
1518+
CSLContact sch ct srv linkKey -> CSLContact sch ct (shortServer srv) linkKey
14871519
where
14881520
shortServer srv@(SMPServer hs@(h :| _) p kh) =
1489-
if isPresetServer then SMPServer [h] "" (C.KeyHash "") else srv
1521+
if isPresetServer then SMPServerOnlyHost h else srv
14901522
where
14911523
isPresetServer = case findPresetServer srv presetSrvs of
14921524
Just (SMPServer hs' p' kh') ->
@@ -1495,14 +1527,17 @@ shortenShortLink presetSrvs = \case
14951527
&& kh == kh'
14961528
Nothing -> False
14971529

1530+
pattern SMPServerOnlyHost :: TransportHost -> SMPServer
1531+
pattern SMPServerOnlyHost h = SMPServer [h] "" (C.KeyHash "")
1532+
14981533
-- the servers passed to this function should be all preset servers, not servers configured by the user.
14991534
restoreShortLink :: NonEmpty SMPServer -> ConnShortLink m -> ConnShortLink m
15001535
restoreShortLink presetSrvs = \case
1501-
CSLInvitation srv lnkId linkKey -> CSLInvitation (fullServer srv) lnkId linkKey
1502-
CSLContact ct srv linkKey -> CSLContact ct (fullServer srv) linkKey
1536+
CSLInvitation sch srv lnkId linkKey -> CSLInvitation sch (fullServer srv) lnkId linkKey
1537+
CSLContact sch ct srv linkKey -> CSLContact sch ct (fullServer srv) linkKey
15031538
where
15041539
fullServer = \case
1505-
s@(SMPServer [_] "" (C.KeyHash "")) -> fromMaybe s $ findPresetServer s presetSrvs
1540+
s@(SMPServerOnlyHost _) -> fromMaybe s $ findPresetServer s presetSrvs
15061541
s -> s
15071542

15081543
findPresetServer :: SMPServer -> NonEmpty SMPServer -> Maybe SMPServer

‎tests/AgentTests/ConnectionRequestTests.hs‎

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -279,22 +279,28 @@ connectionRequestTests =
279279
smpEncodingTest contactAddressV2
280280
smpEncodingTest contactAddressClientData
281281
it "should serialize / parse short links" $ do
282-
CSLContact CCTContact srv (LinkKey "0123456789abcdef0123456789abcdef") #==# "https://smp.simplex.im:5223/a#1234-w&jjbyvoemxysm7qxap7m5d5m35jzv5qq6gnlv7s4rsn7tdwwmuqciwpid.onion/MDEyMzQ1Njc4OWFiY2RlZjAxMjM0NTY3ODlhYmNkZWY"
283-
CSLContact CCTGroup srv (LinkKey "0123456789abcdef0123456789abcdef") #==# "https://smp.simplex.im:5223/g#1234-w&jjbyvoemxysm7qxap7m5d5m35jzv5qq6gnlv7s4rsn7tdwwmuqciwpid.onion/MDEyMzQ1Njc4OWFiY2RlZjAxMjM0NTY3ODlhYmNkZWY"
284-
CSLContact CCTContact shortSrv (LinkKey "0123456789abcdef0123456789abcdef") #==# "https://smp.simplex.im/a#MDEyMzQ1Njc4OWFiY2RlZjAxMjM0NTY3ODlhYmNkZWY"
285-
CSLInvitation srv (EntityId "0123456789abcdef01234567") (LinkKey "0123456789abcdef0123456789abcdef") #==# "https://smp.simplex.im:5223/i#1234-w&jjbyvoemxysm7qxap7m5d5m35jzv5qq6gnlv7s4rsn7tdwwmuqciwpid.onion/MDEyMzQ1Njc4OWFiY2RlZjAxMjM0NTY3.MDEyMzQ1Njc4OWFiY2RlZjAxMjM0NTY3ODlhYmNkZWY"
286-
CSLInvitation shortSrv (EntityId "0123456789abcdef01234567") (LinkKey "0123456789abcdef0123456789abcdef") #==# "https://smp.simplex.im/i#MDEyMzQ1Njc4OWFiY2RlZjAxMjM0NTY3.MDEyMzQ1Njc4OWFiY2RlZjAxMjM0NTY3ODlhYmNkZWY"
282+
CSLContact SLSServer CCTContact srv (LinkKey "0123456789abcdef0123456789abcdef") #==# "https://smp.simplex.im/a#MDEyMzQ1Njc4OWFiY2RlZjAxMjM0NTY3ODlhYmNkZWY?h=jjbyvoemxysm7qxap7m5d5m35jzv5qq6gnlv7s4rsn7tdwwmuqciwpid.onion&p=5223&c=1234-w"
283+
CSLContact SLSServer CCTGroup srv (LinkKey "0123456789abcdef0123456789abcdef") #==# "https://smp.simplex.im/g#MDEyMzQ1Njc4OWFiY2RlZjAxMjM0NTY3ODlhYmNkZWY?h=jjbyvoemxysm7qxap7m5d5m35jzv5qq6gnlv7s4rsn7tdwwmuqciwpid.onion&p=5223&c=1234-w"
284+
CSLContact SLSServer CCTContact shortSrv (LinkKey "0123456789abcdef0123456789abcdef") #==# "https://smp.simplex.im/a#MDEyMzQ1Njc4OWFiY2RlZjAxMjM0NTY3ODlhYmNkZWY"
285+
CSLInvitation SLSServer srv (EntityId "0123456789abcdef01234567") (LinkKey "0123456789abcdef0123456789abcdef") #==# "https://smp.simplex.im/i#MDEyMzQ1Njc4OWFiY2RlZjAxMjM0NTY3/MDEyMzQ1Njc4OWFiY2RlZjAxMjM0NTY3ODlhYmNkZWY?h=jjbyvoemxysm7qxap7m5d5m35jzv5qq6gnlv7s4rsn7tdwwmuqciwpid.onion&p=5223&c=1234-w"
286+
CSLInvitation SLSServer shortSrv (EntityId "0123456789abcdef01234567") (LinkKey "0123456789abcdef0123456789abcdef") #==# "https://smp.simplex.im/i#MDEyMzQ1Njc4OWFiY2RlZjAxMjM0NTY3/MDEyMzQ1Njc4OWFiY2RlZjAxMjM0NTY3ODlhYmNkZWY"
287+
CSLContact SLSSimplex CCTContact srv (LinkKey "0123456789abcdef0123456789abcdef") #==# "simplex:/a#MDEyMzQ1Njc4OWFiY2RlZjAxMjM0NTY3ODlhYmNkZWY?h=smp.simplex.im%2Cjjbyvoemxysm7qxap7m5d5m35jzv5qq6gnlv7s4rsn7tdwwmuqciwpid.onion&p=5223&c=1234-w"
288+
CSLContact SLSSimplex CCTGroup srv (LinkKey "0123456789abcdef0123456789abcdef") #==# "simplex:/g#MDEyMzQ1Njc4OWFiY2RlZjAxMjM0NTY3ODlhYmNkZWY?h=smp.simplex.im%2Cjjbyvoemxysm7qxap7m5d5m35jzv5qq6gnlv7s4rsn7tdwwmuqciwpid.onion&p=5223&c=1234-w"
289+
CSLContact SLSSimplex CCTContact shortSrv (LinkKey "0123456789abcdef0123456789abcdef") #==# "simplex:/a#MDEyMzQ1Njc4OWFiY2RlZjAxMjM0NTY3ODlhYmNkZWY?h=smp.simplex.im"
290+
CSLInvitation SLSSimplex srv (EntityId "0123456789abcdef01234567") (LinkKey "0123456789abcdef0123456789abcdef") #==# "simplex:/i#MDEyMzQ1Njc4OWFiY2RlZjAxMjM0NTY3/MDEyMzQ1Njc4OWFiY2RlZjAxMjM0NTY3ODlhYmNkZWY?h=smp.simplex.im%2Cjjbyvoemxysm7qxap7m5d5m35jzv5qq6gnlv7s4rsn7tdwwmuqciwpid.onion&p=5223&c=1234-w"
291+
CSLInvitation SLSSimplex shortSrv (EntityId "0123456789abcdef01234567") (LinkKey "0123456789abcdef0123456789abcdef") #==# "simplex:/i#MDEyMzQ1Njc4OWFiY2RlZjAxMjM0NTY3/MDEyMzQ1Njc4OWFiY2RlZjAxMjM0NTY3ODlhYmNkZWY?h=smp.simplex.im"
287292
it "should shorten / restore short links" $ do
288-
shortenShortLink [srv] (CSLContact CCTContact srv (LinkKey "0123456789abcdef0123456789abcdef"))
289-
`shouldBe` CSLContact CCTContact shortSrv (LinkKey "0123456789abcdef0123456789abcdef")
290-
shortenShortLink [srv] (CSLContact CCTContact srv2 (LinkKey "0123456789abcdef0123456789abcdef"))
291-
`shouldBe` CSLContact CCTContact srv2 (LinkKey "0123456789abcdef0123456789abcdef")
292-
restoreShortLink [srv] (CSLContact CCTContact shortSrv (LinkKey "0123456789abcdef0123456789abcdef"))
293-
`shouldBe` CSLContact CCTContact srv (LinkKey "0123456789abcdef0123456789abcdef")
294-
restoreShortLink [srv2] (CSLContact CCTContact shortSrv (LinkKey "0123456789abcdef0123456789abcdef"))
295-
`shouldBe` CSLContact CCTContact shortSrv (LinkKey "0123456789abcdef0123456789abcdef")
296-
restoreShortLink [srv] (CSLContact CCTContact srv2 (LinkKey "0123456789abcdef0123456789abcdef"))
297-
`shouldBe` CSLContact CCTContact srv2 (LinkKey "0123456789abcdef0123456789abcdef")
293+
let contact = CSLContact SLSServer CCTContact
294+
shortenShortLink [srv] (contact srv (LinkKey "0123456789abcdef0123456789abcdef"))
295+
`shouldBe` contact shortSrv (LinkKey "0123456789abcdef0123456789abcdef")
296+
shortenShortLink [srv] (contact srv2 (LinkKey "0123456789abcdef0123456789abcdef"))
297+
`shouldBe` contact srv2 (LinkKey "0123456789abcdef0123456789abcdef")
298+
restoreShortLink [srv] (contact shortSrv (LinkKey "0123456789abcdef0123456789abcdef"))
299+
`shouldBe` contact srv (LinkKey "0123456789abcdef0123456789abcdef")
300+
restoreShortLink [srv2] (contact shortSrv (LinkKey "0123456789abcdef0123456789abcdef"))
301+
`shouldBe` contact shortSrv (LinkKey "0123456789abcdef0123456789abcdef")
302+
restoreShortLink [srv] (contact srv2 (LinkKey "0123456789abcdef0123456789abcdef"))
303+
`shouldBe` contact srv2 (LinkKey "0123456789abcdef0123456789abcdef")
298304
where
299305
smpEncodingTest a = smpDecode (smpEncode a) `shouldBe` Right a
300306

‎tests/ServerTests/SchemaDump.hs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ testServerDBOpts =
4141

4242
serverSchemaDumpTest :: Spec
4343
serverSchemaDumpTest = do
44-
fit "verify and overwrite schema dump" testVerifySchemaDump
45-
fit "verify schema down migrations" testSchemaMigrations
44+
it "verify and overwrite schema dump" testVerifySchemaDump
45+
it "verify schema down migrations" testSchemaMigrations
4646

4747
testVerifySchemaDump :: IO ()
4848
testVerifySchemaDump = do

0 commit comments

Comments
 (0)