Merge pull request #595 from whoisj/fix-1.15

Escaping reserved characters in username when creating resposity uri

Author: J Wyman

Cli-CredentialHelper.Test/OperationArgumentsTests.cs

@@ -84,6 +84,43 @@ public void SpecialCharacters()
             Assert.Equal(expected, actual, StringComparer.Ordinal);
         }
 
+        [Fact]
+        public void EmailAsUserName()
+        {
+            var input = new InputArg
+            {
+                Host = "example.visualstudio.com",
+                Password = "ḭncorrect",
+                Path = "path",
+                Protocol = Uri.UriSchemeHttps,
+                Username = "[email protected]"
+            };
+
+            OperationArguments cut;
+            using (var memory = new MemoryStream())
+            using (var writer = new StreamWriter(memory))
+            {
+                writer.Write(input.ToString());
+                writer.Flush();
+
+                memory.Seek(0, SeekOrigin.Begin);
+
+                cut = new OperationArguments(memory);
+            }
+
+            Assert.Equal(input.Protocol, cut.QueryProtocol, StringComparer.Ordinal);
+            Assert.Equal(input.Host, cut.QueryHost, StringComparer.Ordinal);
+            Assert.Equal(input.Path, cut.QueryPath, StringComparer.Ordinal);
+            Assert.Equal(input.Username, cut.Username, StringComparer.Ordinal);
+            Assert.Equal(input.Password, cut.Password, StringComparer.Ordinal);
+
+            Assert.Equal("https://[email protected]@example.visualstudio.com/path", cut.TargetUri.ToString(), StringComparer.Ordinal);
+
+            var expected = input.ToString();
+            var actual = cut.ToString();
+            Assert.Equal(expected, actual, StringComparer.Ordinal);
+        }
+
         [Fact]
         public void CreateTargetUriGitHubSimple()
         {

Cli-Shared/OperationArguments.cs

@@ -511,7 +511,11 @@ internal virtual void CreateTargetUri()
             // Username.
             if (!string.IsNullOrWhiteSpace(_username))
             {
-                buffer.Append(_username)
+                var username = NeedsToBeEscaped(_username)
+                    ? Uri.EscapeDataString(_username)
+                    : _username;
+
+                buffer.Append(username)
                       .Append('@');
             }
 
@@ -530,5 +534,35 @@ internal virtual void CreateTargetUri()
             // Create the target URI object.
             _targetUri = new TargetUri(queryUrl, proxyUrl);
         }
+
+        private static bool NeedsToBeEscaped(string value)
+        {
+            for (int i = 0; i < value.Length; i += 1)
+            {
+                switch (value[i])
+                {
+                    case ':':
+                    case '/':
+                    case '?':
+                    case '#':
+                    case '[':
+                    case ']':
+                    case '@':
+                    case '!':
+                    case '$':
+                    case '&':
+                    case '\'':
+                    case '(':
+                    case ')':
+                    case '*':
+                    case '+':
+                    case ',':
+                    case ';':
+                    case '=':
+                        return true;
+                }
+            }
+            return false;
+        }
     }
 }