fix getcredentialembeddedurl() (#643)

Author: TingluoHuang

src/Microsoft.VisualStudio.Services.Agent/Util/UrlUtil.cs

@@ -23,12 +23,15 @@ public static Uri GetCredentialEmbeddedUrl(Uri baseUrl, string username, string
 
             UriBuilder credUri = new UriBuilder(baseUrl);
 
-            // escape chars in username for uri
-            if (!string.IsNullOrEmpty(username))
+            // ensure we have a username, uribuild will throw if username is empty but password is not.
+            if (string.IsNullOrEmpty(username))
             {
-                credUri.UserName = Uri.EscapeDataString(username);
+                username = "emptyusername";
             }
 
+            // escape chars in username for uri
+            credUri.UserName = Uri.EscapeDataString(username);
+
             // escape chars in password for uri
             if (!string.IsNullOrEmpty(password))
             {

src/Test/L0/Util/UrlUtilL0.cs

@@ -0,0 +1,65 @@
+using System;
+using Microsoft.TeamFoundation.DistributedTask.WebApi;
+using Microsoft.VisualStudio.Services.Agent.Util;
+using Xunit;
+
+namespace Microsoft.VisualStudio.Services.Agent.Tests.Util
+{
+    public class UrlUtilL0
+    {
+        [Fact]
+        [Trait("Level", "L0")]
+        [Trait("Category", "Common")]
+        public void GetCredentialEmbeddedUrl_NoUsernameAndPassword()
+        {
+            // Act.
+            Uri result = UrlUtil.GetCredentialEmbeddedUrl(new Uri("https://github.com/Microsoft/vsts-agent.git"), string.Empty, string.Empty);
+            // Actual
+            Assert.Equal("https://github.com/Microsoft/vsts-agent.git", result.AbsoluteUri);
+        }
+
+        [Fact]
+        [Trait("Level", "L0")]
+        [Trait("Category", "Common")]
+        public void GetCredentialEmbeddedUrl_NoUsername()
+        {
+            // Act.
+            Uri result = UrlUtil.GetCredentialEmbeddedUrl(new Uri("https://github.com/Microsoft/vsts-agent.git"), string.Empty, "password123");
+            // Actual
+            Assert.Equal("https://emptyusername:[email protected]/Microsoft/vsts-agent.git", result.AbsoluteUri);
+        }
+
+        [Fact]
+        [Trait("Level", "L0")]
+        [Trait("Category", "Common")]
+        public void GetCredentialEmbeddedUrl_NoPassword()
+        {
+            // Act.
+            Uri result = UrlUtil.GetCredentialEmbeddedUrl(new Uri("https://github.com/Microsoft/vsts-agent.git"), "user123", string.Empty);
+            // Actual
+            Assert.Equal("https://[email protected]/Microsoft/vsts-agent.git", result.AbsoluteUri);
+        }
+
+        [Fact]
+        [Trait("Level", "L0")]
+        [Trait("Category", "Common")]
+        public void GetCredentialEmbeddedUrl_HasUsernameAndPassword()
+        {
+            // Act.
+            Uri result = UrlUtil.GetCredentialEmbeddedUrl(new Uri("https://github.com/Microsoft/vsts-agent.git"), "user123", "password123");
+            // Actual
+            Assert.Equal("https://user123:[email protected]/Microsoft/vsts-agent.git", result.AbsoluteUri);
+        }
+
+        [Fact]
+        [Trait("Level", "L0")]
+        [Trait("Category", "Common")]
+        public void GetCredentialEmbeddedUrl_UsernameAndPasswordEncoding()
+        {
+            // Act.
+            Uri result = UrlUtil.GetCredentialEmbeddedUrl(new Uri("https://github.com/Microsoft/vsts-agent.git"), "user 123", "password 123");
+            // Actual
+            Assert.Equal("https://user%20123:password%[email protected]/Microsoft/vsts-agent.git", result.AbsoluteUri);
+        }
+    }
+}