Skip to content

Fix PAX extended attribute reading logic to treat '=' character as valid in the value strings. #82810

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 9, 2023
Merged

Fix PAX extended attribute reading logic to treat '=' character as valid in the value strings. #82810

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
a930ea8
Move PaxExtendedAttribute_Roundtrips test to correct source code file…
carlossanlop Mar 1, 2023
bffa065
Bug fix: Do not fail when reading an extended attribute when the valu…
carlossanlop Mar 1, 2023
836abf9
Add unit tests that verify extended attribute and global extended att…
carlossanlop Mar 1, 2023
4475f15
Convert duplicate InlineData to single shared MemberData method.
carlossanlop Mar 1, 2023
d4ca878
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
Add unit tests that verify extended attribute and global extended att… 
…ribute roundtripping when the value contains an '=' character.

Also add a null check for a subsequent GetNextEntry.
  • Loading branch information
@carlossanlop
carlossanlop committed Mar 1, 2023
commit 836abf9e62cebff48ade2dcea36ae96743213e5c
3 changes: 3 additions & 0 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 @@ -90,6 +90,8 @@ public void ExtractGlobalExtendedAttributesEntry_Throws()
[InlineData(" key ", " value ")]
[InlineData(" key spaced ", " value spaced ")]
[InlineData("many sla/s\\hes", "/////////////\\\\\\///////////")]
[InlineData("key", "va=lue")]
[InlineData("key", "=")]
public void GlobalExtendedAttribute_Roundtrips(string key, string value)
{
var stream = new MemoryStream();
Expand All @@ -104,6 +106,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, value), entry.GlobalExtendedAttributes.First());
Assert.Null(reader.GetNextEntry());
}
}
}
Expand Down
3 changes: 3 additions & 0 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 @@ -106,6 +106,8 @@ public void TarReader_LeaveOpen_False_CopiedDataNotDisposed()
[InlineData(" key ", " value ")]
[InlineData(" key spaced ", " value spaced ")]
[InlineData("many sla/s\\hes", "/////////////\\\\\\///////////")]
[InlineData("key", "va=lue")]
[InlineData("key", "=")]
public void PaxExtendedAttribute_Roundtrips(string key, string value)
{
var stream = new MemoryStream();
Expand All @@ -120,6 +122,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, value), entry.ExtendedAttributes);
Assert.Null(reader.GetNextEntry());
}
}
}
Expand Down