voidlizard
/
hbs2
mirror of https://github.com/voidlizard/hbs2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

traces encryption events

This commit is contained in:
Sergey Ivanov 2023-07-19 00:20:43 +04:00
parent d8b1937b78
commit 3316bb3d44
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hbs2-core/lib/HBS2/Net/Proto/EncryptionHandshake.hs
View File

@ -106,7 +106,7 @@ encryptionHandshakeProto EncryptionHandshakeAdapter{..} penv = \case
peer <- thatPeer proto peer <- thatPeer proto
mpeerData <- find (KnownPeerKey peer) id mpeerData <- find (KnownPeerKey peer) id
-- TODO: check theirsign -- TODO: check theirsign
trace $ "EHSP ResetEncryptionKeys from" <+> viaShow (peer, mpeerData) trace $ "ENCRYPTION EHSP ResetEncryptionKeys from" <+> viaShow (peer, mpeerData)
-- сначала удалим у себя его прошлый ключ -- сначала удалим у себя его прошлый ключ
encHandshake_considerPeerAsymmKey peer Nothing encHandshake_considerPeerAsymmKey peer Nothing
@ -120,7 +120,7 @@ encryptionHandshakeProto EncryptionHandshakeAdapter{..} penv = \case
mpeerData <- find (KnownPeerKey peer) id mpeerData <- find (KnownPeerKey peer) id
-- TODO: check theirsign -- TODO: check theirsign
trace $ "EHSP BeginEncryptionExchange from" <+> viaShow (peer, mpeerData) trace $ "ENCRYPTION EHSP BeginEncryptionExchange from" <+> viaShow (peer, mpeerData)
-- взять свои ключи -- взять свои ключи
creds <- getCredentials @s creds <- getCredentials @s
@ -145,7 +145,7 @@ encryptionHandshakeProto EncryptionHandshakeAdapter{..} penv = \case
mpeerData <- find (KnownPeerKey peer) id mpeerData <- find (KnownPeerKey peer) id
-- TODO: check theirsign -- TODO: check theirsign
trace $ "EHSP AckEncryptionExchange from" <+> viaShow (peer, mpeerData) trace $ "ENCRYPTION EHSP AckEncryptionExchange from" <+> viaShow (peer, mpeerData)
-- Он уже прописал у себя наш публичный ключ и готов общаться шифрованными сообщениями -- Он уже прописал у себя наш публичный ключ и готов общаться шифрованными сообщениями
-- Прописываем его ключ у себя -- Прописываем его ключ у себя

12
hbs2-peer/app/PeerMain.hs
View File

@ -582,7 +582,15 @@ runPeer opts = U.handle (\e -> myException e
proxy <- newProxyMessaging mess tcp >>= \peer -> pure peer proxy <- newProxyMessaging mess tcp >>= \peer -> pure peer
{ _proxy_getEncryptionKey = \peer -> do { _proxy_getEncryptionKey = \peer -> do
mpeerData <- withPeerM penv $ find (KnownPeerKey peer) id mpeerData <- withPeerM penv $ find (KnownPeerKey peer) id
join <$> forM mpeerData \peerData -> getEncryptionKey penv peerData mkey <- join <$> forM mpeerData \peerData -> getEncryptionKey penv peerData
case mkey of
Nothing ->
trace $ "ENCRYPTION empty getEncryptionKey"
<+> pretty peer <+> viaShow mpeerData
Just k ->
trace $ "ENCRYPTION success getEncryptionKey"
<+> pretty peer <+> viaShow mpeerData <+> viaShow k
pure mkey
, _proxy_clearEncryptionKey = \peer -> do , _proxy_clearEncryptionKey = \peer -> do
mpeerData <- withPeerM penv $ find (KnownPeerKey peer) id mpeerData <- withPeerM penv $ find (KnownPeerKey peer) id
@ -678,6 +686,7 @@ runPeer opts = U.handle (\e -> myException e
mpeerData <- withPeerM penv $ find (KnownPeerKey peer) id mpeerData <- withPeerM penv $ find (KnownPeerKey peer) id
case mpubkey of case mpubkey of
Nothing -> do Nothing -> do
trace $ "ENCRYPTION delete key" <+> pretty peer <+> viaShow mpeerData
-- deletePeerAsymmKey brains peer -- deletePeerAsymmKey brains peer
forM_ mpeerData \peerData -> forM_ mpeerData \peerData ->
deletePeerAsymmKey' brains (show peerData) deletePeerAsymmKey' brains (show peerData)
@ -686,6 +695,7 @@ runPeer opts = U.handle (\e -> myException e
let symmk = genCommonSecret @s let symmk = genCommonSecret @s
(privKeyFromKeypair @s (view envAsymmetricKeyPair penv)) (privKeyFromKeypair @s (view envAsymmetricKeyPair penv))
pk pk
trace $ "ENCRYPTION store key" <+> pretty peer <+> viaShow mpeerData
case mpeerData of case mpeerData of
Nothing -> do Nothing -> do
-- insertPeerAsymmKey brains peer pk symmk -- insertPeerAsymmKey brains peer pk symmk