Use alias for onion-routed queries for true anonymization.

1 files changed, 14 insertions, 4 deletions

diff --git a/src/Network/Tox.hs b/src/Network/Tox.hs
index 3860d309..51ee0a4d 100644
--- a/src/Network/Tox.hs
+++ b/src/Network/Tox.hs
@@ -100,7 +100,9 @@ import Data.Word64Map (fitsInInt)
 newCrypto :: IO TransportCrypto
 newCrypto = do
     secret <- generateSecretKey
+    alias <- generateSecretKey
     let pubkey = toPublic secret
+        aliaspub = toPublic alias
     (symkey, drg) <- do
         drg0 <- getSystemDRG
         return $ randomBytesGenerate 32 drg0 :: IO (ByteString, SystemDRG)
@@ -111,6 +113,8 @@ newCrypto = do
     return TransportCrypto
         { transportSecret = secret
         , transportPublic = pubkey
+        , onionAliasSecret = alias
+        , onionAliasPublic = aliaspub
         , transportSymmetric = return $ SymmetricKey symkey
         , transportNewNonce = do
             drg1 <- readTVar noncevar
@@ -205,6 +209,7 @@ data Tox = Tox
     , toxOnionRoutes :: OnionRouter
     }
 
+isLocalHost :: SockAddr -> Bool
 isLocalHost (SockAddrInet _ host32) = (fromBE32 host32 == 0x7f000001)
 isLocalHost _                       = False
 
@@ -227,6 +232,14 @@ newKeysDatabase :: IO (TVar Onion.AnnouncedKeys)
 newKeysDatabase =
     atomically $ newTVar $ Onion.AnnouncedKeys PSQ.empty MinMaxPSQ.empty
 
+
+getOnionAlias :: TransportCrypto -> STM NodeInfo -> Maybe (Onion.OnionDestination r) -> IO (Onion.OnionDestination r)
+getOnionAlias crypto dhtself remoteNode = atomically $ do
+    ni <- dhtself
+    let alias = ni { nodeId = key2id (onionAliasPublic crypto) }
+    return $ Onion.OnionDestination alias Nothing
+
+
 newTox :: TVar Onion.AnnouncedKeys -> SockAddr -> IO Tox
 newTox keydb addr = do
     udp <- addVerbosity <$> udpTransport addr
@@ -249,10 +262,7 @@ newTox keydb addr = do
     oniondrg <- drgNew
     let onionnet = layerTransport (Onion.decrypt crypto) (Onion.encrypt crypto) onioncrypt
     onionclient <- newClient oniondrg onionnet Onion.classify
-                    (const $ atomically
-                           $ flip Onion.OnionDestination Nothing
-                           . R.thisNode
-                           <$> readTVar (DHT.routing4 routing))
+                    (getOnionAlias crypto $ R.thisNode <$> readTVar (DHT.routing4 routing))
                     (Onion.handlers onionnet routing toks keydb)
                     (hookQueries orouter DHT.transactionKey)
                     (const id)