http: allow NO_PROXY split with space

Author: mjcheetham

docs/netconfig.md

@@ -61,9 +61,9 @@ In some circumstances you may wish to bypass a configured proxy for specific
 addresses. GCM Core supports the cURL environment variable `NO_PROXY` for this
 scenariom, as does Git itself.
 
-The `NO_PROXY` environment variable should contain a comma (`,`) separated list
-of regular expressions to match hosts that should not be proxied (should connect
-directly).
+The `NO_PROXY` environment variable should contain a comma (`,`) or space (` `)
+separated list of regular expressions to match hosts that should not be proxied
+(should connect directly).
 
 **Example:**
 

src/shared/Microsoft.Git.CredentialManager.Tests/SettingsTests.cs

@@ -556,6 +556,42 @@ public void Settings_ProxyConfiguration_GitHttpConfig_ReturnsValue()
             Assert.False(actualConfig.IsDeprecatedSource);
         }
 
+        [Fact]
+        public void Settings_ProxyConfiguration_NoProxyMixedSplitChar_ReturnsValue()
+        {
+            const string remoteUrl = "http://example.com/foo.git";
+            const string section = Constants.GitConfiguration.Http.SectionName;
+            const string property = Constants.GitConfiguration.Http.Proxy;
+            var remoteUri = new Uri(remoteUrl);
+
+            const string expectedUserName = "john.doe";
+            const string expectedPassword = "letmein123";
+            var expectedAddress = new Uri("http://proxy.example.com");
+            var settingValue = new Uri("http://john.doe:[email protected]");
+            var bypassList = new List<string> {"contoso.com", "fabrikam.com", "example.com"};
+
+            var envars = new TestEnvironment
+            {
+                Variables = {[Constants.EnvironmentVariables.CurlNoProxy] = "contoso.com, fabrikam.com example.com,"}
+            };
+            var git = new TestGit();
+            git.GlobalConfiguration[$"{section}.{property}"] = settingValue.ToString();
+
+            var settings = new Settings(envars, git)
+            {
+                RemoteUri = remoteUri
+            };
+
+            ProxyConfiguration actualConfig = settings.GetProxyConfiguration();
+
+            Assert.NotNull(actualConfig);
+            Assert.Equal(expectedAddress, actualConfig.Address);
+            Assert.Equal(expectedUserName, actualConfig.UserName);
+            Assert.Equal(expectedPassword, actualConfig.Password);
+            Assert.Equal(bypassList, actualConfig.BypassHosts);
+            Assert.False(actualConfig.IsDeprecatedSource);
+        }
+
         [Fact]
         public void Settings_ProxyConfiguration_CurlHttpEnvar_ReturnsValue()
         {

src/shared/Microsoft.Git.CredentialManager/Settings.cs

@@ -397,6 +397,8 @@ bool TryGetUriSetting(string envarName, string section, string property, out Uri
                 return false;
             }
 
+            char[] bypassListSeparators = {',', ' '};
+
             ProxyConfiguration CreateConfiguration(Uri uri, bool isLegacy = false)
             {
                 // Strip the userinfo, query, and fragment parts of the Uri retaining only the scheme, host, port, and path
@@ -413,9 +415,9 @@ ProxyConfiguration CreateConfiguration(Uri uri, bool isLegacy = false)
 
                 // Get the proxy bypass host names
                 var bypassHosts = new List<string>();
-                if (_environment.Variables.TryGetValue(KnownEnvars.CurlNoProxy, out string noProxyStr))
+                if (_environment.Variables.TryGetValue(KnownEnvars.CurlNoProxy, out string noProxyStr) && noProxyStr != null)
                 {
-                    bypassHosts = noProxyStr.Split(',').ToList();
+                    bypassHosts.AddRange(noProxyStr.Split(bypassListSeparators, StringSplitOptions.RemoveEmptyEntries));
                 }
 
                 return new ProxyConfiguration(address, userName, password, bypassHosts, isLegacy);