Merge branch 'hotfix/1.7.1'

* hotfix/1.7.1: (GH-85) Corrected nuget package description (GH-83) Corrected paths used inside codecov nuget package (GH-84) Properly escape branch names (GH-84) Added unit tests for escaping branch uri data
codecov · Aug 2, 2019 · 91286a2 · 91286a2
2 parents 708d0ae + 1d3a15d
commit 91286a2
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 11 deletions.
diff --git a/Source/Codecov.Tests/Url/QueryTests.cs b/Source/Codecov.Tests/Url/QueryTests.cs
@@ -34,6 +34,26 @@ public void Multiple_Repositories_Should_Used_ContiniousIntegrationServer_First(
             getQuery.FirstOrDefault(x => x.StartsWith("branch=")).Should().Be("branch=develop");
         }
 
+        [Fact]
+        public void Should_Encode_Slashes_In_BranchName()
+        {
+            // Given
+            var queryOptions = Substitute.For<IQueryOptions>();
+            var continiousIntegrationServer = Substitute.For<IRepository>();
+            continiousIntegrationServer.Branch.Returns("release/6.0.0");
+            var versionControlSystem = Substitute.For<IRepository>();
+            versionControlSystem.Branch.Returns("dev");
+            var build = Substitute.For<IBuild>();
+            var yaml = Substitute.For<IYaml>();
+            var query = new Query(queryOptions, new[] { continiousIntegrationServer, versionControlSystem }, build, yaml);
+
+            // When
+            var getQuery = query.GetQuery.Split('&');
+
+            // Then
+            getQuery.Should().Contain("branch=release%2F6.0.0");
+        }
+
         [Fact]
         public void Should_Double_Encode_Pluss_Signs()
         {

diff --git a/Source/Codecov/Url/Query.cs b/Source/Codecov/Url/Query.cs
@@ -60,11 +60,13 @@ private static string EscapeKnownProblematicCharacters(string data)
             return result.ToString();
         }
 
-        private void OverrideIfNotEmptyOrNull(string key, string value)
+        private void OverrideIfNotEmptyOrNull(string key, string value, bool escapeValue = false)
         {
             if (!string.IsNullOrWhiteSpace(value))
             {
-                QueryParameters[key] = value.RemoveAllWhiteSpace();
+                QueryParameters[key] = escapeValue ?
+                    Uri.EscapeDataString(value.RemoveAllWhiteSpace()) :
+                    value.RemoveAllWhiteSpace();
             }
         }
 
@@ -77,8 +79,8 @@ private void SetBranch()
                 if (!string.IsNullOrWhiteSpace(repository.Branch))
                 {
                     // We also need to take into account that '#' needs to be escaped for parameters
-                    // to work, but not '/'
-                    QueryParameters["branch"] = EscapeKnownProblematicCharacters(repository.Branch);
+                    var escapedBranch = EscapeKnownProblematicCharacters(Uri.EscapeDataString(repository.Branch));
+                    QueryParameters["branch"] = escapedBranch;
                     break;
                 }
             }
@@ -88,7 +90,9 @@ private void SetBranch()
 
         private void SetBuild()
         {
-            QueryParameters["build"] = Build.Build;
+            var escapedBuild = Uri.EscapeDataString(Build.Build);
+
+            QueryParameters["build"] = escapedBuild;
             OverrideIfNotEmptyOrNull("build", Options.Build);
         }
 

diff --git a/nuspec/nuget/Codecov.nuspec b/nuspec/nuget/Codecov.nuspec
@@ -12,18 +12,15 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <summary>Codecov global executable uploader.</summary>
     <description>
-Codecov global executable uploader for PowerShell and Windows Command Line.
-
-**IMPORTANT:** This package only provides the Windows Compatible version of Codecov.
-If there is a need to run Codecov on Unix platforms, then please use Codecov.Tool, or download platform specific Archives from our Releases page.
+Codecov global executable uploader for PowerShell and .NET applications/libraries. Supports Windows, Linux and OSX.
     </description>
     <copyright>Copyright (c) 2017-Present Larz White, Kim J. Nordmo</copyright>
     <releaseNotes>All release notes for Codecov can be found on the GitHub site - https://github.com/codecov/codecov-exe/releases/tag/$version$</releaseNotes>
     <tags>coverage codecov</tags>
   </metadata>
   <files>
     <file src="../../../codecov-windows-x64.exe" target="tools/codecov.exe" />
-    <file src="../../../codecov-linux-x64" target="runtimes/linux-x64/tools/codecov" />
-    <file src="../../../codecov-osx-x64" target="runtimes/osx-x64/tools/codecov" />
+    <file src="../../../codecov-linux-x64" target="tools/linux-x64/codecov" />
+    <file src="../../../codecov-osx-x64" target="tools/osx-x64/codecov" />
   </files>
 </package>