Various fixes

Author: papafe

evergreen/cleanup-proxy.sh

@@ -833,6 +833,30 @@ functions:
           - "OS"
         args:
           - evergreen/cleanup-test-resources.sh
+    - command: shell.exec
+      params:
+        shell: "bash"
+        script: |
+          echo "Killing proxies"
+          PID_FILE="socks5_pids.txt"
+
+          if [[ ! -f "$PID_FILE" ]]; then
+            echo "No PID file found ($PID_FILE)"
+            exit 0
+          fi
+
+          cat "$PID_FILE" | while read -r pid; do
+            if [[ -n "$pid" ]]; then
+              if [[ "$OS" =~ Windows|windows ]]; then
+                powershell -NoProfile -Command "Stop-Process -Id $pid -Force" 2>$null || \
+                  echo "PID $pid already gone"
+              else
+                kill "$pid" 2>/dev/null || echo "PID $pid already gone"
+              fi
+            fi
+          done
+
+          rm -f "$PID_FILE"
 
   fix-absolute-paths:
     - command: shell.exec
@@ -1040,8 +1064,13 @@ functions:
           HOST_PORT=$(echo "$MONGODB_URI" | sed 's|mongodb://||' | cut -d',' -f1)
 
           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
+          python3 $DRIVERS_TOOLS/.evergreen/socks5srv.py --map "$MAP_ARG" --port 1080 --auth username:p4ssw0rd & PROXY_PID1=$!
+          python3 $DRIVERS_TOOLS/.evergreen/socks5srv.py --map "$MAP_ARG" --port 1081 & PROXY_PID2=$!
+
+          echo "$PROXY_PID1" > socks5_pids.txt
+          echo "$PROXY_PID2" >> socks5_pids.txt
+
+          echo "Started proxies with PIDs: $PROXY_PID1, $PROXY_PID2"
 
   run-socks5-proxy-tests:
     - command: shell.exec
@@ -1061,8 +1090,7 @@ functions:
           FRAMEWORK=${FRAMEWORK} \
           TARGET="TestSocks5Proxy" \
             evergreen/run-tests.sh
-          OS=${OS} \
-            evergreen/cleanup-proxy.sh
+
 pre:
   - func: fetch-source
   - func: prepare-resources

evergreen/evergreen.yml

@@ -62,6 +62,7 @@ private IClusterInternal CreateCluster(ClusterKey clusterKey)
                 .ConfigureConnectionPool(settings => ConfigureConnectionPool(settings, clusterKey))
                 .ConfigureConnection(settings => ConfigureConnection(settings, clusterKey))
                 .ConfigureTcp(settings => ConfigureTcp(settings, clusterKey))
+                .ConfigureSocks5Proxy(settings => ConfigureSocks5Proxy(settings, clusterKey))
                 .ConfigureLoggingSettings(_ => clusterKey.LoggingSettings);
 #pragma warning restore CS0618 // Type or member is obsolete
 
@@ -174,6 +175,12 @@ private TcpStreamSettings ConfigureTcp(TcpStreamSettings settings, ClusterKey cl
                 writeTimeout: clusterKey.SocketTimeout);
         }
 
+        private ProxyStreamSettings ConfigureSocks5Proxy(ProxyStreamSettings settings, ClusterKey clusterKey)
+        {
+            return settings.With(
+                clusterKey.Socks5ProxySettings);
+        }
+
         internal IClusterInternal GetOrCreateCluster(ClusterKey clusterKey)
         {
             lock (_lock)

src/MongoDB.Driver/ClusterRegistry.cs

@@ -40,7 +40,7 @@ public class ClusterBuilder
         private SslStreamSettings _sslStreamSettings;
         private Func<IStreamFactory, IStreamFactory> _streamFactoryWrapper;
         private TcpStreamSettings _tcpStreamSettings;
-        private Socks5ProxySettings _socks5ProxySettings;
+        private ProxyStreamSettings _proxyStreamSettings;
 
         // constructors
         /// <summary>
@@ -161,11 +161,13 @@ public ClusterBuilder ConfigureTcp(Func<TcpStreamSettings, TcpStreamSettings> co
         /// <summary>
         /// //TODO
         /// </summary>
-        /// <param name="settings"></param>
+        /// <param name="configurator"></param>
         /// <returns></returns>
-        public ClusterBuilder SetSocks5ProxySettings(Socks5ProxySettings settings)
+        public ClusterBuilder ConfigureSocks5Proxy(Func<ProxyStreamSettings, ProxyStreamSettings> configurator)
         {
-            _socks5ProxySettings = settings;
+            Ensure.IsNotNull(configurator, nameof(configurator));
+
+            _proxyStreamSettings = configurator(_proxyStreamSettings ?? new ProxyStreamSettings());
             return this;
         }
 
@@ -299,9 +301,9 @@ private IStreamFactory CreateTcpStreamFactory(TcpStreamSettings tcpStreamSetting
         {
             var streamFactory = (IStreamFactory)new TcpStreamFactory(tcpStreamSettings);
 
-            if (_socks5ProxySettings != null)
+            if (_proxyStreamSettings != null)
             {
-                streamFactory = new ProxyStreamFactory(_socks5ProxySettings, streamFactory);
+                streamFactory = new ProxyStreamFactory(_proxyStreamSettings, streamFactory);
             }
 
             if (_sslStreamSettings != null)

src/MongoDB.Driver/Core/Configuration/ClusterBuilder.cs

@@ -121,11 +121,11 @@ public static ClusterBuilder ConfigureWithConnectionString(
 
             if (connectionString.ProxyHost != null)
             {
-                builder = builder.SetSocks5ProxySettings(Socks5ProxySettings.Create(
+                builder = builder.ConfigureSocks5Proxy(s => s.With(Socks5ProxySettings.Create(
                         connectionString.ProxyHost,
                         connectionString.ProxyPort,
                         connectionString.ProxyUsername,
-                        connectionString.ProxyPassword));
+                        connectionString.ProxyPassword)));
             }
 
             if (connectionString.SocketTimeout != null)

src/MongoDB.Driver/Core/Configuration/ClusterBuilderExtensions.cs

@@ -0,0 +1,52 @@
+/* Copyright 2010-present MongoDB Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using MongoDB.Driver.Core.Connections;
+using MongoDB.Driver.Core.Misc;
+
+namespace MongoDB.Driver.Core.Configuration;
+
+//TODO Add docs
+/// <summary>
+///
+/// </summary>
+public class ProxyStreamSettings
+{
+    private Socks5ProxySettings _socks5ProxySettings;
+
+    /// <summary>
+    ///
+    /// </summary>
+    /// <param name="socks5ProxySettings"></param>
+    public ProxyStreamSettings(Optional<Socks5ProxySettings> socks5ProxySettings = default)
+    {
+        _socks5ProxySettings = socks5ProxySettings.WithDefault(null);
+    }
+
+    /// <summary>
+    ///
+    /// </summary>
+    public Socks5ProxySettings Socks5ProxySettings => _socks5ProxySettings;
+
+    /// <summary>
+    ///
+    /// </summary>
+    /// <param name="socks5ProxySettings"></param>
+    /// <returns></returns>
+    public ProxyStreamSettings With(Socks5ProxySettings socks5ProxySettings)
+    {
+        return new ProxyStreamSettings(socks5ProxySettings);
+    }
+}

src/MongoDB.Driver/Core/Configuration/ProxyStreamSettings.cs

@@ -17,34 +17,35 @@
 using System.Net;
 using System.Threading;
 using System.Threading.Tasks;
+using MongoDB.Driver.Core.Configuration;
 using MongoDB.Driver.Core.Misc;
 
 namespace MongoDB.Driver.Core.Connections;
 
 internal class ProxyStreamFactory: IStreamFactory
 {
-    private readonly Socks5ProxySettings _settings;
+    private readonly ProxyStreamSettings _settings;
     private readonly IStreamFactory _wrapped;
 
-    public ProxyStreamFactory(Socks5ProxySettings settings, IStreamFactory wrapped)
+    public ProxyStreamFactory(ProxyStreamSettings settings, IStreamFactory wrapped)
     {
         _settings = Ensure.IsNotNull(settings, nameof(settings));
         _wrapped = Ensure.IsNotNull(wrapped, nameof(wrapped));
     }
 
     public Stream CreateStream(EndPoint endPoint, CancellationToken cancellationToken)
     {
-        var proxyEndpoint = new DnsEndPoint(_settings.Host, _settings.Port);
+        var proxyEndpoint = new DnsEndPoint(_settings.Socks5ProxySettings.Host, _settings.Socks5ProxySettings.Port);
         var stream = _wrapped.CreateStream(proxyEndpoint, cancellationToken);
-        Socks5Helper.PerformSocks5Handshake(stream, endPoint, _settings.Authentication, cancellationToken);
+        Socks5Helper.PerformSocks5Handshake(stream, endPoint, _settings.Socks5ProxySettings.Authentication, cancellationToken);
         return stream;
     }
 
     public async Task<Stream> CreateStreamAsync(EndPoint endPoint, CancellationToken cancellationToken)
     {
-        var proxyEndpoint = new DnsEndPoint(_settings.Host, _settings.Port);
+        var proxyEndpoint = new DnsEndPoint(_settings.Socks5ProxySettings.Host, _settings.Socks5ProxySettings.Port);
         var stream = await _wrapped.CreateStreamAsync(proxyEndpoint, cancellationToken).ConfigureAwait(false);
-        await Socks5Helper.PerformSocks5HandshakeAsync(stream, endPoint, _settings.Authentication, cancellationToken).ConfigureAwait(false);
+        await Socks5Helper.PerformSocks5HandshakeAsync(stream, endPoint, _settings.Socks5ProxySettings.Authentication, cancellationToken).ConfigureAwait(false);
         return stream;
     }
 }