improve port parsing to be more resilient against trailing characters (…

…#31232) (#31327) improve port parsing to be more resilient against trailing characters
dotnet · Aug 9, 2018 · d6f8efc · d6f8efc
1 parent f602b21
commit d6f8efc
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpEnvironmentProxy.cs b/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpEnvironmentProxy.cs
@@ -227,7 +227,18 @@ private static Uri GetUriFromString(string value)
             else
             {
                 host = value.Substring(0, separatorIndex);
-                if (!UInt16.TryParse(value.AsSpan(separatorIndex + 1), out port))
+                int endIndex = separatorIndex + 1;
+                // Strip any trailing characters after port number.
+                while (endIndex < value.Length)
+                {
+                    if (!char.IsDigit(value[endIndex]))
+                    {
+                        break;
+                    }
+                    endIndex += 1;
+                }
+
+                if (!ushort.TryParse(value.AsSpan(separatorIndex + 1, endIndex - separatorIndex - 1), out port))
                 {
                     return null;
                 }

diff --git a/src/System.Net.Http/tests/UnitTests/HttpEnvironmentProxyTest.cs b/src/System.Net.Http/tests/UnitTests/HttpEnvironmentProxyTest.cs
@@ -112,6 +112,8 @@ public void HttpProxy_EnvironmentProxy_Loaded()
         [InlineData("domain\\foo:[email protected]", "1.1.1.1", "80", "foo", "bar")]
         [InlineData("domain%5Cfoo:[email protected]", "1.1.1.1", "80", "foo", "bar")]
         [InlineData("HTTP://ABC.COM/", "abc.com", "80", null, null)]
+        [InlineData("http://10.30.62.64:7890/", "10.30.62.64", "7890", null, null)]
+        [InlineData("http://1.2.3.4:8888/foo", "1.2.3.4", "8888", null, null)]
         public void HttpProxy_Uri_Parsing(string _input, string _host, string _port, string _user , string _password)
         {
             RemoteInvoke((input, host, port, user, password) =>