Network,TorHandshakes: handshake fail exception

nblockchain · Nov 21, 2022 · 0f60878 · 0f60878
1 parent d16f92f
commit 0f60878
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 7 deletions.
diff --git a/NOnion/Exceptions.fs b/NOnion/Exceptions.fs
@@ -29,6 +29,9 @@ type CircuitDestroyedException internal (reason: DestroyReason) =
 type CircuitDecryptionFailedException internal () =
     inherit NOnionException(sprintf "Circuit Decryption Failed")
 
+type HandshakeFailedException internal () =
+    inherit NOnionException(sprintf "Key handshake failed!")
+
 type TimeoutErrorException internal () =
     inherit NOnionException("Time limit exceeded for operation")
 

diff --git a/NOnion/Network/TorGuard.fs b/NOnion/Network/TorGuard.fs
@@ -41,6 +41,16 @@ module ExceptionUtil =
                         | None -> return raise <| FSharpUtil.ReRaise exn
         }
 
+    let HandleIncomingCallException<'T when 'T :> NOnionException>
+        (cell: ICell)
+        (ex: 'T)
+        =
+        sprintf
+            "TorGuard: exception when trying to handle incoming cell type=%i, ex=%s"
+            cell.Command
+            (ex.ToString())
+        |> TorLogger.Log
+
 type TorGuard private (client: TcpClient, sslStream: SslStream) =
     let shutdownToken = new CancellationTokenSource()
 
@@ -332,12 +342,16 @@ type TorGuard private (client: TcpClient, sslStream: SslStream) =
                             try
                                 do! circuit.HandleIncomingCell cell
                             with
+                            | :? HandshakeFailedException as ex ->
+                                ExceptionUtil.HandleIncomingCallException<HandshakeFailedException>
+                                    cell
+                                    ex
+
+                                self.KillChildCircuits()
                             | :? CircuitDecryptionFailedException as ex ->
-                                sprintf
-                                    "TorGuard: exception when trying to handle incoming cell type=%i, ex=%s"
-                                    cell.Command
-                                    (ex.ToString())
-                                |> TorLogger.Log
+                                ExceptionUtil.HandleIncomingCallException<CircuitDecryptionFailedException>
+                                    cell
+                                    ex
 
                                 self.KillChildCircuits()
                             | ex -> return raise <| FSharpUtil.ReRaise ex

diff --git a/NOnion/TorHandshakes/FastHandshake.fs b/NOnion/TorHandshakes/FastHandshake.fs
@@ -36,6 +36,6 @@ type FastHandshake =
                 |> Kdf.ComputeLegacyKdf
 
             if kdfResult.KeyHandshake <> serverSideData.DerivativeKey then
-                failwith "Key handshake failed!"
+                raise <| HandshakeFailedException()
             else
                 kdfResult
diff --git a/NOnion/TorHandshakes/NTorHandshake.fs b/NOnion/TorHandshakes/NTorHandshake.fs
@@ -107,6 +107,6 @@ type NTorHandshake =
             let auth = calculateHmacSha256 authInput Constants.NTorTMac
 
             if auth <> serverSideData.DerivativeKey then
-                failwith "Key handshake failed!"
+                raise <| HandshakeFailedException()
             else
                 Kdf.ComputeRfc5869Kdf secretInput