Skip to content

[release/7.0] Fix PAX extended attribute reading logic to treat '=' character as valid in the value strings. #83177

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
carlossanlop merged 5 commits into from
Mar 10, 2023
Merged

[release/7.0] Fix PAX extended attribute reading logic to treat '=' character as valid in the value strings. #83177

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6ceab26
Move PaxExtendedAttribute_Roundtrips test to correct source code file…
carlossanlop Mar 1, 2023
7318a76
Bug fix: Do not fail when reading an extended attribute when the valu…
carlossanlop Mar 1, 2023
c97a045
Add unit tests that verify extended attribute and global extended att…
carlossanlop Mar 1, 2023
e15d0a2
Convert duplicate InlineData to single shared MemberData method.
carlossanlop Mar 1, 2023
36f73f9
Apply suggestion
carlossanlop Mar 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Convert duplicate InlineData to single shared MemberData method.
  • Loading branch information
@carlossanlop
carlossanlop authored and github-actions committed Mar 9, 2023
commit e15d0a22f3d4ce6b0683ac762513ebef1fd152be
9 changes: 1 addition & 8 deletions ...aries/System.Formats.Tar/tests/TarReader/TarReader.File.GlobalExtendedAttributes.Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,14 +84,7 @@ public void ExtractGlobalExtendedAttributesEntry_Throws()
}

[Theory]
[InlineData("key", "value")]
[InlineData("key ", "value ")]
[InlineData(" key", " value")]
[InlineData(" key ", " value ")]
[InlineData(" key spaced ", " value spaced ")]
[InlineData("many sla/s\\hes", "/////////////\\\\\\///////////")]
[InlineData("key", "va=lue")]
[InlineData("key", "=")]
[MemberData(nameof(GetPaxExtendedAttributesRoundtripTestData))]
public void GlobalExtendedAttribute_Roundtrips(string key, string value)
{
var stream = new MemoryStream();
Expand Down
9 changes: 1 addition & 8 deletions src/libraries/System.Formats.Tar/tests/TarReader/TarReader.Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,14 +100,7 @@ public void TarReader_LeaveOpen_False_CopiedDataNotDisposed()
}

[Theory]
[InlineData("key", "value")]
[InlineData("key ", "value ")]
[InlineData(" key", " value")]
[InlineData(" key ", " value ")]
[InlineData(" key spaced ", " value spaced ")]
[InlineData("many sla/s\\hes", "/////////////\\\\\\///////////")]
[InlineData("key", "va=lue")]
[InlineData("key", "=")]
[MemberData(nameof(GetPaxExtendedAttributesRoundtripTestData))]
public void PaxExtendedAttribute_Roundtrips(string key, string value)
{
var stream = new MemoryStream();
Expand Down
12 changes: 12 additions & 0 deletions src/libraries/System.Formats.Tar/tests/TarTestsBase.Pax.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,5 +124,17 @@ protected void VerifyExtendedAttributeTimestamps(PaxTarEntry pax)
VerifyExtendedAttributeTimestamp(pax, PaxEaATime, MinimumTime);
VerifyExtendedAttributeTimestamp(pax, PaxEaCTime, MinimumTime);
}

public static IEnumerable<object[]> GetPaxExtendedAttributesRoundtripTestData()
{
yield return new object[] { "key", "value" };
yield return new object[] { "key ", "value " };
yield return new object[] { " key", " value" };
yield return new object[] { " key ", " value " };
yield return new object[] { " key spaced ", " value spaced " };
yield return new object[] { "many sla/s\\hes", "/////////////\\\\\\///////////" };
yield return new object[] { "key", "va=lue" };
yield return new object[] { "key", "=" };
}
}
}