Small fixes

Author: papafe

build.cake

@@ -229,13 +229,6 @@ Task("TestLoadBalanced")
 Task("TestLoadBalancedNetStandard21").IsDependentOn("TestLoadBalanced");
 Task("TestLoadBalancedNet60").IsDependentOn("TestLoadBalanced");
 
-Task("TestSocks5Proxy")
-    .IsDependentOn("TestLibMongoCrypt")
-    .DoesForEach(
-        items: GetFiles("./**/*.Tests.csproj"),
-        action: (BuildConfig buildConfig, Path testProject) =>
-            RunTests(buildConfig, testProject, filter: "Category=\"Socks5Proxy\""));
-
 Task("TestSocks5ProxyNet472").IsDependentOn("TestSocks5Proxy");
 Task("TestSocks5ProxyNetStandard21").IsDependentOn("TestSocks5Proxy");
 Task("TestSocks5ProxyNet60").IsDependentOn("TestSocks5Proxy");
@@ -276,6 +269,13 @@ Task("TestCsfleWithGcpKms")
         action: (BuildConfig buildConfig, Path testProject) =>
             RunTests(buildConfig, testProject, filter: "Category=\"CsfleGCPKMS\""));
 
+Task("TestSocks5Proxy")
+    .IsDependentOn("Build")
+    .DoesForEach(
+        items: GetFiles("./**/*.Tests.csproj"),
+        action: (BuildConfig buildConfig, Path testProject) =>
+            RunTests(buildConfig, testProject, filter: "Category=\"Socks5Proxy\""));
+
 Task("Package")
     .IsDependentOn("PackageNugetPackages");
 

evergreen/evergreen.yml

@@ -26,42 +26,6 @@ timeout:
 
 functions:
 
-  setup-socks5-proxy:
-    - command: shell.exec
-      params:
-        background: true
-        script: |
-          ${PREPARE_SHELL}
-          MONGODB_URI="${MONGODB_URI}"
-          # Read the MongoDB URI connection string and extract an arbitrary member's host:port
-          HOST_PORT=$(echo "$MONGODB_URI" | sed 's|mongodb://||' | cut -d',' -f1)
-
-          export MAP_ARG="localhost:12345 to $HOST_PORT"
-          python3 $DRIVERS_TOOLS/.evergreen/socks5srv.py --map "$MAP_ARG" --port 1080 --auth username:p4ssw0rd &
-          python3 $DRIVERS_TOOLS/.evergreen/socks5srv.py --map "$MAP_ARG" --port 1081
-
-#//TODO Check if we need all those parameters...
-  run-socks5-proxy-tests:
-    - command: shell.exec
-      type: test
-      params:
-        working_dir: "mongo-csharp-driver"
-        shell: "bash"
-        script: |
-          export SOCKS5_PROXY_SERVERS_ENABLED=true
-          ${PREPARE_SHELL}
-          OS=${OS} \
-            evergreen/add-ca-certs.sh
-          SSL=${SSL} \
-          MONGODB_URI="${MONGODB_URI}" \
-          TOPOLOGY=${TOPOLOGY} \
-          OS=${OS} \
-          FRAMEWORK=${FRAMEWORK} \
-          TARGET="TestSocks5Proxy" \
-            evergreen/run-tests.sh
-          OS=${OS} \
-            evergreen/cleanup-test-resources.sh
-
   fetch-source:
     # Executes git clone and applies the submitted patch, if any
     - command: git.get_project
@@ -1077,6 +1041,40 @@ functions:
           bash $DRIVERS_TOOLS/.evergreen/auth_oidc/k8s/run-driver-test.sh
           bash $DRIVERS_TOOLS/.evergreen/auth_oidc/k8s/teardown-pod.sh
 
+  setup-socks5-proxy:
+    - command: shell.exec
+      params:
+        background: true
+        script: |
+          ${PREPARE_SHELL}
+          MONGODB_URI="${MONGODB_URI}"
+          # Read the MongoDB URI connection string and extract an arbitrary member's host:port
+          HOST_PORT=$(echo "$MONGODB_URI" | sed 's|mongodb://||' | cut -d',' -f1)
+
+          export MAP_ARG="localhost:12345 to $HOST_PORT"
+          python3 $DRIVERS_TOOLS/.evergreen/socks5srv.py --map "$MAP_ARG" --port 1080 --auth username:p4ssw0rd &
+          python3 $DRIVERS_TOOLS/.evergreen/socks5srv.py --map "$MAP_ARG" --port 1081
+
+  run-socks5-proxy-tests:
+    - command: shell.exec
+      type: test
+      params:
+        working_dir: "mongo-csharp-driver"
+        shell: "bash"
+        script: |
+          export SOCKS5_PROXY_SERVERS_ENABLED=true
+          ${PREPARE_SHELL}
+          OS=${OS} \
+            evergreen/add-ca-certs.sh
+          SSL=${SSL} \
+          MONGODB_URI="${MONGODB_URI}" \
+          TOPOLOGY=${TOPOLOGY} \
+          OS=${OS} \
+          FRAMEWORK=${FRAMEWORK} \
+          TARGET="TestSocks5Proxy" \
+            evergreen/run-tests.sh
+          OS=${OS} \
+            evergreen/cleanup-test-resources.sh
 pre:
   - func: fetch-source
   - func: prepare-resources

src/MongoDB.Driver/Core/Connections/TcpStreamFactory.cs

@@ -50,7 +50,7 @@ public Stream CreateStream(EndPoint endPoint, CancellationToken cancellationToke
         {
             var socks5ProxySettings = _settings.Socks5ProxySettings;
             var useProxy = socks5ProxySettings != null;
-            var targetEndpoint = socks5ProxySettings != null ? new DnsEndPoint(socks5ProxySettings.Host, socks5ProxySettings.Port) : endPoint;
+            var targetEndpoint = useProxy ? new DnsEndPoint(socks5ProxySettings.Host, socks5ProxySettings.Port) : endPoint;
 
 #if NET472
             var socket = CreateSocket(targetEndpoint);
@@ -99,7 +99,7 @@ public async Task<Stream> CreateStreamAsync(EndPoint endPoint, CancellationToken
         {
             var socks5ProxySettings = _settings.Socks5ProxySettings;
             var useProxy = socks5ProxySettings != null;
-            var targetEndpoint = socks5ProxySettings != null ? new DnsEndPoint(socks5ProxySettings.Host, socks5ProxySettings.Port) : endPoint;
+            var targetEndpoint = useProxy ? new DnsEndPoint(socks5ProxySettings.Host, socks5ProxySettings.Port) : endPoint;
 
 #if NET472
             var socket = CreateSocket(targetEndpoint);

src/MongoDB.Driver/MongoUrlBuilder.cs

@@ -821,7 +821,6 @@ public MongoUrl ToMongoUrl()
         /// <returns>The canonical URL.</returns>
         public override string ToString()
         {
-            //TODO Need to add options here too
             StringBuilder url = new StringBuilder();
             if (_scheme == ConnectionStringScheme.MongoDB)
             {

tests/MongoDB.Driver.Tests/Specifications/socks5-support/Socks5SupportProseTests.cs

@@ -66,7 +66,8 @@ public static IEnumerable<object[]> GetTestCombinations()
      * - check if apiCompat is ok
      * - need to run the tests on .net framework as well
      * - cleanup tests
-     *
+     * - Drivers MUST verify for at least one of the connection strings marked (succeeds)
+     * that command monitoring events do not reference the SOCKS5 proxy host where the MongoDB service server/port are referenced.
      *
      */