Remove TrimStart in PAX extended attributes (dotnet#78707)

* Remove TrimStart in PAX extended attributes * Adjust existing tests with two extra inline datas. Co-authored-by: carlossanlop <carlossanlop@users.noreply.github.com>
carlossanlop · Nov 23, 2022 · 087eccd · 087eccd
1 parent 622f6a0
commit 087eccd
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/src/libraries/System.Formats.Tar/src/System/Formats/Tar/TarHeader.Read.cs b/src/libraries/System.Formats.Tar/src/System/Formats/Tar/TarHeader.Read.cs
@@ -723,7 +723,7 @@ private static bool TryGetNextExtendedAttribute(
             {
                 return false;
             }
-            line = line.Slice(spacePos + 1).TrimStart((byte)' ');
+            line = line.Slice(spacePos + 1);
 
             // Find the equal separator.
             int equalPos = line.IndexOf((byte)'=');

diff --git a/...aries/System.Formats.Tar/tests/TarReader/TarReader.File.GlobalExtendedAttributes.Tests.cs b/...aries/System.Formats.Tar/tests/TarReader/TarReader.File.GlobalExtendedAttributes.Tests.cs
@@ -85,8 +85,10 @@ public void ExtractGlobalExtendedAttributesEntry_Throws()
 
         [Theory]
         [InlineData("key", "value")]
-        [InlineData("key     ", "   value    ")]
-        [InlineData("      key     ", "   value    ")]
+        [InlineData("key    ", "value    ")]
+        [InlineData("    key", "    value")]
+        [InlineData("    key   ", "    value    ")]
+        [InlineData("    key spaced   ", "    value spaced    ")]
         [InlineData("many sla/s\\hes", "/////////////\\\\\\///////////")]
         public void GlobalExtendedAttribute_Roundtrips(string key, string value)
         {
@@ -101,7 +103,7 @@ public void GlobalExtendedAttribute_Roundtrips(string key, string value)
             {
                 PaxGlobalExtendedAttributesTarEntry entry = Assert.IsType<PaxGlobalExtendedAttributesTarEntry>(reader.GetNextEntry());
                 Assert.Equal(1, entry.GlobalExtendedAttributes.Count);
-                Assert.Equal(KeyValuePair.Create(key.TrimStart(), value), entry.GlobalExtendedAttributes.First());
+                Assert.Equal(KeyValuePair.Create(key, value), entry.GlobalExtendedAttributes.First());
             }
         }
     }

diff --git a/src/libraries/System.Formats.Tar/tests/TarReader/TarReader.File.Tests.cs b/src/libraries/System.Formats.Tar/tests/TarReader/TarReader.File.Tests.cs
@@ -327,8 +327,10 @@ public void PaxSizeLargerThanMaxAllowedByStream()
 
         [Theory]
         [InlineData("key", "value")]
-        [InlineData("key     ", "   value    ")]
-        [InlineData("      key     ", "   value    ")]
+        [InlineData("key    ", "value    ")]
+        [InlineData("    key", "    value")]
+        [InlineData("    key   ", "    value    ")]
+        [InlineData("    key spaced   ", "    value spaced    ")]
         [InlineData("many sla/s\\hes", "/////////////\\\\\\///////////")]
         public void PaxExtendedAttribute_Roundtrips(string key, string value)
         {
@@ -343,7 +345,7 @@ public void PaxExtendedAttribute_Roundtrips(string key, string value)
             {
                 PaxTarEntry entry = Assert.IsType<PaxTarEntry>(reader.GetNextEntry());
                 Assert.Equal(5, entry.ExtendedAttributes.Count);
-                Assert.Contains(KeyValuePair.Create(key.TrimStart(), value), entry.ExtendedAttributes);
+                Assert.Contains(KeyValuePair.Create(key, value), entry.ExtendedAttributes);
             }
         }