remove allowEmptyProxyConfig parameter

snowflakedb · Aug 1, 2024 · 737d695 · 737d695
1 parent dd4d836
commit 737d695
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 75 deletions.
diff --git a/Snowflake.Data.Tests/UnitTests/HttpUtilTest.cs b/Snowflake.Data.Tests/UnitTests/HttpUtilTest.cs
@@ -101,12 +101,11 @@ public void TestGetJitter(int seconds)
         }
 
         [Test]
-        public void TestCreateHttpClientHandlerWithExplicitProxy([Values] bool allowEmptyProxy)
+        public void TestCreateHttpClientHandlerWithExplicitProxy()
         {
             // given
             var config = new HttpClientConfig(
                 true,
-                allowEmptyProxy,
                 true,
                 "snowflake.com",
                 "123",
@@ -127,11 +126,10 @@ public void TestCreateHttpClientHandlerWithExplicitProxy([Values] bool allowEmpt
         }
 
         [Test]
-        public void TestCreateHttpClientHandlerWithImplicitProxy()
+        public void TestCreateHttpClientHandlerWithDefaultProxy()
         {
             // given
             var config = new HttpClientConfig(
-                true,
                 true,
                 true,
                 null,
@@ -153,21 +151,20 @@ public void TestCreateHttpClientHandlerWithImplicitProxy()
         }
 
         [Test]
-        public void TestDoNotCreateHttpClientHandlerWithImplicitProxyWhenEmptyProxyNotAllowed()
+        public void TestCreateHttpClientHandlerWithoutProxy()
         {
             // given
             var config = new HttpClientConfig(
-                true,
                 false,
-                true,
+                false,
                 null,
                 null,
                 null,
                 null,
                 null,
                 false,
                 false,
-                7
+                0
             );
 
             // when
@@ -179,21 +176,20 @@ public void TestDoNotCreateHttpClientHandlerWithImplicitProxyWhenEmptyProxyNotAl
         }
 
         [Test]
-        public void ShouldCreateHttpClientHandlerWithoutProxy([Values] bool allowEmptyProxy)
+        public void TestIgnoreProxyDetailsIfProxyDisabled()
         {
             // given
             var config = new HttpClientConfig(
+                true,
                 false,
-                allowEmptyProxy,
-                false,
-                null,
-                null,
-                null,
-                null,
-                null,
+                "snowflake.com",
+                "123",
+                "testUser",
+                "proxyPassword",
+                "localhost",
                 false,
                 false,
-                0
+                7
             );
 
             // when

diff --git a/Snowflake.Data.Tests/UnitTests/SFSessionPropertyTest.cs b/Snowflake.Data.Tests/UnitTests/SFSessionPropertyTest.cs
@@ -167,19 +167,6 @@ public void TestResolveConnectionArea(string host, string expectedMessage)
             Assert.AreEqual(expectedMessage, message);
         }
 
-        [Test]
-        [TestCase("ACCOUNT=account;USER=test;PASSWORD=test;ALLOWEMPTYPROXY=false", "false")]
-        [TestCase("ACCOUNT=account;USER=test;PASSWORD=test;ALLOWEMPTYPROXY=true", "true")]
-        [TestCase("ACCOUNT=account;USER=test;PASSWORD=test", "false")]
-        public void TestParseAllowEmptyProxy(string connectionString, string expectedAllowEmptyProxy)
-        {
-            // act
-            var properties = SFSessionProperties.ParseConnectionString(connectionString, null);
-
-            // assert
-            Assert.AreEqual(expectedAllowEmptyProxy, properties[SFSessionProperty.ALLOWEMPTYPROXY]);
-        }
-
         [Test]
         public void TestFailWhenProxyConfiguredWithoutPort()
         {
@@ -288,8 +275,7 @@ public static IEnumerable<TestCase> ConnectionStringTestCases()
                     { SFSessionProperty.WAITINGFORIDLESESSIONTIMEOUT, DefaultValue(SFSessionProperty.WAITINGFORIDLESESSIONTIMEOUT) },
                     { SFSessionProperty.EXPIRATIONTIMEOUT, DefaultValue(SFSessionProperty.EXPIRATIONTIMEOUT) },
                     { SFSessionProperty.POOLINGENABLED, DefaultValue(SFSessionProperty.POOLINGENABLED) },
-                    { SFSessionProperty.DISABLE_SAML_URL_CHECK, DefaultValue(SFSessionProperty.DISABLE_SAML_URL_CHECK) },
-                    { SFSessionProperty.ALLOWEMPTYPROXY, DefaultValue(SFSessionProperty.ALLOWEMPTYPROXY) }
+                    { SFSessionProperty.DISABLE_SAML_URL_CHECK, DefaultValue(SFSessionProperty.DISABLE_SAML_URL_CHECK) }
                 }
             };
 
@@ -325,8 +311,7 @@ public static IEnumerable<TestCase> ConnectionStringTestCases()
                     { SFSessionProperty.WAITINGFORIDLESESSIONTIMEOUT, DefaultValue(SFSessionProperty.WAITINGFORIDLESESSIONTIMEOUT) },
                     { SFSessionProperty.EXPIRATIONTIMEOUT, DefaultValue(SFSessionProperty.EXPIRATIONTIMEOUT) },
                     { SFSessionProperty.POOLINGENABLED, DefaultValue(SFSessionProperty.POOLINGENABLED) },
-                    { SFSessionProperty.DISABLE_SAML_URL_CHECK, DefaultValue(SFSessionProperty.DISABLE_SAML_URL_CHECK) },
-                    { SFSessionProperty.ALLOWEMPTYPROXY, DefaultValue(SFSessionProperty.ALLOWEMPTYPROXY) }
+                    { SFSessionProperty.DISABLE_SAML_URL_CHECK, DefaultValue(SFSessionProperty.DISABLE_SAML_URL_CHECK) }
                 }
             };
             var testCaseWithProxySettings = new TestCase()
@@ -364,8 +349,7 @@ public static IEnumerable<TestCase> ConnectionStringTestCases()
                     { SFSessionProperty.WAITINGFORIDLESESSIONTIMEOUT, DefaultValue(SFSessionProperty.WAITINGFORIDLESESSIONTIMEOUT) },
                     { SFSessionProperty.EXPIRATIONTIMEOUT, DefaultValue(SFSessionProperty.EXPIRATIONTIMEOUT) },
                     { SFSessionProperty.POOLINGENABLED, DefaultValue(SFSessionProperty.POOLINGENABLED) },
-                    { SFSessionProperty.DISABLE_SAML_URL_CHECK, DefaultValue(SFSessionProperty.DISABLE_SAML_URL_CHECK) },
-                    { SFSessionProperty.ALLOWEMPTYPROXY, DefaultValue(SFSessionProperty.ALLOWEMPTYPROXY) }
+                    { SFSessionProperty.DISABLE_SAML_URL_CHECK, DefaultValue(SFSessionProperty.DISABLE_SAML_URL_CHECK) }
                 },
                 ConnectionString =
                     $"ACCOUNT={defAccount};USER={defUser};PASSWORD={defPassword};useProxy=true;proxyHost=proxy.com;proxyPort=1234;nonProxyHosts=localhost"
@@ -405,8 +389,7 @@ public static IEnumerable<TestCase> ConnectionStringTestCases()
                     { SFSessionProperty.WAITINGFORIDLESESSIONTIMEOUT, DefaultValue(SFSessionProperty.WAITINGFORIDLESESSIONTIMEOUT) },
                     { SFSessionProperty.EXPIRATIONTIMEOUT, DefaultValue(SFSessionProperty.EXPIRATIONTIMEOUT) },
                     { SFSessionProperty.POOLINGENABLED, DefaultValue(SFSessionProperty.POOLINGENABLED) },
-                    { SFSessionProperty.DISABLE_SAML_URL_CHECK, DefaultValue(SFSessionProperty.DISABLE_SAML_URL_CHECK) },
-                    { SFSessionProperty.ALLOWEMPTYPROXY, DefaultValue(SFSessionProperty.ALLOWEMPTYPROXY) }
+                    { SFSessionProperty.DISABLE_SAML_URL_CHECK, DefaultValue(SFSessionProperty.DISABLE_SAML_URL_CHECK) }
                 },
                 ConnectionString =
                     $"ACCOUNT={defAccount};USER={defUser};PASSWORD={defPassword};proxyHost=proxy.com;proxyPort=1234;nonProxyHosts=localhost"
@@ -445,8 +428,7 @@ public static IEnumerable<TestCase> ConnectionStringTestCases()
                     { SFSessionProperty.WAITINGFORIDLESESSIONTIMEOUT, DefaultValue(SFSessionProperty.WAITINGFORIDLESESSIONTIMEOUT) },
                     { SFSessionProperty.EXPIRATIONTIMEOUT, DefaultValue(SFSessionProperty.EXPIRATIONTIMEOUT) },
                     { SFSessionProperty.POOLINGENABLED, DefaultValue(SFSessionProperty.POOLINGENABLED) },
-                    { SFSessionProperty.DISABLE_SAML_URL_CHECK, DefaultValue(SFSessionProperty.DISABLE_SAML_URL_CHECK) },
-                    { SFSessionProperty.ALLOWEMPTYPROXY, DefaultValue(SFSessionProperty.ALLOWEMPTYPROXY) }
+                    { SFSessionProperty.DISABLE_SAML_URL_CHECK, DefaultValue(SFSessionProperty.DISABLE_SAML_URL_CHECK) }
                 }
             };
             var testCaseWithIncludeRetryReason = new TestCase()
@@ -482,8 +464,7 @@ public static IEnumerable<TestCase> ConnectionStringTestCases()
                     { SFSessionProperty.WAITINGFORIDLESESSIONTIMEOUT, DefaultValue(SFSessionProperty.WAITINGFORIDLESESSIONTIMEOUT) },
                     { SFSessionProperty.EXPIRATIONTIMEOUT, DefaultValue(SFSessionProperty.EXPIRATIONTIMEOUT) },
                     { SFSessionProperty.POOLINGENABLED, DefaultValue(SFSessionProperty.POOLINGENABLED) },
-                    { SFSessionProperty.DISABLE_SAML_URL_CHECK, DefaultValue(SFSessionProperty.DISABLE_SAML_URL_CHECK) },
-                    { SFSessionProperty.ALLOWEMPTYPROXY, DefaultValue(SFSessionProperty.ALLOWEMPTYPROXY) }
+                    { SFSessionProperty.DISABLE_SAML_URL_CHECK, DefaultValue(SFSessionProperty.DISABLE_SAML_URL_CHECK) }
                 }
             };
             var testCaseWithDisableQueryContextCache = new TestCase()
@@ -518,8 +499,7 @@ public static IEnumerable<TestCase> ConnectionStringTestCases()
                     { SFSessionProperty.WAITINGFORIDLESESSIONTIMEOUT, DefaultValue(SFSessionProperty.WAITINGFORIDLESESSIONTIMEOUT) },
                     { SFSessionProperty.EXPIRATIONTIMEOUT, DefaultValue(SFSessionProperty.EXPIRATIONTIMEOUT) },
                     { SFSessionProperty.POOLINGENABLED, DefaultValue(SFSessionProperty.POOLINGENABLED) },
-                    { SFSessionProperty.DISABLE_SAML_URL_CHECK, DefaultValue(SFSessionProperty.DISABLE_SAML_URL_CHECK) },
-                    { SFSessionProperty.ALLOWEMPTYPROXY, DefaultValue(SFSessionProperty.ALLOWEMPTYPROXY) }
+                    { SFSessionProperty.DISABLE_SAML_URL_CHECK, DefaultValue(SFSessionProperty.DISABLE_SAML_URL_CHECK) }
                 },
                 ConnectionString =
                     $"ACCOUNT={defAccount};USER={defUser};PASSWORD={defPassword};DISABLEQUERYCONTEXTCACHE=true"
@@ -556,8 +536,7 @@ public static IEnumerable<TestCase> ConnectionStringTestCases()
                     { SFSessionProperty.WAITINGFORIDLESESSIONTIMEOUT, DefaultValue(SFSessionProperty.WAITINGFORIDLESESSIONTIMEOUT) },
                     { SFSessionProperty.EXPIRATIONTIMEOUT, DefaultValue(SFSessionProperty.EXPIRATIONTIMEOUT) },
                     { SFSessionProperty.POOLINGENABLED, DefaultValue(SFSessionProperty.POOLINGENABLED) },
-                    { SFSessionProperty.DISABLE_SAML_URL_CHECK, DefaultValue(SFSessionProperty.DISABLE_SAML_URL_CHECK) },
-                    { SFSessionProperty.ALLOWEMPTYPROXY, DefaultValue(SFSessionProperty.ALLOWEMPTYPROXY) }
+                    { SFSessionProperty.DISABLE_SAML_URL_CHECK, DefaultValue(SFSessionProperty.DISABLE_SAML_URL_CHECK) }
                 },
                 ConnectionString =
                     $"ACCOUNT={defAccount};USER={defUser};PASSWORD={defPassword};DISABLE_CONSOLE_LOGIN=false"
@@ -596,8 +575,7 @@ public static IEnumerable<TestCase> ConnectionStringTestCases()
                     { SFSessionProperty.WAITINGFORIDLESESSIONTIMEOUT, DefaultValue(SFSessionProperty.WAITINGFORIDLESESSIONTIMEOUT) },
                     { SFSessionProperty.EXPIRATIONTIMEOUT, DefaultValue(SFSessionProperty.EXPIRATIONTIMEOUT) },
                     { SFSessionProperty.POOLINGENABLED, DefaultValue(SFSessionProperty.POOLINGENABLED) },
-                    { SFSessionProperty.DISABLE_SAML_URL_CHECK, DefaultValue(SFSessionProperty.DISABLE_SAML_URL_CHECK) },
-                    { SFSessionProperty.ALLOWEMPTYPROXY, DefaultValue(SFSessionProperty.ALLOWEMPTYPROXY) }
+                    { SFSessionProperty.DISABLE_SAML_URL_CHECK, DefaultValue(SFSessionProperty.DISABLE_SAML_URL_CHECK) }
                 }
             };
             var testCaseUnderscoredAccountName = new TestCase()
@@ -633,8 +611,7 @@ public static IEnumerable<TestCase> ConnectionStringTestCases()
                     { SFSessionProperty.WAITINGFORIDLESESSIONTIMEOUT, DefaultValue(SFSessionProperty.WAITINGFORIDLESESSIONTIMEOUT) },
                     { SFSessionProperty.EXPIRATIONTIMEOUT, DefaultValue(SFSessionProperty.EXPIRATIONTIMEOUT) },
                     { SFSessionProperty.POOLINGENABLED, DefaultValue(SFSessionProperty.POOLINGENABLED) },
-                    { SFSessionProperty.DISABLE_SAML_URL_CHECK, DefaultValue(SFSessionProperty.DISABLE_SAML_URL_CHECK) },
-                    { SFSessionProperty.ALLOWEMPTYPROXY, DefaultValue(SFSessionProperty.ALLOWEMPTYPROXY) }
+                    { SFSessionProperty.DISABLE_SAML_URL_CHECK, DefaultValue(SFSessionProperty.DISABLE_SAML_URL_CHECK) }
                 }
             };
             var testCaseUnderscoredAccountNameWithEnabledAllowUnderscores = new TestCase()
@@ -670,8 +647,7 @@ public static IEnumerable<TestCase> ConnectionStringTestCases()
                     { SFSessionProperty.WAITINGFORIDLESESSIONTIMEOUT, DefaultValue(SFSessionProperty.WAITINGFORIDLESESSIONTIMEOUT) },
                     { SFSessionProperty.EXPIRATIONTIMEOUT, DefaultValue(SFSessionProperty.EXPIRATIONTIMEOUT) },
                     { SFSessionProperty.POOLINGENABLED, DefaultValue(SFSessionProperty.POOLINGENABLED) },
-                    { SFSessionProperty.DISABLE_SAML_URL_CHECK, DefaultValue(SFSessionProperty.DISABLE_SAML_URL_CHECK) },
-                    { SFSessionProperty.ALLOWEMPTYPROXY, DefaultValue(SFSessionProperty.ALLOWEMPTYPROXY) }
+                    { SFSessionProperty.DISABLE_SAML_URL_CHECK, DefaultValue(SFSessionProperty.DISABLE_SAML_URL_CHECK) }
                 }
             };
             var testQueryTag = "Test QUERY_TAG 12345";
@@ -709,8 +685,7 @@ public static IEnumerable<TestCase> ConnectionStringTestCases()
                     { SFSessionProperty.WAITINGFORIDLESESSIONTIMEOUT, DefaultValue(SFSessionProperty.WAITINGFORIDLESESSIONTIMEOUT) },
                     { SFSessionProperty.EXPIRATIONTIMEOUT, DefaultValue(SFSessionProperty.EXPIRATIONTIMEOUT) },
                     { SFSessionProperty.POOLINGENABLED, DefaultValue(SFSessionProperty.POOLINGENABLED) },
-                    { SFSessionProperty.DISABLE_SAML_URL_CHECK, DefaultValue(SFSessionProperty.DISABLE_SAML_URL_CHECK) },
-                    { SFSessionProperty.ALLOWEMPTYPROXY, DefaultValue(SFSessionProperty.ALLOWEMPTYPROXY) }
+                    { SFSessionProperty.DISABLE_SAML_URL_CHECK, DefaultValue(SFSessionProperty.DISABLE_SAML_URL_CHECK) }
                 }
             };
 

diff --git a/Snowflake.Data/Core/HttpUtil.cs b/Snowflake.Data/Core/HttpUtil.cs
@@ -21,7 +21,6 @@ public class HttpClientConfig
     {
         public HttpClientConfig(
             bool crlCheckEnabled,
-            bool allowEmptyProxy,
             bool useProxy,
             string proxyHost,
             string proxyPort,
@@ -34,7 +33,6 @@ public HttpClientConfig(
             bool includeRetryReason = true)
         {
             CrlCheckEnabled = crlCheckEnabled;
-            AllowEmptyProxy = allowEmptyProxy;
             UseProxy = useProxy;
             ProxyHost = proxyHost;
             ProxyPort = proxyPort;
@@ -49,7 +47,6 @@ public HttpClientConfig(
             ConfKey = string.Join(";",
                 new string[] {
                     crlCheckEnabled.ToString(),
-                    allowEmptyProxy.ToString(),
                     useProxy.ToString(),
                     proxyHost,
                     proxyPort,
@@ -63,7 +60,6 @@ public HttpClientConfig(
         }
 
         public readonly bool CrlCheckEnabled;
-        public readonly bool AllowEmptyProxy;
         public readonly bool UseProxy;
         public readonly string ProxyHost;
         public readonly string ProxyPort;
@@ -162,17 +158,17 @@ internal HttpMessageHandler SetupCustomHttpHandler(HttpClientConfig config)
                 };
             }
 
-            httpHandler.UseProxy = config.UseProxy && (config.AllowEmptyProxy || !string.IsNullOrEmpty(config.ProxyHost));
+            httpHandler.UseProxy = config.UseProxy;
 
-            if (httpHandler.UseProxy && !string.IsNullOrEmpty(config.ProxyHost))
+            if (config.UseProxy && !string.IsNullOrEmpty(config.ProxyHost))
             {
-                logger.Info("Configuring proxy based on connection string properties");
+                logger.Info("Configuring proxy based on connection properties");
                 var proxy = ConfigureWebProxy(config);
                 httpHandler.Proxy = proxy;
             }
-            else if (httpHandler.UseProxy)
+            else if (config.UseProxy)
             {
-                logger.Info("Proxy enabled, but not configured due to allowEmptyProxy property set to true");
+                logger.Info("Using a default proxy");
             }
 
             return httpHandler;

diff --git a/Snowflake.Data/Core/Session/SFSessionHttpClientProperties.cs b/Snowflake.Data/Core/Session/SFSessionHttpClientProperties.cs
@@ -179,7 +179,6 @@ public HttpClientConfig BuildHttpClientConfig()
         {
             return new HttpClientConfig(
                 !insecureMode,
-                proxyProperties.allowEmptyProxy,
                 proxyProperties.useProxy,
                 proxyProperties.proxyHost,
                 proxyProperties.proxyPort,

diff --git a/Snowflake.Data/Core/Session/SFSessionHttpClientProxyProperties.cs b/Snowflake.Data/Core/Session/SFSessionHttpClientProxyProperties.cs
@@ -6,7 +6,6 @@ namespace Snowflake.Data.Core
 
     internal class SFSessionHttpClientProxyProperties
     {
-        internal bool allowEmptyProxy = false;
         internal bool useProxy = false;
         internal string proxyHost = null;
         internal string proxyPort = null;
@@ -30,7 +29,6 @@ public SFSessionHttpClientProxyProperties ExtractProperties(SFSessionProperties
                 if (properties.useProxy)
                 {
                     // Let's try to get the associated RestRequester
-                    properties.allowEmptyProxy = Boolean.Parse(propertiesDictionary[SFSessionProperty.ALLOWEMPTYPROXY]);
                     propertiesDictionary.TryGetValue(SFSessionProperty.PROXYHOST, out properties.proxyHost);
                     propertiesDictionary.TryGetValue(SFSessionProperty.PROXYPORT, out properties.proxyPort);
                     propertiesDictionary.TryGetValue(SFSessionProperty.NONPROXYHOSTS, out properties.nonProxyHosts);

diff --git a/Snowflake.Data/Core/Session/SFSessionProperty.cs b/Snowflake.Data/Core/Session/SFSessionProperty.cs
@@ -112,9 +112,7 @@ internal enum SFSessionProperty
         [SFSessionPropertyAttr(required = false, defaultValue = "true")]
         POOLINGENABLED,
         [SFSessionPropertyAttr(required = false, defaultValue = "false")]
-        DISABLE_SAML_URL_CHECK,
-        [SFSessionPropertyAttr(required = false, defaultValue = "false")]
-        ALLOWEMPTYPROXY
+        DISABLE_SAML_URL_CHECK
     }
 
     class SFSessionPropertyAttr : Attribute