newHandShakeData

1 files changed, 50 insertions, 17 deletions

diff --git a/src/Network/Tox/Crypto/Handlers.hs b/src/Network/Tox/Crypto/Handlers.hs
index 7cfbdd4e..13db02f3 100644
--- a/src/Network/Tox/Crypto/Handlers.hs
+++ b/src/Network/Tox/Crypto/Handlers.hs
@@ -2,8 +2,10 @@
 {-# LANGUAGE TupleSections #-}
 module Network.Tox.Crypto.Handlers where
 
+import Network.Tox.NodeId
 import Network.Tox.Crypto.Transport
-import Network.Tox.DHT.Transport (Cookie(..),CookieData(..))
+import Network.Tox.DHT.Transport (Cookie(..),CookieData(..), CookieRequest(..))
+import Network.Tox.DHT.Handlers (Client, cookieRequest, cookieRequestH )
 import Crypto.Tox
 import Control.Concurrent.STM
 import Network.Address
@@ -88,7 +90,10 @@ data NetCryptoSessions = NCSessions { netCryptoSessions :: TVar (Map.Map SockAdd
                                     , msgTypeArray :: MsgTypeArray
                                     }
 
-newSessionsState :: TransportCrypto -> (MessageType -> NetCryptoHook) -> Map.Map MessageType [NetCryptoHook] -> IO NetCryptoSessions
+newSessionsState :: TransportCrypto
+                 -> (MessageType -> NetCryptoHook) -- ^ default hook
+                 -> Map.Map MessageType [NetCryptoHook] -- ^ all hooks, can be empty to start
+                 -> IO NetCryptoSessions
 newSessionsState crypto unrechook hooks = do
     x <- atomically $ newTVar Map.empty
     nick <- atomically $ newTVar B.empty
@@ -120,14 +125,39 @@ newSessionsState crypto unrechook hooks = do
 data HandshakeParams
         = HParam
             { hpTheirBaseNonce :: Maybe Nonce24 -- ignore and generate your own
-            , hpOtherCookie :: Maybe Cookie
+            , hpOtherCookie :: Cookie
             , hpTheirSessionKeyPublic :: PublicKey
             , hpMySecretKey :: SecretKey
             , hpCookieRemotePubkey :: PublicKey
             , hpCookieRemoteDhtkey :: PublicKey
             }
-newHandShakeData :: TransportCrypto -> HandshakeParams -> HandshakeData
-newHandShakeData = error "todo"
+newHandShakeData :: TransportCrypto -> Nonce24 -> HandshakeParams -> SockAddr -> IO (Maybe HandshakeData)
+newHandShakeData crypto basenonce (HParam {hpOtherCookie,hpMySecretKey,hpCookieRemotePubkey,hpCookieRemoteDhtkey}) addr
+    = do
+    freshCookie
+      <- case  nodeInfo (key2id hpCookieRemoteDhtkey) addr  of
+            Right nodeinfo -> Just <$> cookieRequestH crypto nodeinfo (CookieRequest hpCookieRemotePubkey)
+            Left er        -> return Nothing
+    let hinit = hashInit
+        Cookie n24 encrypted = hpOtherCookie
+        hctx = hashUpdate hinit n24
+        hctx' = hashUpdate hctx encrypted
+        digest = hashFinalize hctx'
+-- parameters addr {--> SockAddr -}
+--    mbcookie <- case hpOtherCookie of
+--                    Nothing -> case (nodeInfo hpCookieRemoteDhtkey addr) of
+--                                Right nodeinfo -> cookieRequest crypto netCryptoDHTClient (toPublic hpMySecretKey) nodeinfo
+--                                Left er -> return Nothing
+--                    Just c -> return (Just c)
+
+    return $
+      fmap (\freshCookie' ->
+            HandshakeData
+                { baseNonce = basenonce
+                , sessionKey = toPublic hpMySecretKey
+                , cookieHash = digest
+                , otherCookie = freshCookie'
+                }) freshCookie
 
 -- | called when we recieve a crypto handshake with valid cookie
 freshCryptoSession :: NetCryptoSessions -> SockAddr -> HandshakeParams -> IO ()
@@ -135,7 +165,7 @@ freshCryptoSession  sessions
                     addr
                     hp@(HParam
                               { hpTheirBaseNonce = Just theirBaseNonce
-                              , hpOtherCookie    = Just otherCookie
+                              , hpOtherCookie    = otherCookie
                               , hpTheirSessionKeyPublic = theirSessionKey
                               , hpMySecretKey        = key
                               , hpCookieRemotePubkey = remotePublicKey
@@ -147,15 +177,18 @@ freshCryptoSession  sessions
     ncTheirBaseNonce0 <- atomically $ newTVar theirBaseNonce
     n24 <- atomically $ transportNewNonce crypto
     state <- lookupSharedSecret crypto key remoteDhtPublicKey n24
-    let myhandshakeData = newHandShakeData crypto hp
-        plain = encodePlain myhandshakeData
-        encrypted = encrypt state plain
-        myhandshake = Handshake { handshakeCookie = otherCookie
-                                , handshakeNonce = n24
-                                , handshakeData = encrypted
-                                }
-    ncMyPacketNonce0 <- atomically $ newTVar (baseNonce myhandshakeData)
-    ncHandShake0 <- atomically $ newTVar (Just myhandshake)
+    newBaseNonce <- atomically $ transportNewNonce crypto
+    mbMyhandshakeData <- newHandShakeData crypto newBaseNonce hp addr
+    let encodeHandshake myhandshakeData = let plain = encodePlain myhandshakeData
+    --                                        state = computeSharedSecret key remoteDhtPublicKey n24
+                                              encrypted = encrypt state plain
+                                              in Handshake { handshakeCookie = otherCookie
+                                                           , handshakeNonce = n24
+                                                           , handshakeData = encrypted
+                                                           }
+    let myhandshake= encodeHandshake <$> mbMyhandshakeData
+    ncMyPacketNonce0 <- atomically $ newTVar newBaseNonce
+    ncHandShake0 <- atomically $ newTVar myhandshake
     cookie0 <- atomically $ newTVar (Just otherCookie)
     newsession <- generateSecretKey
     ncHooks0 <- atomically $ newTVar (defaultHooks sessions)
@@ -230,7 +263,7 @@ cryptoNetHandler sessions addr (NetHandshake (Handshake (Cookie n24 ecookie) non
             return
              HParam
                 { hpTheirBaseNonce = Just baseNonce
-                , hpOtherCookie    = Just otherCookie
+                , hpOtherCookie    = otherCookie
                 , hpTheirSessionKeyPublic =  sessionKey
                 , hpMySecretKey        = key
                 , hpCookieRemotePubkey = remotePubkey
@@ -240,7 +273,7 @@ cryptoNetHandler sessions addr (NetHandshake (Handshake (Cookie n24 ecookie) non
         Left _ -> return ()
         Right hp@(HParam
                       { hpTheirBaseNonce = Just theirBaseNonce
-                      , hpOtherCookie    = Just otherCookie
+                      , hpOtherCookie    = otherCookie
                       , hpTheirSessionKeyPublic = theirSessionKey
                       , hpMySecretKey        = key
                       , hpCookieRemotePubkey = remotePublicKey