Use locally issued cookie-nonce for handshake cache.

1 files changed, 10 insertions, 9 deletions

diff --git a/HandshakeCache.hs b/HandshakeCache.hs
index 6f9d466f..c4dd090c 100644
--- a/HandshakeCache.hs
+++ b/HandshakeCache.hs
@@ -23,11 +23,8 @@ import Network.Tox.Handshake
 
 data HandshakeCache = HandshakeCache
     { -- Note that currently we are storing sent handshakes keyed by the
-      -- remotely issued cookie.  This probably means that it's possible for
-      -- one your contacts that you are trying to open a session with to
-      -- prevent you from opening a session with another contact if they know
-      -- the cookie that person issued you.
-      hscTable  :: TVar (MinMaxPSQ' (Cookie Encrypted) POSIXTime (SecretKey,HandshakeData))
+      -- locally issued cookie nonce.
+      hscTable  :: TVar (MinMaxPSQ' Nonce24 POSIXTime (SecretKey,HandshakeData))
     , hscSend   :: SockAddr -> Handshake Encrypted -> IO ()
     , hscCrypto :: TransportCrypto
     , hscPendingCookies :: TVar (Map (PublicKey,PublicKey) ())
@@ -51,10 +48,10 @@ getSentHandshake :: HandshakeCache
                     -> Cookie Identity -- locally issued
                     -> Cookie Encrypted -- remotely issued
                     -> IO (Maybe (SecretKey, HandshakeData))
-getSentHandshake hscache me their_addr (Cookie _ (Identity cd)) ecookie = do
+getSentHandshake hscache me their_addr (Cookie n24 (Identity cd)) ecookie = do
     now <- getPOSIXTime
     io <- atomically $ do
-        m <- checkExpiry now . MM.lookup' ecookie <$> readTVar (hscTable hscache)
+        m <- checkExpiry now . MM.lookup' n24 <$> readTVar (hscTable hscache)
         case m of
             Just s  -> return $ return $ Just s
             Nothing -> do
@@ -64,9 +61,12 @@ getSentHandshake hscache me their_addr (Cookie _ (Identity cd)) ecookie = do
                     Right their_node -> do
                         (s,hs) <- cacheHandshakeSTM hscache me them their_node ecookie now
                         return $ do
+                            dput XNetCrypto $ "getSentHandshake sending new handshake."
                             hscSend hscache their_addr hs
                             return $ Just s
-    io
+    r <- io
+    dput XNetCrypto $ "getSentHandshake me="++show (key2id $ toPublic me)++" their_addr="++show their_addr++" --> " ++ show r
+    return r
 
 
 checkExpiry :: POSIXTime -> Maybe (POSIXTime,r) -> Maybe r
@@ -97,7 +97,8 @@ cacheHandshakeSTM hscache me them their_node ecookie timestamp = do
             , otherCookie = freshCookie
             }
     hs <- encodeHandshake timestamp (hscCrypto hscache) me them ecookie hsdata
-    modifyTVar' (hscTable hscache) $ MM.insertTake' 20 ecookie (newsession,hsdata) timestamp
+    let Cookie cnonce _ = freshCookie
+    modifyTVar' (hscTable hscache) $ MM.insertTake' 20 cnonce (newsession,hsdata) timestamp
     return ((newsession,hsdata),hs)
 
 cacheHandshake :: HandshakeCache