Fix handling of missing header case in UploadHelper (#6491)

Also, clean up the parsed GUID to avoid weird casing or leading space issues
Fix #6490

Author: joelverhagen

src/NuGetGallery/Helpers/UploadHelper.cs

@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using System.Collections.Generic;
 using System.Collections.Specialized;
 
 namespace NuGetGallery.Helpers
@@ -20,9 +19,9 @@ public static string GetUploadTracingKey(NameValueCollection headers)
             try
             {
                 uploadTracingKey = headers[CoreConstants.UploadTracingKeyHeaderName];
-                Guid.Parse(uploadTracingKey);
+                uploadTracingKey = Guid.Parse(uploadTracingKey).ToString();
             }
-            catch (Exception ex) when (ex is FormatException || ex is KeyNotFoundException)
+            catch (Exception ex) when (ex is FormatException || ex is ArgumentNullException)
             {
                 // An upload tracing key was not found
                 // Simultaneous UI uploads might have strange behaviour.

tests/NuGetGallery.Facts/Helpers/UploadHelperFacts.cs

@@ -0,0 +1,57 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System.Collections.Specialized;
+using Xunit;
+
+namespace NuGetGallery.Helpers
+{
+    public class UploadHelperFacts
+    {
+        public class TheGetUploadTracingKeyMethod
+        {
+            private const string EmptyGuid = "00000000-0000-0000-0000-000000000000";
+
+            [Fact]
+            public void ReturnsEmptyGuidForMissingHeader()
+            {
+                var headers = new NameValueCollection();
+
+                var result = UploadHelper.GetUploadTracingKey(headers);
+
+                Assert.Equal(EmptyGuid, result);
+            }
+
+            [Theory]
+            [InlineData(null)]
+            [InlineData("")]
+            [InlineData("not-a-guid")]
+            [InlineData("00000000-0000-0000-0000-000000000000")]
+            [InlineData(" 00000000-0000-0000-0000-000000000000 ")]
+            public void ReturnsEmptyGuidForInvalidOrEmptyGuid(string value)
+            {
+                var headers = new NameValueCollection();
+                headers["upload-id"] = value;
+
+                var result = UploadHelper.GetUploadTracingKey(headers);
+
+                Assert.Equal(EmptyGuid, result);
+            }
+
+            [Theory]
+            [InlineData("3bcf7d12-eb0a-46c9-98a8-c160801e8134")]
+            [InlineData("3bcf7d12eb0a46c998a8c160801e8134")]
+            [InlineData("3BCF7D12-EB0A-46C9-98A8-C160801E8134")]
+            [InlineData(" 3bcf7d12-eb0a-46c9-98a8-c160801e8134 ")]
+            public void ReturnsGuidForValidGuid(string value)
+            {
+                var headers = new NameValueCollection();
+                headers["upload-id"] = value;
+
+                var result = UploadHelper.GetUploadTracingKey(headers);
+
+                Assert.Equal("3bcf7d12-eb0a-46c9-98a8-c160801e8134", result);
+            }
+        }
+    }
+}

tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj

@@ -88,6 +88,7 @@
     <Compile Include="Framework\MemberDataHelper.cs" />
     <Compile Include="Helpers\ObfuscationHelperFacts.cs" />
     <Compile Include="Helpers\PackageHelperTests.cs" />
+    <Compile Include="Helpers\UploadHelperFacts.cs" />
     <Compile Include="Infrastructure\Authentication\ApiKeyV3Facts.cs" />
     <Compile Include="Infrastructure\Authentication\ApiKeyV4Facts.cs" />
     <Compile Include="Infrastructure\Authentication\V3HasherTests.cs" />