Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[release/7.0] Tar: Remove invalidation of whitespace in PAX extended attributes #78785

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
merged 3 commits into from
Nov 29, 2022
Merged

[release/7.0] Tar: Remove invalidation of whitespace in PAX extended attributes #78785

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
622f6a0
Remove invalidation of whitespace in TryGetNextExtendedAttribute (#78…
stephentoub Nov 19, 2022
087eccd
Remove TrimStart in PAX extended attributes (#78707)
carlossanlop Nov 22, 2022
542d5ae
Tar: Extra tests to confirm extra long paths are not treated as dupli…
carlossanlop Nov 23, 2022
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
Tar: Extra tests to confirm extra long paths are not treated as dupli… 
…cate entries when the full path is in the extended attributes. (#78744)

Co-authored-by: carlossanlop <[email protected]>
  • Loading branch information
@carlossanlop
carlossanlop and carlossanlop committed Nov 23, 2022
commit 542d5aef4bb26c00ad16ed9a7b311881fd97146d
27 changes: 27 additions & 0 deletions src/libraries/System.Formats.Tar/tests/TarFile/TarFile.ExtractToDirectory.Stream.Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,5 +177,32 @@ public void Extract_UnseekableStream_BlockAlignmentPadding_DoesNotAffectNextEntr

Assert.Equal(2, Directory.GetFileSystemEntries(destination.Path, "*", SearchOption.AllDirectories).Count());
}

[Fact]
public void PaxNameCollision_DedupInExtendedAttributes()
{
using TempDirectory root = new();

string sharedRootFolders = Path.Join(root.Path, "folder with spaces", new string('a', 100));
string path1 = Path.Join(sharedRootFolders, "entry 1 with spaces.txt");
string path2 = Path.Join(sharedRootFolders, "entry 2 with spaces.txt");

using MemoryStream stream = new();
using (TarWriter writer = new(stream, TarEntryFormat.Pax, leaveOpen: true))
{
// Paths don't fit in the standard 'name' field, but they differ in the filename,
// which is fully stored as an extended attribute
PaxTarEntry entry1 = new(TarEntryType.RegularFile, path1);
writer.WriteEntry(entry1);
PaxTarEntry entry2 = new(TarEntryType.RegularFile, path2);
writer.WriteEntry(entry2);
}
stream.Position = 0;

TarFile.ExtractToDirectory(stream, root.Path, overwriteFiles: true);

Assert.True(File.Exists(path1));
Assert.True(Path.Exists(path2));
}
}
}
27 changes: 27 additions & 0 deletions ...ibraries/System.Formats.Tar/tests/TarFile/TarFile.ExtractToDirectoryAsync.Stream.Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,5 +219,32 @@ public async Task Extract_UnseekableStream_BlockAlignmentPadding_DoesNotAffectNe

Assert.Equal(2, Directory.GetFileSystemEntries(destination.Path, "*", SearchOption.AllDirectories).Count());
}

[Fact]
public async Task PaxNameCollision_DedupInExtendedAttributesAsync()
{
using TempDirectory root = new();

string sharedRootFolders = Path.Join(root.Path, "folder with spaces", new string('a', 100));
string path1 = Path.Join(sharedRootFolders, "entry 1 with spaces.txt");
string path2 = Path.Join(sharedRootFolders, "entry 2 with spaces.txt");

await using MemoryStream stream = new();
await using (TarWriter writer = new(stream, TarEntryFormat.Pax, leaveOpen: true))
{
// Paths don't fit in the standard 'name' field, but they differ in the filename,
// which is fully stored as an extended attribute
PaxTarEntry entry1 = new(TarEntryType.RegularFile, path1);
await writer.WriteEntryAsync(entry1);
PaxTarEntry entry2 = new(TarEntryType.RegularFile, path2);
await writer.WriteEntryAsync(entry2);
}
stream.Position = 0;

await TarFile.ExtractToDirectoryAsync(stream, root.Path, overwriteFiles: true);

Assert.True(File.Exists(path1));
Assert.True(Path.Exists(path2));
}
}
}