Client,Services,Tests: TorClient exit circuit

nblockchain · Apr 23, 2023 · 3b8212c · 3b8212c
1 parent 8915556
commit 3b8212c
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 5 deletions.
diff --git a/NOnion.Tests/TorClientTests.cs b/NOnion.Tests/TorClientTests.cs
@@ -18,7 +18,7 @@ public class TorClientTests
         private async Task CreateCircuit()
         {
             var client = await TorClient.BootstrapWithEmbeddedListAsync();
-            await client.CreateCircuitAsync(3, FSharpOption<Network.CircuitNodeDetail>.None);
+            await client.CreateCircuitAsync(3, CircuitPurpose.Unknown, FSharpOption<Network.CircuitNodeDetail>.None);
         }
 
         [Test]

diff --git a/NOnion/Client/TorClient.fs b/NOnion/Client/TorClient.fs
@@ -11,6 +11,10 @@ open NOnion.Utility
 open NOnion
 open NOnion.Network
 
+type CircuitPurpose =
+    | Unknown
+    | Exit
+
 type TorClient internal (directory: TorDirectory) =
     static let maximumBootstrapTries = 5
 
@@ -99,6 +103,7 @@ type TorClient internal (directory: TorDirectory) =
 
     member __.CreateCircuit
         (hopsCount: int)
+        (purpose: CircuitPurpose)
         (extendByNodeOpt: Option<CircuitNodeDetail>)
         =
         async {
@@ -145,8 +150,17 @@ type TorClient internal (directory: TorDirectory) =
                                         let rec findUnusedNode() =
                                             async {
                                                 let! _ipEndPoint, nodeDetail =
-                                                    directory.GetRouter
-                                                        RouterType.Normal
+                                                    if numHopsToExtend = 1 then
+                                                        match purpose with
+                                                        | Unknown ->
+                                                            directory.GetRouter
+                                                                RouterType.Normal
+                                                        | Exit ->
+                                                            directory.GetRouter
+                                                                RouterType.Exit
+                                                    else
+                                                        directory.GetRouter
+                                                            RouterType.Normal
 
                                                 if (List.contains
                                                         nodeDetail
@@ -208,9 +222,10 @@ type TorClient internal (directory: TorDirectory) =
     member self.CreateCircuitAsync
         (
             hopsCount: int,
+            purpse: CircuitPurpose,
             extendByNode: Option<CircuitNodeDetail>
         ) =
-        self.CreateCircuit hopsCount extendByNode |> Async.StartAsTask
+        self.CreateCircuit hopsCount purpse extendByNode |> Async.StartAsTask
 
 
     interface IDisposable with

diff --git a/NOnion/Services/TorServiceClient.fs b/NOnion/Services/TorServiceClient.fs
@@ -76,6 +76,7 @@ type TorServiceClient =
                                         let! circuit =
                                             torClient.CreateCircuit
                                                 2
+                                                CircuitPurpose.Unknown
                                                 (Some hsDirectoryNode)
 
                                         use dirStream = new TorStream(circuit)

diff --git a/NOnion/Services/TorServiceHost.fs b/NOnion/Services/TorServiceHost.fs
@@ -383,7 +383,10 @@ type TorServiceHost
                     use torClient = new TorClient(directory)
 
                     let! circuit =
-                        torClient.CreateCircuit 2 (Some hsDirectoryNode)
+                        torClient.CreateCircuit
+                            2
+                            CircuitPurpose.Unknown
+                            (Some hsDirectoryNode)
 
                     use dirStream = new TorStream(circuit)
                     do! dirStream.ConnectToDirectory() |> Async.Ignore