Skip to content

Cleanup the extraction code based on offline review #50717

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+11 −16
Open

Cleanup the extraction code based on offline review #50717

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6e249e3
Use ordinal to ensure no mistakes on linux
marcpopMSFT Sep 9, 2025
e5cec1a
Simplify the logic since createdirectory won't fail if the directory …
marcpopMSFT Sep 10, 2025
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
27 changes: 11 additions & 16 deletions src/Tasks/sdk-tasks/ExtractArchiveToDirectory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,20 +84,17 @@ public override bool Execute()
if (isZipArchive)
{
using var zip = new ZipArchive(File.OpenRead(SourceArchive));
string fullDestDirPath = GetFullDirectoryPathWithSeperator(DestinationDirectory);

foreach (var entry in zip.Entries)
{
if (ShouldExtractItem(entry.FullName))
{
string destinationPath = Path.Combine(DestinationDirectory, entry.FullName);
string destinationFileName = GetFullDirectoryPathWithSeperator(destinationPath);
string fullDestDirPath = GetFullDirectoryPathWithSeperator(DestinationDirectory);
string destinationPath = Path.GetFullPath(Path.Combine(DestinationDirectory, entry.FullName));

CheckDestinationPath(destinationFileName, fullDestDirPath);
CheckDestinationPath(destinationPath, fullDestDirPath);

if (!Directory.Exists(Path.Combine(DestinationDirectory, Path.GetDirectoryName(entry.FullName))))
{
Directory.CreateDirectory(Path.Combine(DestinationDirectory, Path.GetDirectoryName(entry.FullName)));
}
Directory.CreateDirectory(Path.GetDirectoryName(destinationPath));

Log.LogMessage(Path.GetDirectoryName(entry.FullName));
entry.ExtractToFile(destinationPath);
Expand All @@ -116,6 +113,7 @@ public override bool Execute()
using var decompressedStream = new MemoryStream();
decompressor.CopyTo(decompressedStream);
decompressedStream.Seek(0, SeekOrigin.Begin);
string fullDestDirPath = GetFullDirectoryPathWithSeperator(DestinationDirectory);

// Extract Tar content
using TarReader tr = new TarReader(decompressedStream);
Expand All @@ -127,15 +125,12 @@ public override bool Execute()
entryName = entryName.StartsWith("./") ? entryName[2..] : entryName;
if (ShouldExtractItem(entryName))
{
string destinationPath = Path.Combine(DestinationDirectory, entryName);
string destinationFileName = GetFullDirectoryPathWithSeperator(destinationPath);
string fullDestDirPath = GetFullDirectoryPathWithSeperator(DestinationDirectory);
string destinationPath = Path.GetFullPath(Path.Combine(DestinationDirectory, entryName));

CheckDestinationPath(destinationFileName, fullDestDirPath);
CheckDestinationPath(destinationPath, fullDestDirPath);
Directory.CreateDirectory(Path.GetDirectoryName(destinationPath));

Log.LogMessage(entryName);

Directory.CreateDirectory(Path.GetDirectoryName(destinationPath));
tarEntry.ExtractToFile(destinationPath, overwrite: true);
}
}
Expand Down Expand Up @@ -186,7 +181,7 @@ private string GetFullDirectoryPathWithSeperator(string directory)
{
string fullDirectoryPath = Path.GetFullPath(directory);

if (!fullDirectoryPath.EndsWith(Path.DirectorySeparatorChar.ToString(), StringComparison.OrdinalIgnoreCase))
if (!fullDirectoryPath.EndsWith(Path.DirectorySeparatorChar.ToString(), StringComparison.Ordinal))
{
fullDirectoryPath = string.Concat(fullDirectoryPath, Path.DirectorySeparatorChar);
}
Expand All @@ -196,7 +191,7 @@ private string GetFullDirectoryPathWithSeperator(string directory)

private void CheckDestinationPath(string destinationFileName, string fullDestDirPath)
{
if (!destinationFileName.StartsWith(fullDestDirPath, StringComparison.OrdinalIgnoreCase))
if (!destinationFileName.StartsWith(fullDestDirPath, StringComparison.Ordinal))
{
throw new System.InvalidOperationException("Entry is outside the target dir: " + destinationFileName);
}
Expand Down
Loading