[release/7.0] Disallow TarWriter from writing link entries without LinkName set#74939

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
Sep 2, 2022
Merged

[release/7.0] Disallow TarWriter from writing link entries without LinkName set #74939

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
faf448f
Disallow TarWriter from writing link entries without LinkName set
carlossanlop Aug 31, 2022
e0cffca
Tests
carlossanlop Aug 31, 2022
c4252b3
Docs
carlossanlop Aug 31, 2022
45e35f5
Apply suggestions from code review
carlossanlop Aug 31, 2022
a1eec88
Apply suggestions from code review
jozkee Sep 1, 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
3 changes: 3 additions & 0 deletions src/libraries/System.Formats.Tar/src/System/Formats/Tar/TarHeader.Write.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -391,6 +391,9 @@ private int WritePosixName(Span<byte> buffer)
// Writes all the common fields shared by all formats into the specified spans.
private int WriteCommonFields(Span<byte> buffer, long actualLength, TarEntryType actualEntryType)
{
// Don't write an empty LinkName if the entry is a hardlink or symlink
Debug.Assert(!string.IsNullOrEmpty(_linkName) ^ (_typeFlag is not TarEntryType.SymbolicLink and not TarEntryType.HardLink));

int checksum = 0;

if (_mode > 0)
Expand Down
15 changes: 15 additions & 0 deletions src/libraries/System.Formats.Tar/src/System/Formats/Tar/TarWriter.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -209,13 +209,15 @@ private async Task ReadFileFromDiskAndWriteToArchiveStreamAsEntryAsync(string fu
/// </item>
/// </list>
/// </remarks>
/// <exception cref="ArgumentException">The entry type is <see cref="TarEntryType.HardLink"/> or <see cref="TarEntryType.SymbolicLink"/> and the <see cref="TarEntry.LinkName"/> is <see langword="null"/> or empty.</exception>
/// <exception cref="ObjectDisposedException">The archive stream is disposed.</exception>
/// <exception cref="InvalidOperationException">The entry type of the <paramref name="entry"/> is not supported for writing.</exception>
/// <exception cref="IOException">An I/O problem occurred.</exception>
public void WriteEntry(TarEntry entry)
{
ObjectDisposedException.ThrowIf(_isDisposed, this);
ArgumentNullException.ThrowIfNull(entry);
ValidateEntryLinkName(entry._header._typeFlag, entry._header._linkName);
WriteEntryInternal(entry);
}

Expand DownExpand Up@@ -250,6 +252,7 @@ public void WriteEntry(TarEntry entry)
/// </item>
/// </list>
/// </remarks>
/// <exception cref="ArgumentException">The entry type is <see cref="TarEntryType.HardLink"/> or <see cref="TarEntryType.SymbolicLink"/> and the <see cref="TarEntry.LinkName"/> is <see langword="null"/> or empty.</exception>
/// <exception cref="ObjectDisposedException">The archive stream is disposed.</exception>
/// <exception cref="InvalidOperationException">The entry type of the <paramref name="entry"/> is not supported for writing.</exception>
/// <exception cref="IOException">An I/O problem occurred.</exception>
Expand All@@ -262,6 +265,7 @@ public Task WriteEntryAsync(TarEntry entry, CancellationToken cancellationToken

ObjectDisposedException.ThrowIf(_isDisposed, this);
ArgumentNullException.ThrowIfNull(entry);
ValidateEntryLinkName(entry._header._typeFlag, entry._header._linkName);
return WriteEntryAsyncInternal(entry, cancellationToken);
}

Expand DownExpand Up@@ -365,5 +369,16 @@ private async ValueTask WriteFinalRecordsAsync()

return (fullPath, actualEntryName);
}

private static void ValidateEntryLinkName(TarEntryType entryType, string? linkName)
{
if (entryType is TarEntryType.HardLink or TarEntryType.SymbolicLink)
{
if (string.IsNullOrEmpty(linkName))
{
throw new ArgumentException(SR.TarEntryHardLinkOrSymlinkLinkNameEmpty, "entry");
}
}
}
}
}
14 changes: 14 additions & 0 deletions src/libraries/System.Formats.Tar/tests/TarWriter/TarWriter.WriteEntry.Entry.Gnu.Tests.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -167,6 +167,10 @@ public void Write_Long_Name(TarEntryType entryType)
using (TarWriter writer = new TarWriter(archiveStream, TarEntryFormat.Gnu, leaveOpen: true))
{
GnuTarEntry entry = new GnuTarEntry(entryType, longName);
if (entryType is TarEntryType.HardLink or TarEntryType.SymbolicLink)
{
entry.LinkName = "linktarget";
}
writer.WriteEntry(entry);
}

Expand DownExpand Up@@ -231,5 +235,15 @@ public void Write_LongName_And_LongLinkName(TarEntryType entryType)
Assert.Equal(longLinkName, entry.LinkName);
}
}

[Theory]
[InlineData(TarEntryType.HardLink)]
[InlineData(TarEntryType.SymbolicLink)]
public void Write_LinkEntry_EmptyLinkName_Throws(TarEntryType entryType)
{
using MemoryStream archiveStream = new MemoryStream();
using TarWriter writer = new TarWriter(archiveStream, leaveOpen: false);
Assert.Throws<ArgumentException>("entry", () => writer.WriteEntry(new GnuTarEntry(entryType, "link")));
}
}
}
10 changes: 10 additions & 0 deletions src/libraries/System.Formats.Tar/tests/TarWriter/TarWriter.WriteEntry.Entry.Pax.Tests.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -485,5 +485,15 @@ public void WriteTimestampsBeyondOctalLimitInPax()
Assert.Equal(overLimitTimestamp, actualCTime);
}
}

[Theory]
[InlineData(TarEntryType.HardLink)]
[InlineData(TarEntryType.SymbolicLink)]
public void Write_LinkEntry_EmptyLinkName_Throws(TarEntryType entryType)
{
using MemoryStream archiveStream = new MemoryStream();
using TarWriter writer = new TarWriter(archiveStream, leaveOpen: false);
Assert.Throws<ArgumentException>("entry", () => writer.WriteEntry(new PaxTarEntry(entryType, "link")));
}
}
}
10 changes: 10 additions & 0 deletions src/libraries/System.Formats.Tar/tests/TarWriter/TarWriter.WriteEntry.Entry.Ustar.Tests.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -152,5 +152,15 @@ public void WriteFifo()
VerifyFifo(fifo);
}
}

[Theory]
[InlineData(TarEntryType.HardLink)]
[InlineData(TarEntryType.SymbolicLink)]
public void Write_LinkEntry_EmptyLinkName_Throws(TarEntryType entryType)
{
using MemoryStream archiveStream = new MemoryStream();
using TarWriter writer = new TarWriter(archiveStream, leaveOpen: false);
Assert.Throws<ArgumentException>("entry", () => writer.WriteEntry(new UstarTarEntry(entryType, "link")));
}
}
}
10 changes: 10 additions & 0 deletions src/libraries/System.Formats.Tar/tests/TarWriter/TarWriter.WriteEntry.Entry.V7.Tests.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -92,5 +92,15 @@ public void WriteDirectory()
VerifyDirectory(directory);
}
}

[Theory]
[InlineData(TarEntryType.HardLink)]
[InlineData(TarEntryType.SymbolicLink)]
public void Write_LinkEntry_EmptyLinkName_Throws(TarEntryType entryType)
{
using MemoryStream archiveStream = new MemoryStream();
using TarWriter writer = new TarWriter(archiveStream, leaveOpen: false);
Assert.Throws<ArgumentException>("entry", () => writer.WriteEntry(new V7TarEntry(entryType, "link")));
}
}
}
14 changes: 14 additions & 0 deletions ...libraries/System.Formats.Tar/tests/TarWriter/TarWriter.WriteEntryAsync.Entry.Gnu.Tests.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -183,6 +183,10 @@ public async Task Write_Long_Name_Async(TarEntryType entryType)
await using (TarWriter writer = new TarWriter(archiveStream, TarEntryFormat.Gnu, leaveOpen: true))
{
GnuTarEntry entry = new GnuTarEntry(entryType, longName);
if (entryType is TarEntryType.HardLink or TarEntryType.SymbolicLink)
{
entry.LinkName = "linktarget";
}
await writer.WriteEntryAsync(entry);
}

Expand DownExpand Up@@ -252,5 +256,15 @@ public async Task Write_LongName_And_LongLinkName_Async(TarEntryType entryType)
}
}
}

[Theory]
[InlineData(TarEntryType.HardLink)]
[InlineData(TarEntryType.SymbolicLink)]
public async Task Write_LinkEntry_EmptyLinkName_Throws_Async(TarEntryType entryType)
{
await using MemoryStream archiveStream = new MemoryStream();
await using TarWriter writer = new TarWriter(archiveStream, leaveOpen: false);
await Assert.ThrowsAsync<ArgumentException>("entry", () => writer.WriteEntryAsync(new GnuTarEntry(entryType, "link")));
}
}
}
10 changes: 10 additions & 0 deletions ...libraries/System.Formats.Tar/tests/TarWriter/TarWriter.WriteEntryAsync.Entry.Pax.Tests.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -505,5 +505,15 @@ public async Task WriteTimestampsBeyondOctalLimitInPax_Async()
Assert.Equal(overLimitTimestamp, actualCTime);
}
}

[Theory]
[InlineData(TarEntryType.HardLink)]
[InlineData(TarEntryType.SymbolicLink)]
public async Task Write_LinkEntry_EmptyLinkName_Throws_Async(TarEntryType entryType)
{
await using MemoryStream archiveStream = new MemoryStream();
await using TarWriter writer = new TarWriter(archiveStream, leaveOpen: false);
await Assert.ThrowsAsync<ArgumentException>("entry", () => writer.WriteEntryAsync(new PaxTarEntry(entryType, "link")));
}
}
}
10 changes: 10 additions & 0 deletions ...braries/System.Formats.Tar/tests/TarWriter/TarWriter.WriteEntryAsync.Entry.Ustar.Tests.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -153,5 +153,15 @@ public async Task WriteFifo_Async()
VerifyFifo(fifo);
}
}

[Theory]
[InlineData(TarEntryType.HardLink)]
[InlineData(TarEntryType.SymbolicLink)]
public async Task Write_LinkEntry_EmptyLinkName_Throws_Async(TarEntryType entryType)
{
await using MemoryStream archiveStream = new MemoryStream();
await using TarWriter writer = new TarWriter(archiveStream, leaveOpen: false);
await Assert.ThrowsAsync<ArgumentException>("entry", () => writer.WriteEntryAsync(new UstarTarEntry(entryType, "link")));
}
}
}
10 changes: 10 additions & 0 deletions src/libraries/System.Formats.Tar/tests/TarWriter/TarWriter.WriteEntryAsync.Entry.V7.Tests.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -93,5 +93,15 @@ public async Task WriteDirectory_Async()
VerifyDirectory(directory);
}
}

[Theory]
[InlineData(TarEntryType.HardLink)]
[InlineData(TarEntryType.SymbolicLink)]
public async Task Write_LinkEntry_EmptyLinkName_Throws_Async(TarEntryType entryType)
{
await using MemoryStream archiveStream = new MemoryStream();
await using TarWriter writer = new TarWriter(archiveStream, leaveOpen: false);
await Assert.ThrowsAsync<ArgumentException>("entry", () => writer.WriteEntryAsync(new V7TarEntry(entryType, "link")));
}
}
}
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
[release/7.0] Disallow TarWriter from writing link entries without LinkName set#74939

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

Sep 2, 2022
 Merged


[release/7.0] Disallow TarWriter from writing link entries without LinkName set
#74939
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
faf448f

Disallow TarWriter from writing link entries without LinkName set


carlossanlop Aug 31, 2022
e0cffca

Tests


carlossanlop Aug 31, 2022
c4252b3

Docs


carlossanlop Aug 31, 2022
45e35f5

Apply suggestions from code review


carlossanlop Aug 31, 2022
a1eec88

Apply suggestions from code review


jozkee Sep 1, 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


3 changes: 3 additions & 0 deletions
src/libraries/System.Formats.Tar/src/System/Formats/Tar/TarHeader.Write.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -391,6 +391,9 @@ private int WritePosixName(Span<byte> buffer)
 // Writes all the common fields shared by all formats into the specified spans.
 private int WriteCommonFields(Span<byte> buffer, long actualLength, TarEntryType actualEntryType)
 {
 // Don't write an empty LinkName if the entry is a hardlink or symlink
 Debug.Assert(!string.IsNullOrEmpty(_linkName) ^ (_typeFlag is not TarEntryType.SymbolicLink and not TarEntryType.HardLink));

 int checksum = 0;

 if (_mode > 0)
Expand Down

15 changes: 15 additions & 0 deletions
src/libraries/System.Formats.Tar/src/System/Formats/Tar/TarWriter.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -209,13 +209,15 @@ private async Task ReadFileFromDiskAndWriteToArchiveStreamAsEntryAsync(string fu
 /// </item>
 /// </list>
 /// </remarks>
 /// <exception cref="ArgumentException">The entry type is <see cref="TarEntryType.HardLink"/> or <see cref="TarEntryType.SymbolicLink"/> and the <see cref="TarEntry.LinkName"/> is <see langword="null"/> or empty.</exception>
 /// <exception cref="ObjectDisposedException">The archive stream is disposed.</exception>
 /// <exception cref="InvalidOperationException">The entry type of the <paramref name="entry"/> is not supported for writing.</exception>
 /// <exception cref="IOException">An I/O problem occurred.</exception>
 public void WriteEntry(TarEntry entry)
 {
 ObjectDisposedException.ThrowIf(_isDisposed, this);
 ArgumentNullException.ThrowIfNull(entry);
 ValidateEntryLinkName(entry._header._typeFlag, entry._header._linkName);
 WriteEntryInternal(entry);
 }

Expand DownExpand Up@@ -250,6 +252,7 @@ public void WriteEntry(TarEntry entry)
 /// </item>
 /// </list>
 /// </remarks>
 /// <exception cref="ArgumentException">The entry type is <see cref="TarEntryType.HardLink"/> or <see cref="TarEntryType.SymbolicLink"/> and the <see cref="TarEntry.LinkName"/> is <see langword="null"/> or empty.</exception>
 /// <exception cref="ObjectDisposedException">The archive stream is disposed.</exception>
 /// <exception cref="InvalidOperationException">The entry type of the <paramref name="entry"/> is not supported for writing.</exception>
 /// <exception cref="IOException">An I/O problem occurred.</exception>
Expand All@@ -262,6 +265,7 @@ public Task WriteEntryAsync(TarEntry entry, CancellationToken cancellationToken

 ObjectDisposedException.ThrowIf(_isDisposed, this);
 ArgumentNullException.ThrowIfNull(entry);
 ValidateEntryLinkName(entry._header._typeFlag, entry._header._linkName);
 return WriteEntryAsyncInternal(entry, cancellationToken);
 }

Expand DownExpand Up@@ -365,5 +369,16 @@ private async ValueTask WriteFinalRecordsAsync()

 return (fullPath, actualEntryName);
 }

 private static void ValidateEntryLinkName(TarEntryType entryType, string? linkName)
 {
 if (entryType is TarEntryType.HardLink or TarEntryType.SymbolicLink)
 {
 if (string.IsNullOrEmpty(linkName))
 {
 throw new ArgumentException(SR.TarEntryHardLinkOrSymlinkLinkNameEmpty, "entry");
 }
 }
 }
 }
}

14 changes: 14 additions & 0 deletions
src/libraries/System.Formats.Tar/tests/TarWriter/TarWriter.WriteEntry.Entry.Gnu.Tests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -167,6 +167,10 @@ public void Write_Long_Name(TarEntryType entryType)
 using (TarWriter writer = new TarWriter(archiveStream, TarEntryFormat.Gnu, leaveOpen: true))
 {
 GnuTarEntry entry = new GnuTarEntry(entryType, longName);
 if (entryType is TarEntryType.HardLink or TarEntryType.SymbolicLink)
 {
 entry.LinkName = "linktarget";
 }
 writer.WriteEntry(entry);
 }

Expand DownExpand Up@@ -231,5 +235,15 @@ public void Write_LongName_And_LongLinkName(TarEntryType entryType)
 Assert.Equal(longLinkName, entry.LinkName);
 }
 }

 [Theory]
 [InlineData(TarEntryType.HardLink)]
 [InlineData(TarEntryType.SymbolicLink)]
 public void Write_LinkEntry_EmptyLinkName_Throws(TarEntryType entryType)
 {
 using MemoryStream archiveStream = new MemoryStream();
 using TarWriter writer = new TarWriter(archiveStream, leaveOpen: false);
 Assert.Throws<ArgumentException>("entry", () => writer.WriteEntry(new GnuTarEntry(entryType, "link")));
 }
 }
}

10 changes: 10 additions & 0 deletions
src/libraries/System.Formats.Tar/tests/TarWriter/TarWriter.WriteEntry.Entry.Pax.Tests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -485,5 +485,15 @@ public void WriteTimestampsBeyondOctalLimitInPax()
 Assert.Equal(overLimitTimestamp, actualCTime);
 }
 }

 [Theory]
 [InlineData(TarEntryType.HardLink)]
 [InlineData(TarEntryType.SymbolicLink)]
 public void Write_LinkEntry_EmptyLinkName_Throws(TarEntryType entryType)
 {
 using MemoryStream archiveStream = new MemoryStream();
 using TarWriter writer = new TarWriter(archiveStream, leaveOpen: false);
 Assert.Throws<ArgumentException>("entry", () => writer.WriteEntry(new PaxTarEntry(entryType, "link")));
 }
 }
}

10 changes: 10 additions & 0 deletions
src/libraries/System.Formats.Tar/tests/TarWriter/TarWriter.WriteEntry.Entry.Ustar.Tests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -152,5 +152,15 @@ public void WriteFifo()
 VerifyFifo(fifo);
 }
 }

 [Theory]
 [InlineData(TarEntryType.HardLink)]
 [InlineData(TarEntryType.SymbolicLink)]
 public void Write_LinkEntry_EmptyLinkName_Throws(TarEntryType entryType)
 {
 using MemoryStream archiveStream = new MemoryStream();
 using TarWriter writer = new TarWriter(archiveStream, leaveOpen: false);
 Assert.Throws<ArgumentException>("entry", () => writer.WriteEntry(new UstarTarEntry(entryType, "link")));
 }
 }
}

10 changes: 10 additions & 0 deletions
src/libraries/System.Formats.Tar/tests/TarWriter/TarWriter.WriteEntry.Entry.V7.Tests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -92,5 +92,15 @@ public void WriteDirectory()
 VerifyDirectory(directory);
 }
 }

 [Theory]
 [InlineData(TarEntryType.HardLink)]
 [InlineData(TarEntryType.SymbolicLink)]
 public void Write_LinkEntry_EmptyLinkName_Throws(TarEntryType entryType)
 {
 using MemoryStream archiveStream = new MemoryStream();
 using TarWriter writer = new TarWriter(archiveStream, leaveOpen: false);
 Assert.Throws<ArgumentException>("entry", () => writer.WriteEntry(new V7TarEntry(entryType, "link")));
 }
 }
}

14 changes: 14 additions & 0 deletions
...libraries/System.Formats.Tar/tests/TarWriter/TarWriter.WriteEntryAsync.Entry.Gnu.Tests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -183,6 +183,10 @@ public async Task Write_Long_Name_Async(TarEntryType entryType)
 await using (TarWriter writer = new TarWriter(archiveStream, TarEntryFormat.Gnu, leaveOpen: true))
 {
 GnuTarEntry entry = new GnuTarEntry(entryType, longName);
 if (entryType is TarEntryType.HardLink or TarEntryType.SymbolicLink)
 {
 entry.LinkName = "linktarget";
 }
 await writer.WriteEntryAsync(entry);
 }

Expand DownExpand Up@@ -252,5 +256,15 @@ public async Task Write_LongName_And_LongLinkName_Async(TarEntryType entryType)
 }
 }
 }

 [Theory]
 [InlineData(TarEntryType.HardLink)]
 [InlineData(TarEntryType.SymbolicLink)]
 public async Task Write_LinkEntry_EmptyLinkName_Throws_Async(TarEntryType entryType)
 {
 await using MemoryStream archiveStream = new MemoryStream();
 await using TarWriter writer = new TarWriter(archiveStream, leaveOpen: false);
 await Assert.ThrowsAsync<ArgumentException>("entry", () => writer.WriteEntryAsync(new GnuTarEntry(entryType, "link")));
 }
 }
}

10 changes: 10 additions & 0 deletions
...libraries/System.Formats.Tar/tests/TarWriter/TarWriter.WriteEntryAsync.Entry.Pax.Tests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -505,5 +505,15 @@ public async Task WriteTimestampsBeyondOctalLimitInPax_Async()
 Assert.Equal(overLimitTimestamp, actualCTime);
 }
 }

 [Theory]
 [InlineData(TarEntryType.HardLink)]
 [InlineData(TarEntryType.SymbolicLink)]
 public async Task Write_LinkEntry_EmptyLinkName_Throws_Async(TarEntryType entryType)
 {
 await using MemoryStream archiveStream = new MemoryStream();
 await using TarWriter writer = new TarWriter(archiveStream, leaveOpen: false);
 await Assert.ThrowsAsync<ArgumentException>("entry", () => writer.WriteEntryAsync(new PaxTarEntry(entryType, "link")));
 }
 }
}

10 changes: 10 additions & 0 deletions
...braries/System.Formats.Tar/tests/TarWriter/TarWriter.WriteEntryAsync.Entry.Ustar.Tests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -153,5 +153,15 @@ public async Task WriteFifo_Async()
 VerifyFifo(fifo);
 }
 }

 [Theory]
 [InlineData(TarEntryType.HardLink)]
 [InlineData(TarEntryType.SymbolicLink)]
 public async Task Write_LinkEntry_EmptyLinkName_Throws_Async(TarEntryType entryType)
 {
 await using MemoryStream archiveStream = new MemoryStream();
 await using TarWriter writer = new TarWriter(archiveStream, leaveOpen: false);
 await Assert.ThrowsAsync<ArgumentException>("entry", () => writer.WriteEntryAsync(new UstarTarEntry(entryType, "link")));
 }
 }
}

10 changes: 10 additions & 0 deletions
src/libraries/System.Formats.Tar/tests/TarWriter/TarWriter.WriteEntryAsync.Entry.V7.Tests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -93,5 +93,15 @@ public async Task WriteDirectory_Async()
 VerifyDirectory(directory);
 }
 }

 [Theory]
 [InlineData(TarEntryType.HardLink)]
 [InlineData(TarEntryType.SymbolicLink)]
 public async Task Write_LinkEntry_EmptyLinkName_Throws_Async(TarEntryType entryType)
 {
 await using MemoryStream archiveStream = new MemoryStream();
 await using TarWriter writer = new TarWriter(archiveStream, leaveOpen: false);
 await Assert.ThrowsAsync<ArgumentException>("entry", () => writer.WriteEntryAsync(new V7TarEntry(entryType, "link")));
 }
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[release/7.0] Disallow TarWriter from writing link entries without LinkName set#74939

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

Sep 2, 2022
 Merged


[release/7.0] Disallow TarWriter from writing link entries without LinkName set
#74939
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
faf448f

Disallow TarWriter from writing link entries without LinkName set


carlossanlop Aug 31, 2022
e0cffca

Tests


carlossanlop Aug 31, 2022
c4252b3

Docs


carlossanlop Aug 31, 2022
45e35f5

Apply suggestions from code review


carlossanlop Aug 31, 2022
a1eec88

Apply suggestions from code review


jozkee Sep 1, 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


3 changes: 3 additions & 0 deletions
src/libraries/System.Formats.Tar/src/System/Formats/Tar/TarHeader.Write.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -391,6 +391,9 @@ private int WritePosixName(Span<byte> buffer)
 // Writes all the common fields shared by all formats into the specified spans.
 private int WriteCommonFields(Span<byte> buffer, long actualLength, TarEntryType actualEntryType)
 {
 // Don't write an empty LinkName if the entry is a hardlink or symlink
 Debug.Assert(!string.IsNullOrEmpty(_linkName) ^ (_typeFlag is not TarEntryType.SymbolicLink and not TarEntryType.HardLink));

 int checksum = 0;

 if (_mode > 0)
Expand Down

15 changes: 15 additions & 0 deletions
src/libraries/System.Formats.Tar/src/System/Formats/Tar/TarWriter.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -209,13 +209,15 @@ private async Task ReadFileFromDiskAndWriteToArchiveStreamAsEntryAsync(string fu
 /// </item>
 /// </list>
 /// </remarks>
 /// <exception cref="ArgumentException">The entry type is <see cref="TarEntryType.HardLink"/> or <see cref="TarEntryType.SymbolicLink"/> and the <see cref="TarEntry.LinkName"/> is <see langword="null"/> or empty.</exception>
 /// <exception cref="ObjectDisposedException">The archive stream is disposed.</exception>
 /// <exception cref="InvalidOperationException">The entry type of the <paramref name="entry"/> is not supported for writing.</exception>
 /// <exception cref="IOException">An I/O problem occurred.</exception>
 public void WriteEntry(TarEntry entry)
 {
 ObjectDisposedException.ThrowIf(_isDisposed, this);
 ArgumentNullException.ThrowIfNull(entry);
 ValidateEntryLinkName(entry._header._typeFlag, entry._header._linkName);
 WriteEntryInternal(entry);
 }

Expand DownExpand Up@@ -250,6 +252,7 @@ public void WriteEntry(TarEntry entry)
 /// </item>
 /// </list>
 /// </remarks>
 /// <exception cref="ArgumentException">The entry type is <see cref="TarEntryType.HardLink"/> or <see cref="TarEntryType.SymbolicLink"/> and the <see cref="TarEntry.LinkName"/> is <see langword="null"/> or empty.</exception>
 /// <exception cref="ObjectDisposedException">The archive stream is disposed.</exception>
 /// <exception cref="InvalidOperationException">The entry type of the <paramref name="entry"/> is not supported for writing.</exception>
 /// <exception cref="IOException">An I/O problem occurred.</exception>
Expand All@@ -262,6 +265,7 @@ public Task WriteEntryAsync(TarEntry entry, CancellationToken cancellationToken

 ObjectDisposedException.ThrowIf(_isDisposed, this);
 ArgumentNullException.ThrowIfNull(entry);
 ValidateEntryLinkName(entry._header._typeFlag, entry._header._linkName);
 return WriteEntryAsyncInternal(entry, cancellationToken);
 }

Expand DownExpand Up@@ -365,5 +369,16 @@ private async ValueTask WriteFinalRecordsAsync()

 return (fullPath, actualEntryName);
 }

 private static void ValidateEntryLinkName(TarEntryType entryType, string? linkName)
 {
 if (entryType is TarEntryType.HardLink or TarEntryType.SymbolicLink)
 {
 if (string.IsNullOrEmpty(linkName))
 {
 throw new ArgumentException(SR.TarEntryHardLinkOrSymlinkLinkNameEmpty, "entry");
 }
 }
 }
 }
}

14 changes: 14 additions & 0 deletions
src/libraries/System.Formats.Tar/tests/TarWriter/TarWriter.WriteEntry.Entry.Gnu.Tests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -167,6 +167,10 @@ public void Write_Long_Name(TarEntryType entryType)
 using (TarWriter writer = new TarWriter(archiveStream, TarEntryFormat.Gnu, leaveOpen: true))
 {
 GnuTarEntry entry = new GnuTarEntry(entryType, longName);
 if (entryType is TarEntryType.HardLink or TarEntryType.SymbolicLink)
 {
 entry.LinkName = "linktarget";
 }
 writer.WriteEntry(entry);
 }

Expand DownExpand Up@@ -231,5 +235,15 @@ public void Write_LongName_And_LongLinkName(TarEntryType entryType)
 Assert.Equal(longLinkName, entry.LinkName);
 }
 }

 [Theory]
 [InlineData(TarEntryType.HardLink)]
 [InlineData(TarEntryType.SymbolicLink)]
 public void Write_LinkEntry_EmptyLinkName_Throws(TarEntryType entryType)
 {
 using MemoryStream archiveStream = new MemoryStream();
 using TarWriter writer = new TarWriter(archiveStream, leaveOpen: false);
 Assert.Throws<ArgumentException>("entry", () => writer.WriteEntry(new GnuTarEntry(entryType, "link")));
 }
 }
}

10 changes: 10 additions & 0 deletions
src/libraries/System.Formats.Tar/tests/TarWriter/TarWriter.WriteEntry.Entry.Pax.Tests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -485,5 +485,15 @@ public void WriteTimestampsBeyondOctalLimitInPax()
 Assert.Equal(overLimitTimestamp, actualCTime);
 }
 }

 [Theory]
 [InlineData(TarEntryType.HardLink)]
 [InlineData(TarEntryType.SymbolicLink)]
 public void Write_LinkEntry_EmptyLinkName_Throws(TarEntryType entryType)
 {
 using MemoryStream archiveStream = new MemoryStream();
 using TarWriter writer = new TarWriter(archiveStream, leaveOpen: false);
 Assert.Throws<ArgumentException>("entry", () => writer.WriteEntry(new PaxTarEntry(entryType, "link")));
 }
 }
}

10 changes: 10 additions & 0 deletions
src/libraries/System.Formats.Tar/tests/TarWriter/TarWriter.WriteEntry.Entry.Ustar.Tests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -152,5 +152,15 @@ public void WriteFifo()
 VerifyFifo(fifo);
 }
 }

 [Theory]
 [InlineData(TarEntryType.HardLink)]
 [InlineData(TarEntryType.SymbolicLink)]
 public void Write_LinkEntry_EmptyLinkName_Throws(TarEntryType entryType)
 {
 using MemoryStream archiveStream = new MemoryStream();
 using TarWriter writer = new TarWriter(archiveStream, leaveOpen: false);
 Assert.Throws<ArgumentException>("entry", () => writer.WriteEntry(new UstarTarEntry(entryType, "link")));
 }
 }
}

10 changes: 10 additions & 0 deletions
src/libraries/System.Formats.Tar/tests/TarWriter/TarWriter.WriteEntry.Entry.V7.Tests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -92,5 +92,15 @@ public void WriteDirectory()
 VerifyDirectory(directory);
 }
 }

 [Theory]
 [InlineData(TarEntryType.HardLink)]
 [InlineData(TarEntryType.SymbolicLink)]
 public void Write_LinkEntry_EmptyLinkName_Throws(TarEntryType entryType)
 {
 using MemoryStream archiveStream = new MemoryStream();
 using TarWriter writer = new TarWriter(archiveStream, leaveOpen: false);
 Assert.Throws<ArgumentException>("entry", () => writer.WriteEntry(new V7TarEntry(entryType, "link")));
 }
 }
}

14 changes: 14 additions & 0 deletions
...libraries/System.Formats.Tar/tests/TarWriter/TarWriter.WriteEntryAsync.Entry.Gnu.Tests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -183,6 +183,10 @@ public async Task Write_Long_Name_Async(TarEntryType entryType)
 await using (TarWriter writer = new TarWriter(archiveStream, TarEntryFormat.Gnu, leaveOpen: true))
 {
 GnuTarEntry entry = new GnuTarEntry(entryType, longName);
 if (entryType is TarEntryType.HardLink or TarEntryType.SymbolicLink)
 {
 entry.LinkName = "linktarget";
 }
 await writer.WriteEntryAsync(entry);
 }

Expand DownExpand Up@@ -252,5 +256,15 @@ public async Task Write_LongName_And_LongLinkName_Async(TarEntryType entryType)
 }
 }
 }

 [Theory]
 [InlineData(TarEntryType.HardLink)]
 [InlineData(TarEntryType.SymbolicLink)]
 public async Task Write_LinkEntry_EmptyLinkName_Throws_Async(TarEntryType entryType)
 {
 await using MemoryStream archiveStream = new MemoryStream();
 await using TarWriter writer = new TarWriter(archiveStream, leaveOpen: false);
 await Assert.ThrowsAsync<ArgumentException>("entry", () => writer.WriteEntryAsync(new GnuTarEntry(entryType, "link")));
 }
 }
}

10 changes: 10 additions & 0 deletions
...libraries/System.Formats.Tar/tests/TarWriter/TarWriter.WriteEntryAsync.Entry.Pax.Tests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -505,5 +505,15 @@ public async Task WriteTimestampsBeyondOctalLimitInPax_Async()
 Assert.Equal(overLimitTimestamp, actualCTime);
 }
 }

 [Theory]
 [InlineData(TarEntryType.HardLink)]
 [InlineData(TarEntryType.SymbolicLink)]
 public async Task Write_LinkEntry_EmptyLinkName_Throws_Async(TarEntryType entryType)
 {
 await using MemoryStream archiveStream = new MemoryStream();
 await using TarWriter writer = new TarWriter(archiveStream, leaveOpen: false);
 await Assert.ThrowsAsync<ArgumentException>("entry", () => writer.WriteEntryAsync(new PaxTarEntry(entryType, "link")));
 }
 }
}

10 changes: 10 additions & 0 deletions
...braries/System.Formats.Tar/tests/TarWriter/TarWriter.WriteEntryAsync.Entry.Ustar.Tests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -153,5 +153,15 @@ public async Task WriteFifo_Async()
 VerifyFifo(fifo);
 }
 }

 [Theory]
 [InlineData(TarEntryType.HardLink)]
 [InlineData(TarEntryType.SymbolicLink)]
 public async Task Write_LinkEntry_EmptyLinkName_Throws_Async(TarEntryType entryType)
 {
 await using MemoryStream archiveStream = new MemoryStream();
 await using TarWriter writer = new TarWriter(archiveStream, leaveOpen: false);
 await Assert.ThrowsAsync<ArgumentException>("entry", () => writer.WriteEntryAsync(new UstarTarEntry(entryType, "link")));
 }
 }
}

10 changes: 10 additions & 0 deletions
src/libraries/System.Formats.Tar/tests/TarWriter/TarWriter.WriteEntryAsync.Entry.V7.Tests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -93,5 +93,15 @@ public async Task WriteDirectory_Async()
 VerifyDirectory(directory);
 }
 }

 [Theory]
 [InlineData(TarEntryType.HardLink)]
 [InlineData(TarEntryType.SymbolicLink)]
 public async Task Write_LinkEntry_EmptyLinkName_Throws_Async(TarEntryType entryType)
 {
 await using MemoryStream archiveStream = new MemoryStream();
 await using TarWriter writer = new TarWriter(archiveStream, leaveOpen: false);
 await Assert.ThrowsAsync<ArgumentException>("entry", () => writer.WriteEntryAsync(new V7TarEntry(entryType, "link")));
 }
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[release/7.0] Disallow TarWriter from writing link entries without LinkName set#74939

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

Sep 2, 2022
 Merged


[release/7.0] Disallow TarWriter from writing link entries without LinkName set
#74939
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
faf448f

Disallow TarWriter from writing link entries without LinkName set


carlossanlop Aug 31, 2022
e0cffca

Tests


carlossanlop Aug 31, 2022
c4252b3

Docs


carlossanlop Aug 31, 2022
45e35f5

Apply suggestions from code review


carlossanlop Aug 31, 2022
a1eec88

Apply suggestions from code review


jozkee Sep 1, 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


3 changes: 3 additions & 0 deletions
src/libraries/System.Formats.Tar/src/System/Formats/Tar/TarHeader.Write.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -391,6 +391,9 @@ private int WritePosixName(Span<byte> buffer)
 // Writes all the common fields shared by all formats into the specified spans.
 private int WriteCommonFields(Span<byte> buffer, long actualLength, TarEntryType actualEntryType)
 {
 // Don't write an empty LinkName if the entry is a hardlink or symlink
 Debug.Assert(!string.IsNullOrEmpty(_linkName) ^ (_typeFlag is not TarEntryType.SymbolicLink and not TarEntryType.HardLink));

 int checksum = 0;

 if (_mode > 0)
Expand Down

15 changes: 15 additions & 0 deletions
src/libraries/System.Formats.Tar/src/System/Formats/Tar/TarWriter.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -209,13 +209,15 @@ private async Task ReadFileFromDiskAndWriteToArchiveStreamAsEntryAsync(string fu
 /// </item>
 /// </list>
 /// </remarks>
 /// <exception cref="ArgumentException">The entry type is <see cref="TarEntryType.HardLink"/> or <see cref="TarEntryType.SymbolicLink"/> and the <see cref="TarEntry.LinkName"/> is <see langword="null"/> or empty.</exception>
 /// <exception cref="ObjectDisposedException">The archive stream is disposed.</exception>
 /// <exception cref="InvalidOperationException">The entry type of the <paramref name="entry"/> is not supported for writing.</exception>
 /// <exception cref="IOException">An I/O problem occurred.</exception>
 public void WriteEntry(TarEntry entry)
 {
 ObjectDisposedException.ThrowIf(_isDisposed, this);
 ArgumentNullException.ThrowIfNull(entry);
 ValidateEntryLinkName(entry._header._typeFlag, entry._header._linkName);
 WriteEntryInternal(entry);
 }

Expand DownExpand Up@@ -250,6 +252,7 @@ public void WriteEntry(TarEntry entry)
 /// </item>
 /// </list>
 /// </remarks>
 /// <exception cref="ArgumentException">The entry type is <see cref="TarEntryType.HardLink"/> or <see cref="TarEntryType.SymbolicLink"/> and the <see cref="TarEntry.LinkName"/> is <see langword="null"/> or empty.</exception>
 /// <exception cref="ObjectDisposedException">The archive stream is disposed.</exception>
 /// <exception cref="InvalidOperationException">The entry type of the <paramref name="entry"/> is not supported for writing.</exception>
 /// <exception cref="IOException">An I/O problem occurred.</exception>
Expand All@@ -262,6 +265,7 @@ public Task WriteEntryAsync(TarEntry entry, CancellationToken cancellationToken

 ObjectDisposedException.ThrowIf(_isDisposed, this);
 ArgumentNullException.ThrowIfNull(entry);
 ValidateEntryLinkName(entry._header._typeFlag, entry._header._linkName);
 return WriteEntryAsyncInternal(entry, cancellationToken);
 }

Expand DownExpand Up@@ -365,5 +369,16 @@ private async ValueTask WriteFinalRecordsAsync()

 return (fullPath, actualEntryName);
 }

 private static void ValidateEntryLinkName(TarEntryType entryType, string? linkName)
 {
 if (entryType is TarEntryType.HardLink or TarEntryType.SymbolicLink)
 {
 if (string.IsNullOrEmpty(linkName))
 {
 throw new ArgumentException(SR.TarEntryHardLinkOrSymlinkLinkNameEmpty, "entry");
 }
 }
 }
 }
}

14 changes: 14 additions & 0 deletions
src/libraries/System.Formats.Tar/tests/TarWriter/TarWriter.WriteEntry.Entry.Gnu.Tests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -167,6 +167,10 @@ public void Write_Long_Name(TarEntryType entryType)
 using (TarWriter writer = new TarWriter(archiveStream, TarEntryFormat.Gnu, leaveOpen: true))
 {
 GnuTarEntry entry = new GnuTarEntry(entryType, longName);
 if (entryType is TarEntryType.HardLink or TarEntryType.SymbolicLink)
 {
 entry.LinkName = "linktarget";
 }
 writer.WriteEntry(entry);
 }

Expand DownExpand Up@@ -231,5 +235,15 @@ public void Write_LongName_And_LongLinkName(TarEntryType entryType)
 Assert.Equal(longLinkName, entry.LinkName);
 }
 }

 [Theory]
 [InlineData(TarEntryType.HardLink)]
 [InlineData(TarEntryType.SymbolicLink)]
 public void Write_LinkEntry_EmptyLinkName_Throws(TarEntryType entryType)
 {
 using MemoryStream archiveStream = new MemoryStream();
 using TarWriter writer = new TarWriter(archiveStream, leaveOpen: false);
 Assert.Throws<ArgumentException>("entry", () => writer.WriteEntry(new GnuTarEntry(entryType, "link")));
 }
 }
}

10 changes: 10 additions & 0 deletions
src/libraries/System.Formats.Tar/tests/TarWriter/TarWriter.WriteEntry.Entry.Pax.Tests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -485,5 +485,15 @@ public void WriteTimestampsBeyondOctalLimitInPax()
 Assert.Equal(overLimitTimestamp, actualCTime);
 }
 }

 [Theory]
 [InlineData(TarEntryType.HardLink)]
 [InlineData(TarEntryType.SymbolicLink)]
 public void Write_LinkEntry_EmptyLinkName_Throws(TarEntryType entryType)
 {
 using MemoryStream archiveStream = new MemoryStream();
 using TarWriter writer = new TarWriter(archiveStream, leaveOpen: false);
 Assert.Throws<ArgumentException>("entry", () => writer.WriteEntry(new PaxTarEntry(entryType, "link")));
 }
 }
}

10 changes: 10 additions & 0 deletions
src/libraries/System.Formats.Tar/tests/TarWriter/TarWriter.WriteEntry.Entry.Ustar.Tests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -152,5 +152,15 @@ public void WriteFifo()
 VerifyFifo(fifo);
 }
 }

 [Theory]
 [InlineData(TarEntryType.HardLink)]
 [InlineData(TarEntryType.SymbolicLink)]
 public void Write_LinkEntry_EmptyLinkName_Throws(TarEntryType entryType)
 {
 using MemoryStream archiveStream = new MemoryStream();
 using TarWriter writer = new TarWriter(archiveStream, leaveOpen: false);
 Assert.Throws<ArgumentException>("entry", () => writer.WriteEntry(new UstarTarEntry(entryType, "link")));
 }
 }
}

10 changes: 10 additions & 0 deletions
src/libraries/System.Formats.Tar/tests/TarWriter/TarWriter.WriteEntry.Entry.V7.Tests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -92,5 +92,15 @@ public void WriteDirectory()
 VerifyDirectory(directory);
 }
 }

 [Theory]
 [InlineData(TarEntryType.HardLink)]
 [InlineData(TarEntryType.SymbolicLink)]
 public void Write_LinkEntry_EmptyLinkName_Throws(TarEntryType entryType)
 {
 using MemoryStream archiveStream = new MemoryStream();
 using TarWriter writer = new TarWriter(archiveStream, leaveOpen: false);
 Assert.Throws<ArgumentException>("entry", () => writer.WriteEntry(new V7TarEntry(entryType, "link")));
 }
 }
}

14 changes: 14 additions & 0 deletions
...libraries/System.Formats.Tar/tests/TarWriter/TarWriter.WriteEntryAsync.Entry.Gnu.Tests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -183,6 +183,10 @@ public async Task Write_Long_Name_Async(TarEntryType entryType)
 await using (TarWriter writer = new TarWriter(archiveStream, TarEntryFormat.Gnu, leaveOpen: true))
 {
 GnuTarEntry entry = new GnuTarEntry(entryType, longName);
 if (entryType is TarEntryType.HardLink or TarEntryType.SymbolicLink)
 {
 entry.LinkName = "linktarget";
 }
 await writer.WriteEntryAsync(entry);
 }

Expand DownExpand Up@@ -252,5 +256,15 @@ public async Task Write_LongName_And_LongLinkName_Async(TarEntryType entryType)
 }
 }
 }

 [Theory]
 [InlineData(TarEntryType.HardLink)]
 [InlineData(TarEntryType.SymbolicLink)]
 public async Task Write_LinkEntry_EmptyLinkName_Throws_Async(TarEntryType entryType)
 {
 await using MemoryStream archiveStream = new MemoryStream();
 await using TarWriter writer = new TarWriter(archiveStream, leaveOpen: false);
 await Assert.ThrowsAsync<ArgumentException>("entry", () => writer.WriteEntryAsync(new GnuTarEntry(entryType, "link")));
 }
 }
}

10 changes: 10 additions & 0 deletions
...libraries/System.Formats.Tar/tests/TarWriter/TarWriter.WriteEntryAsync.Entry.Pax.Tests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -505,5 +505,15 @@ public async Task WriteTimestampsBeyondOctalLimitInPax_Async()
 Assert.Equal(overLimitTimestamp, actualCTime);
 }
 }

 [Theory]
 [InlineData(TarEntryType.HardLink)]
 [InlineData(TarEntryType.SymbolicLink)]
 public async Task Write_LinkEntry_EmptyLinkName_Throws_Async(TarEntryType entryType)
 {
 await using MemoryStream archiveStream = new MemoryStream();
 await using TarWriter writer = new TarWriter(archiveStream, leaveOpen: false);
 await Assert.ThrowsAsync<ArgumentException>("entry", () => writer.WriteEntryAsync(new PaxTarEntry(entryType, "link")));
 }
 }
}

10 changes: 10 additions & 0 deletions
...braries/System.Formats.Tar/tests/TarWriter/TarWriter.WriteEntryAsync.Entry.Ustar.Tests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -153,5 +153,15 @@ public async Task WriteFifo_Async()
 VerifyFifo(fifo);
 }
 }

 [Theory]
 [InlineData(TarEntryType.HardLink)]
 [InlineData(TarEntryType.SymbolicLink)]
 public async Task Write_LinkEntry_EmptyLinkName_Throws_Async(TarEntryType entryType)
 {
 await using MemoryStream archiveStream = new MemoryStream();
 await using TarWriter writer = new TarWriter(archiveStream, leaveOpen: false);
 await Assert.ThrowsAsync<ArgumentException>("entry", () => writer.WriteEntryAsync(new UstarTarEntry(entryType, "link")));
 }
 }
}

10 changes: 10 additions & 0 deletions
src/libraries/System.Formats.Tar/tests/TarWriter/TarWriter.WriteEntryAsync.Entry.V7.Tests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -93,5 +93,15 @@ public async Task WriteDirectory_Async()
 VerifyDirectory(directory);
 }
 }

 [Theory]
 [InlineData(TarEntryType.HardLink)]
 [InlineData(TarEntryType.SymbolicLink)]
 public async Task Write_LinkEntry_EmptyLinkName_Throws_Async(TarEntryType entryType)
 {
 await using MemoryStream archiveStream = new MemoryStream();
 await using TarWriter writer = new TarWriter(archiveStream, leaveOpen: false);
 await Assert.ThrowsAsync<ArgumentException>("entry", () => writer.WriteEntryAsync(new V7TarEntry(entryType, "link")));
 }
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
[release/7.0] Disallow TarWriter from writing link entries without LinkName set#74939

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

Sep 2, 2022
 Merged


[release/7.0] Disallow TarWriter from writing link entries without LinkName set
#74939
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
faf448f

Disallow TarWriter from writing link entries without LinkName set


carlossanlop Aug 31, 2022
e0cffca

Tests


carlossanlop Aug 31, 2022
c4252b3

Docs


carlossanlop Aug 31, 2022
45e35f5

Apply suggestions from code review


carlossanlop Aug 31, 2022
a1eec88

Apply suggestions from code review


jozkee Sep 1, 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


3 changes: 3 additions & 0 deletions
src/libraries/System.Formats.Tar/src/System/Formats/Tar/TarHeader.Write.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -391,6 +391,9 @@ private int WritePosixName(Span<byte> buffer)
 // Writes all the common fields shared by all formats into the specified spans.
 private int WriteCommonFields(Span<byte> buffer, long actualLength, TarEntryType actualEntryType)
 {
 // Don't write an empty LinkName if the entry is a hardlink or symlink
 Debug.Assert(!string.IsNullOrEmpty(_linkName) ^ (_typeFlag is not TarEntryType.SymbolicLink and not TarEntryType.HardLink));

 int checksum = 0;

 if (_mode > 0)
Expand Down

15 changes: 15 additions & 0 deletions
src/libraries/System.Formats.Tar/src/System/Formats/Tar/TarWriter.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -209,13 +209,15 @@ private async Task ReadFileFromDiskAndWriteToArchiveStreamAsEntryAsync(string fu
 /// </item>
 /// </list>
 /// </remarks>
 /// <exception cref="ArgumentException">The entry type is <see cref="TarEntryType.HardLink"/> or <see cref="TarEntryType.SymbolicLink"/> and the <see cref="TarEntry.LinkName"/> is <see langword="null"/> or empty.</exception>
 /// <exception cref="ObjectDisposedException">The archive stream is disposed.</exception>
 /// <exception cref="InvalidOperationException">The entry type of the <paramref name="entry"/> is not supported for writing.</exception>
 /// <exception cref="IOException">An I/O problem occurred.</exception>
 public void WriteEntry(TarEntry entry)
 {
 ObjectDisposedException.ThrowIf(_isDisposed, this);
 ArgumentNullException.ThrowIfNull(entry);
 ValidateEntryLinkName(entry._header._typeFlag, entry._header._linkName);
 WriteEntryInternal(entry);
 }

Expand DownExpand Up@@ -250,6 +252,7 @@ public void WriteEntry(TarEntry entry)
 /// </item>
 /// </list>
 /// </remarks>
 /// <exception cref="ArgumentException">The entry type is <see cref="TarEntryType.HardLink"/> or <see cref="TarEntryType.SymbolicLink"/> and the <see cref="TarEntry.LinkName"/> is <see langword="null"/> or empty.</exception>
 /// <exception cref="ObjectDisposedException">The archive stream is disposed.</exception>
 /// <exception cref="InvalidOperationException">The entry type of the <paramref name="entry"/> is not supported for writing.</exception>
 /// <exception cref="IOException">An I/O problem occurred.</exception>
Expand All@@ -262,6 +265,7 @@ public Task WriteEntryAsync(TarEntry entry, CancellationToken cancellationToken

 ObjectDisposedException.ThrowIf(_isDisposed, this);
 ArgumentNullException.ThrowIfNull(entry);
 ValidateEntryLinkName(entry._header._typeFlag, entry._header._linkName);
 return WriteEntryAsyncInternal(entry, cancellationToken);
 }

Expand DownExpand Up@@ -365,5 +369,16 @@ private async ValueTask WriteFinalRecordsAsync()

 return (fullPath, actualEntryName);
 }

 private static void ValidateEntryLinkName(TarEntryType entryType, string? linkName)
 {
 if (entryType is TarEntryType.HardLink or TarEntryType.SymbolicLink)
 {
 if (string.IsNullOrEmpty(linkName))
 {
 throw new ArgumentException(SR.TarEntryHardLinkOrSymlinkLinkNameEmpty, "entry");
 }
 }
 }
 }
}

14 changes: 14 additions & 0 deletions
src/libraries/System.Formats.Tar/tests/TarWriter/TarWriter.WriteEntry.Entry.Gnu.Tests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -167,6 +167,10 @@ public void Write_Long_Name(TarEntryType entryType)
 using (TarWriter writer = new TarWriter(archiveStream, TarEntryFormat.Gnu, leaveOpen: true))
 {
 GnuTarEntry entry = new GnuTarEntry(entryType, longName);
 if (entryType is TarEntryType.HardLink or TarEntryType.SymbolicLink)
 {
 entry.LinkName = "linktarget";
 }
 writer.WriteEntry(entry);
 }

Expand DownExpand Up@@ -231,5 +235,15 @@ public void Write_LongName_And_LongLinkName(TarEntryType entryType)
 Assert.Equal(longLinkName, entry.LinkName);
 }
 }

 [Theory]
 [InlineData(TarEntryType.HardLink)]
 [InlineData(TarEntryType.SymbolicLink)]
 public void Write_LinkEntry_EmptyLinkName_Throws(TarEntryType entryType)
 {
 using MemoryStream archiveStream = new MemoryStream();
 using TarWriter writer = new TarWriter(archiveStream, leaveOpen: false);
 Assert.Throws<ArgumentException>("entry", () => writer.WriteEntry(new GnuTarEntry(entryType, "link")));
 }
 }
}

10 changes: 10 additions & 0 deletions
src/libraries/System.Formats.Tar/tests/TarWriter/TarWriter.WriteEntry.Entry.Pax.Tests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -485,5 +485,15 @@ public void WriteTimestampsBeyondOctalLimitInPax()
 Assert.Equal(overLimitTimestamp, actualCTime);
 }
 }

 [Theory]
 [InlineData(TarEntryType.HardLink)]
 [InlineData(TarEntryType.SymbolicLink)]
 public void Write_LinkEntry_EmptyLinkName_Throws(TarEntryType entryType)
 {
 using MemoryStream archiveStream = new MemoryStream();
 using TarWriter writer = new TarWriter(archiveStream, leaveOpen: false);
 Assert.Throws<ArgumentException>("entry", () => writer.WriteEntry(new PaxTarEntry(entryType, "link")));
 }
 }
}

10 changes: 10 additions & 0 deletions
src/libraries/System.Formats.Tar/tests/TarWriter/TarWriter.WriteEntry.Entry.Ustar.Tests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -152,5 +152,15 @@ public void WriteFifo()
 VerifyFifo(fifo);
 }
 }

 [Theory]
 [InlineData(TarEntryType.HardLink)]
 [InlineData(TarEntryType.SymbolicLink)]
 public void Write_LinkEntry_EmptyLinkName_Throws(TarEntryType entryType)
 {
 using MemoryStream archiveStream = new MemoryStream();
 using TarWriter writer = new TarWriter(archiveStream, leaveOpen: false);
 Assert.Throws<ArgumentException>("entry", () => writer.WriteEntry(new UstarTarEntry(entryType, "link")));
 }
 }
}

10 changes: 10 additions & 0 deletions
src/libraries/System.Formats.Tar/tests/TarWriter/TarWriter.WriteEntry.Entry.V7.Tests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -92,5 +92,15 @@ public void WriteDirectory()
 VerifyDirectory(directory);
 }
 }

 [Theory]
 [InlineData(TarEntryType.HardLink)]
 [InlineData(TarEntryType.SymbolicLink)]
 public void Write_LinkEntry_EmptyLinkName_Throws(TarEntryType entryType)
 {
 using MemoryStream archiveStream = new MemoryStream();
 using TarWriter writer = new TarWriter(archiveStream, leaveOpen: false);
 Assert.Throws<ArgumentException>("entry", () => writer.WriteEntry(new V7TarEntry(entryType, "link")));
 }
 }
}

14 changes: 14 additions & 0 deletions
...libraries/System.Formats.Tar/tests/TarWriter/TarWriter.WriteEntryAsync.Entry.Gnu.Tests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -183,6 +183,10 @@ public async Task Write_Long_Name_Async(TarEntryType entryType)
 await using (TarWriter writer = new TarWriter(archiveStream, TarEntryFormat.Gnu, leaveOpen: true))
 {
 GnuTarEntry entry = new GnuTarEntry(entryType, longName);
 if (entryType is TarEntryType.HardLink or TarEntryType.SymbolicLink)
 {
 entry.LinkName = "linktarget";
 }
 await writer.WriteEntryAsync(entry);
 }

Expand DownExpand Up@@ -252,5 +256,15 @@ public async Task Write_LongName_And_LongLinkName_Async(TarEntryType entryType)
 }
 }
 }

 [Theory]
 [InlineData(TarEntryType.HardLink)]
 [InlineData(TarEntryType.SymbolicLink)]
 public async Task Write_LinkEntry_EmptyLinkName_Throws_Async(TarEntryType entryType)
 {
 await using MemoryStream archiveStream = new MemoryStream();
 await using TarWriter writer = new TarWriter(archiveStream, leaveOpen: false);
 await Assert.ThrowsAsync<ArgumentException>("entry", () => writer.WriteEntryAsync(new GnuTarEntry(entryType, "link")));
 }
 }
}

10 changes: 10 additions & 0 deletions
...libraries/System.Formats.Tar/tests/TarWriter/TarWriter.WriteEntryAsync.Entry.Pax.Tests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -505,5 +505,15 @@ public async Task WriteTimestampsBeyondOctalLimitInPax_Async()
 Assert.Equal(overLimitTimestamp, actualCTime);
 }
 }

 [Theory]
 [InlineData(TarEntryType.HardLink)]
 [InlineData(TarEntryType.SymbolicLink)]
 public async Task Write_LinkEntry_EmptyLinkName_Throws_Async(TarEntryType entryType)
 {
 await using MemoryStream archiveStream = new MemoryStream();
 await using TarWriter writer = new TarWriter(archiveStream, leaveOpen: false);
 await Assert.ThrowsAsync<ArgumentException>("entry", () => writer.WriteEntryAsync(new PaxTarEntry(entryType, "link")));
 }
 }
}

10 changes: 10 additions & 0 deletions
...braries/System.Formats.Tar/tests/TarWriter/TarWriter.WriteEntryAsync.Entry.Ustar.Tests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -153,5 +153,15 @@ public async Task WriteFifo_Async()
 VerifyFifo(fifo);
 }
 }

 [Theory]
 [InlineData(TarEntryType.HardLink)]
 [InlineData(TarEntryType.SymbolicLink)]
 public async Task Write_LinkEntry_EmptyLinkName_Throws_Async(TarEntryType entryType)
 {
 await using MemoryStream archiveStream = new MemoryStream();
 await using TarWriter writer = new TarWriter(archiveStream, leaveOpen: false);
 await Assert.ThrowsAsync<ArgumentException>("entry", () => writer.WriteEntryAsync(new UstarTarEntry(entryType, "link")));
 }
 }
}

10 changes: 10 additions & 0 deletions
src/libraries/System.Formats.Tar/tests/TarWriter/TarWriter.WriteEntryAsync.Entry.V7.Tests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -93,5 +93,15 @@ public async Task WriteDirectory_Async()
 VerifyDirectory(directory);
 }
 }

 [Theory]
 [InlineData(TarEntryType.HardLink)]
 [InlineData(TarEntryType.SymbolicLink)]
 public async Task Write_LinkEntry_EmptyLinkName_Throws_Async(TarEntryType entryType)
 {
 await using MemoryStream archiveStream = new MemoryStream();
 await using TarWriter writer = new TarWriter(archiveStream, leaveOpen: false);
 await Assert.ThrowsAsync<ArgumentException>("entry", () => writer.WriteEntryAsync(new V7TarEntry(entryType, "link")));
 }
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[release/7.0] Disallow TarWriter from writing link entries without LinkName set#74939

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

Sep 2, 2022
 Merged


[release/7.0] Disallow TarWriter from writing link entries without LinkName set
#74939
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
faf448f

Disallow TarWriter from writing link entries without LinkName set


carlossanlop Aug 31, 2022
e0cffca

Tests


carlossanlop Aug 31, 2022
c4252b3

Docs


carlossanlop Aug 31, 2022
45e35f5

Apply suggestions from code review


carlossanlop Aug 31, 2022
a1eec88

Apply suggestions from code review


jozkee Sep 1, 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


3 changes: 3 additions & 0 deletions
src/libraries/System.Formats.Tar/src/System/Formats/Tar/TarHeader.Write.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -391,6 +391,9 @@ private int WritePosixName(Span<byte> buffer)
 // Writes all the common fields shared by all formats into the specified spans.
 private int WriteCommonFields(Span<byte> buffer, long actualLength, TarEntryType actualEntryType)
 {
 // Don't write an empty LinkName if the entry is a hardlink or symlink
 Debug.Assert(!string.IsNullOrEmpty(_linkName) ^ (_typeFlag is not TarEntryType.SymbolicLink and not TarEntryType.HardLink));

 int checksum = 0;

 if (_mode > 0)
Expand Down

15 changes: 15 additions & 0 deletions
src/libraries/System.Formats.Tar/src/System/Formats/Tar/TarWriter.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -209,13 +209,15 @@ private async Task ReadFileFromDiskAndWriteToArchiveStreamAsEntryAsync(string fu
 /// </item>
 /// </list>
 /// </remarks>
 /// <exception cref="ArgumentException">The entry type is <see cref="TarEntryType.HardLink"/> or <see cref="TarEntryType.SymbolicLink"/> and the <see cref="TarEntry.LinkName"/> is <see langword="null"/> or empty.</exception>
 /// <exception cref="ObjectDisposedException">The archive stream is disposed.</exception>
 /// <exception cref="InvalidOperationException">The entry type of the <paramref name="entry"/> is not supported for writing.</exception>
 /// <exception cref="IOException">An I/O problem occurred.</exception>
 public void WriteEntry(TarEntry entry)
 {
 ObjectDisposedException.ThrowIf(_isDisposed, this);
 ArgumentNullException.ThrowIfNull(entry);
 ValidateEntryLinkName(entry._header._typeFlag, entry._header._linkName);
 WriteEntryInternal(entry);
 }

Expand DownExpand Up@@ -250,6 +252,7 @@ public void WriteEntry(TarEntry entry)
 /// </item>
 /// </list>
 /// </remarks>
 /// <exception cref="ArgumentException">The entry type is <see cref="TarEntryType.HardLink"/> or <see cref="TarEntryType.SymbolicLink"/> and the <see cref="TarEntry.LinkName"/> is <see langword="null"/> or empty.</exception>
 /// <exception cref="ObjectDisposedException">The archive stream is disposed.</exception>
 /// <exception cref="InvalidOperationException">The entry type of the <paramref name="entry"/> is not supported for writing.</exception>
 /// <exception cref="IOException">An I/O problem occurred.</exception>
Expand All@@ -262,6 +265,7 @@ public Task WriteEntryAsync(TarEntry entry, CancellationToken cancellationToken

 ObjectDisposedException.ThrowIf(_isDisposed, this);
 ArgumentNullException.ThrowIfNull(entry);
 ValidateEntryLinkName(entry._header._typeFlag, entry._header._linkName);
 return WriteEntryAsyncInternal(entry, cancellationToken);
 }

Expand DownExpand Up@@ -365,5 +369,16 @@ private async ValueTask WriteFinalRecordsAsync()

 return (fullPath, actualEntryName);
 }

 private static void ValidateEntryLinkName(TarEntryType entryType, string? linkName)
 {
 if (entryType is TarEntryType.HardLink or TarEntryType.SymbolicLink)
 {
 if (string.IsNullOrEmpty(linkName))
 {
 throw new ArgumentException(SR.TarEntryHardLinkOrSymlinkLinkNameEmpty, "entry");
 }
 }
 }
 }
}

14 changes: 14 additions & 0 deletions
src/libraries/System.Formats.Tar/tests/TarWriter/TarWriter.WriteEntry.Entry.Gnu.Tests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -167,6 +167,10 @@ public void Write_Long_Name(TarEntryType entryType)
 using (TarWriter writer = new TarWriter(archiveStream, TarEntryFormat.Gnu, leaveOpen: true))
 {
 GnuTarEntry entry = new GnuTarEntry(entryType, longName);
 if (entryType is TarEntryType.HardLink or TarEntryType.SymbolicLink)
 {
 entry.LinkName = "linktarget";
 }
 writer.WriteEntry(entry);
 }

Expand DownExpand Up@@ -231,5 +235,15 @@ public void Write_LongName_And_LongLinkName(TarEntryType entryType)
 Assert.Equal(longLinkName, entry.LinkName);
 }
 }

 [Theory]
 [InlineData(TarEntryType.HardLink)]
 [InlineData(TarEntryType.SymbolicLink)]
 public void Write_LinkEntry_EmptyLinkName_Throws(TarEntryType entryType)
 {
 using MemoryStream archiveStream = new MemoryStream();
 using TarWriter writer = new TarWriter(archiveStream, leaveOpen: false);
 Assert.Throws<ArgumentException>("entry", () => writer.WriteEntry(new GnuTarEntry(entryType, "link")));
 }
 }
}

10 changes: 10 additions & 0 deletions
src/libraries/System.Formats.Tar/tests/TarWriter/TarWriter.WriteEntry.Entry.Pax.Tests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -485,5 +485,15 @@ public void WriteTimestampsBeyondOctalLimitInPax()
 Assert.Equal(overLimitTimestamp, actualCTime);
 }
 }

 [Theory]
 [InlineData(TarEntryType.HardLink)]
 [InlineData(TarEntryType.SymbolicLink)]
 public void Write_LinkEntry_EmptyLinkName_Throws(TarEntryType entryType)
 {
 using MemoryStream archiveStream = new MemoryStream();
 using TarWriter writer = new TarWriter(archiveStream, leaveOpen: false);
 Assert.Throws<ArgumentException>("entry", () => writer.WriteEntry(new PaxTarEntry(entryType, "link")));
 }
 }
}

10 changes: 10 additions & 0 deletions
src/libraries/System.Formats.Tar/tests/TarWriter/TarWriter.WriteEntry.Entry.Ustar.Tests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -152,5 +152,15 @@ public void WriteFifo()
 VerifyFifo(fifo);
 }
 }

 [Theory]
 [InlineData(TarEntryType.HardLink)]
 [InlineData(TarEntryType.SymbolicLink)]
 public void Write_LinkEntry_EmptyLinkName_Throws(TarEntryType entryType)
 {
 using MemoryStream archiveStream = new MemoryStream();
 using TarWriter writer = new TarWriter(archiveStream, leaveOpen: false);
 Assert.Throws<ArgumentException>("entry", () => writer.WriteEntry(new UstarTarEntry(entryType, "link")));
 }
 }
}

10 changes: 10 additions & 0 deletions
src/libraries/System.Formats.Tar/tests/TarWriter/TarWriter.WriteEntry.Entry.V7.Tests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -92,5 +92,15 @@ public void WriteDirectory()
 VerifyDirectory(directory);
 }
 }

 [Theory]
 [InlineData(TarEntryType.HardLink)]
 [InlineData(TarEntryType.SymbolicLink)]
 public void Write_LinkEntry_EmptyLinkName_Throws(TarEntryType entryType)
 {
 using MemoryStream archiveStream = new MemoryStream();
 using TarWriter writer = new TarWriter(archiveStream, leaveOpen: false);
 Assert.Throws<ArgumentException>("entry", () => writer.WriteEntry(new V7TarEntry(entryType, "link")));
 }
 }
}

14 changes: 14 additions & 0 deletions
...libraries/System.Formats.Tar/tests/TarWriter/TarWriter.WriteEntryAsync.Entry.Gnu.Tests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -183,6 +183,10 @@ public async Task Write_Long_Name_Async(TarEntryType entryType)
 await using (TarWriter writer = new TarWriter(archiveStream, TarEntryFormat.Gnu, leaveOpen: true))
 {
 GnuTarEntry entry = new GnuTarEntry(entryType, longName);
 if (entryType is TarEntryType.HardLink or TarEntryType.SymbolicLink)
 {
 entry.LinkName = "linktarget";
 }
 await writer.WriteEntryAsync(entry);
 }

Expand DownExpand Up@@ -252,5 +256,15 @@ public async Task Write_LongName_And_LongLinkName_Async(TarEntryType entryType)
 }
 }
 }

 [Theory]
 [InlineData(TarEntryType.HardLink)]
 [InlineData(TarEntryType.SymbolicLink)]
 public async Task Write_LinkEntry_EmptyLinkName_Throws_Async(TarEntryType entryType)
 {
 await using MemoryStream archiveStream = new MemoryStream();
 await using TarWriter writer = new TarWriter(archiveStream, leaveOpen: false);
 await Assert.ThrowsAsync<ArgumentException>("entry", () => writer.WriteEntryAsync(new GnuTarEntry(entryType, "link")));
 }
 }
}

10 changes: 10 additions & 0 deletions
...libraries/System.Formats.Tar/tests/TarWriter/TarWriter.WriteEntryAsync.Entry.Pax.Tests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -505,5 +505,15 @@ public async Task WriteTimestampsBeyondOctalLimitInPax_Async()
 Assert.Equal(overLimitTimestamp, actualCTime);
 }
 }

 [Theory]
 [InlineData(TarEntryType.HardLink)]
 [InlineData(TarEntryType.SymbolicLink)]
 public async Task Write_LinkEntry_EmptyLinkName_Throws_Async(TarEntryType entryType)
 {
 await using MemoryStream archiveStream = new MemoryStream();
 await using TarWriter writer = new TarWriter(archiveStream, leaveOpen: false);
 await Assert.ThrowsAsync<ArgumentException>("entry", () => writer.WriteEntryAsync(new PaxTarEntry(entryType, "link")));
 }
 }
}

10 changes: 10 additions & 0 deletions
...braries/System.Formats.Tar/tests/TarWriter/TarWriter.WriteEntryAsync.Entry.Ustar.Tests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -153,5 +153,15 @@ public async Task WriteFifo_Async()
 VerifyFifo(fifo);
 }
 }

 [Theory]
 [InlineData(TarEntryType.HardLink)]
 [InlineData(TarEntryType.SymbolicLink)]
 public async Task Write_LinkEntry_EmptyLinkName_Throws_Async(TarEntryType entryType)
 {
 await using MemoryStream archiveStream = new MemoryStream();
 await using TarWriter writer = new TarWriter(archiveStream, leaveOpen: false);
 await Assert.ThrowsAsync<ArgumentException>("entry", () => writer.WriteEntryAsync(new UstarTarEntry(entryType, "link")));
 }
 }
}

10 changes: 10 additions & 0 deletions
src/libraries/System.Formats.Tar/tests/TarWriter/TarWriter.WriteEntryAsync.Entry.V7.Tests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -93,5 +93,15 @@ public async Task WriteDirectory_Async()
 VerifyDirectory(directory);
 }
 }

 [Theory]
 [InlineData(TarEntryType.HardLink)]
 [InlineData(TarEntryType.SymbolicLink)]
 public async Task Write_LinkEntry_EmptyLinkName_Throws_Async(TarEntryType entryType)
 {
 await using MemoryStream archiveStream = new MemoryStream();
 await using TarWriter writer = new TarWriter(archiveStream, leaveOpen: false);
 await Assert.ThrowsAsync<ArgumentException>("entry", () => writer.WriteEntryAsync(new V7TarEntry(entryType, "link")));
 }
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[release/7.0] Disallow TarWriter from writing link entries without LinkName set#74939

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

Sep 2, 2022
 Merged


[release/7.0] Disallow TarWriter from writing link entries without LinkName set
#74939
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
faf448f

Disallow TarWriter from writing link entries without LinkName set


carlossanlop Aug 31, 2022
e0cffca

Tests


carlossanlop Aug 31, 2022
c4252b3

Docs


carlossanlop Aug 31, 2022
45e35f5

Apply suggestions from code review


carlossanlop Aug 31, 2022
a1eec88

Apply suggestions from code review


jozkee Sep 1, 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


3 changes: 3 additions & 0 deletions
src/libraries/System.Formats.Tar/src/System/Formats/Tar/TarHeader.Write.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -391,6 +391,9 @@ private int WritePosixName(Span<byte> buffer)
 // Writes all the common fields shared by all formats into the specified spans.
 private int WriteCommonFields(Span<byte> buffer, long actualLength, TarEntryType actualEntryType)
 {
 // Don't write an empty LinkName if the entry is a hardlink or symlink
 Debug.Assert(!string.IsNullOrEmpty(_linkName) ^ (_typeFlag is not TarEntryType.SymbolicLink and not TarEntryType.HardLink));

 int checksum = 0;

 if (_mode > 0)
Expand Down

15 changes: 15 additions & 0 deletions
src/libraries/System.Formats.Tar/src/System/Formats/Tar/TarWriter.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -209,13 +209,15 @@ private async Task ReadFileFromDiskAndWriteToArchiveStreamAsEntryAsync(string fu
 /// </item>
 /// </list>
 /// </remarks>
 /// <exception cref="ArgumentException">The entry type is <see cref="TarEntryType.HardLink"/> or <see cref="TarEntryType.SymbolicLink"/> and the <see cref="TarEntry.LinkName"/> is <see langword="null"/> or empty.</exception>
 /// <exception cref="ObjectDisposedException">The archive stream is disposed.</exception>
 /// <exception cref="InvalidOperationException">The entry type of the <paramref name="entry"/> is not supported for writing.</exception>
 /// <exception cref="IOException">An I/O problem occurred.</exception>
 public void WriteEntry(TarEntry entry)
 {
 ObjectDisposedException.ThrowIf(_isDisposed, this);
 ArgumentNullException.ThrowIfNull(entry);
 ValidateEntryLinkName(entry._header._typeFlag, entry._header._linkName);
 WriteEntryInternal(entry);
 }

Expand DownExpand Up@@ -250,6 +252,7 @@ public void WriteEntry(TarEntry entry)
 /// </item>
 /// </list>
 /// </remarks>
 /// <exception cref="ArgumentException">The entry type is <see cref="TarEntryType.HardLink"/> or <see cref="TarEntryType.SymbolicLink"/> and the <see cref="TarEntry.LinkName"/> is <see langword="null"/> or empty.</exception>
 /// <exception cref="ObjectDisposedException">The archive stream is disposed.</exception>
 /// <exception cref="InvalidOperationException">The entry type of the <paramref name="entry"/> is not supported for writing.</exception>
 /// <exception cref="IOException">An I/O problem occurred.</exception>
Expand All@@ -262,6 +265,7 @@ public Task WriteEntryAsync(TarEntry entry, CancellationToken cancellationToken

 ObjectDisposedException.ThrowIf(_isDisposed, this);
 ArgumentNullException.ThrowIfNull(entry);
 ValidateEntryLinkName(entry._header._typeFlag, entry._header._linkName);
 return WriteEntryAsyncInternal(entry, cancellationToken);
 }

Expand DownExpand Up@@ -365,5 +369,16 @@ private async ValueTask WriteFinalRecordsAsync()

 return (fullPath, actualEntryName);
 }

 private static void ValidateEntryLinkName(TarEntryType entryType, string? linkName)
 {
 if (entryType is TarEntryType.HardLink or TarEntryType.SymbolicLink)
 {
 if (string.IsNullOrEmpty(linkName))
 {
 throw new ArgumentException(SR.TarEntryHardLinkOrSymlinkLinkNameEmpty, "entry");
 }
 }
 }
 }
}

14 changes: 14 additions & 0 deletions
src/libraries/System.Formats.Tar/tests/TarWriter/TarWriter.WriteEntry.Entry.Gnu.Tests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -167,6 +167,10 @@ public void Write_Long_Name(TarEntryType entryType)
 using (TarWriter writer = new TarWriter(archiveStream, TarEntryFormat.Gnu, leaveOpen: true))
 {
 GnuTarEntry entry = new GnuTarEntry(entryType, longName);
 if (entryType is TarEntryType.HardLink or TarEntryType.SymbolicLink)
 {
 entry.LinkName = "linktarget";
 }
 writer.WriteEntry(entry);
 }

Expand DownExpand Up@@ -231,5 +235,15 @@ public void Write_LongName_And_LongLinkName(TarEntryType entryType)
 Assert.Equal(longLinkName, entry.LinkName);
 }
 }

 [Theory]
 [InlineData(TarEntryType.HardLink)]
 [InlineData(TarEntryType.SymbolicLink)]
 public void Write_LinkEntry_EmptyLinkName_Throws(TarEntryType entryType)
 {
 using MemoryStream archiveStream = new MemoryStream();
 using TarWriter writer = new TarWriter(archiveStream, leaveOpen: false);
 Assert.Throws<ArgumentException>("entry", () => writer.WriteEntry(new GnuTarEntry(entryType, "link")));
 }
 }
}

10 changes: 10 additions & 0 deletions
src/libraries/System.Formats.Tar/tests/TarWriter/TarWriter.WriteEntry.Entry.Pax.Tests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -485,5 +485,15 @@ public void WriteTimestampsBeyondOctalLimitInPax()
 Assert.Equal(overLimitTimestamp, actualCTime);
 }
 }

 [Theory]
 [InlineData(TarEntryType.HardLink)]
 [InlineData(TarEntryType.SymbolicLink)]
 public void Write_LinkEntry_EmptyLinkName_Throws(TarEntryType entryType)
 {
 using MemoryStream archiveStream = new MemoryStream();
 using TarWriter writer = new TarWriter(archiveStream, leaveOpen: false);
 Assert.Throws<ArgumentException>("entry", () => writer.WriteEntry(new PaxTarEntry(entryType, "link")));
 }
 }
}

10 changes: 10 additions & 0 deletions
src/libraries/System.Formats.Tar/tests/TarWriter/TarWriter.WriteEntry.Entry.Ustar.Tests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -152,5 +152,15 @@ public void WriteFifo()
 VerifyFifo(fifo);
 }
 }

 [Theory]
 [InlineData(TarEntryType.HardLink)]
 [InlineData(TarEntryType.SymbolicLink)]
 public void Write_LinkEntry_EmptyLinkName_Throws(TarEntryType entryType)
 {
 using MemoryStream archiveStream = new MemoryStream();
 using TarWriter writer = new TarWriter(archiveStream, leaveOpen: false);
 Assert.Throws<ArgumentException>("entry", () => writer.WriteEntry(new UstarTarEntry(entryType, "link")));
 }
 }
}

10 changes: 10 additions & 0 deletions
src/libraries/System.Formats.Tar/tests/TarWriter/TarWriter.WriteEntry.Entry.V7.Tests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -92,5 +92,15 @@ public void WriteDirectory()
 VerifyDirectory(directory);
 }
 }

 [Theory]
 [InlineData(TarEntryType.HardLink)]
 [InlineData(TarEntryType.SymbolicLink)]
 public void Write_LinkEntry_EmptyLinkName_Throws(TarEntryType entryType)
 {
 using MemoryStream archiveStream = new MemoryStream();
 using TarWriter writer = new TarWriter(archiveStream, leaveOpen: false);
 Assert.Throws<ArgumentException>("entry", () => writer.WriteEntry(new V7TarEntry(entryType, "link")));
 }
 }
}

14 changes: 14 additions & 0 deletions
...libraries/System.Formats.Tar/tests/TarWriter/TarWriter.WriteEntryAsync.Entry.Gnu.Tests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -183,6 +183,10 @@ public async Task Write_Long_Name_Async(TarEntryType entryType)
 await using (TarWriter writer = new TarWriter(archiveStream, TarEntryFormat.Gnu, leaveOpen: true))
 {
 GnuTarEntry entry = new GnuTarEntry(entryType, longName);
 if (entryType is TarEntryType.HardLink or TarEntryType.SymbolicLink)
 {
 entry.LinkName = "linktarget";
 }
 await writer.WriteEntryAsync(entry);
 }

Expand DownExpand Up@@ -252,5 +256,15 @@ public async Task Write_LongName_And_LongLinkName_Async(TarEntryType entryType)
 }
 }
 }

 [Theory]
 [InlineData(TarEntryType.HardLink)]
 [InlineData(TarEntryType.SymbolicLink)]
 public async Task Write_LinkEntry_EmptyLinkName_Throws_Async(TarEntryType entryType)
 {
 await using MemoryStream archiveStream = new MemoryStream();
 await using TarWriter writer = new TarWriter(archiveStream, leaveOpen: false);
 await Assert.ThrowsAsync<ArgumentException>("entry", () => writer.WriteEntryAsync(new GnuTarEntry(entryType, "link")));
 }
 }
}

10 changes: 10 additions & 0 deletions
...libraries/System.Formats.Tar/tests/TarWriter/TarWriter.WriteEntryAsync.Entry.Pax.Tests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -505,5 +505,15 @@ public async Task WriteTimestampsBeyondOctalLimitInPax_Async()
 Assert.Equal(overLimitTimestamp, actualCTime);
 }
 }

 [Theory]
 [InlineData(TarEntryType.HardLink)]
 [InlineData(TarEntryType.SymbolicLink)]
 public async Task Write_LinkEntry_EmptyLinkName_Throws_Async(TarEntryType entryType)
 {
 await using MemoryStream archiveStream = new MemoryStream();
 await using TarWriter writer = new TarWriter(archiveStream, leaveOpen: false);
 await Assert.ThrowsAsync<ArgumentException>("entry", () => writer.WriteEntryAsync(new PaxTarEntry(entryType, "link")));
 }
 }
}

10 changes: 10 additions & 0 deletions
...braries/System.Formats.Tar/tests/TarWriter/TarWriter.WriteEntryAsync.Entry.Ustar.Tests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -153,5 +153,15 @@ public async Task WriteFifo_Async()
 VerifyFifo(fifo);
 }
 }

 [Theory]
 [InlineData(TarEntryType.HardLink)]
 [InlineData(TarEntryType.SymbolicLink)]
 public async Task Write_LinkEntry_EmptyLinkName_Throws_Async(TarEntryType entryType)
 {
 await using MemoryStream archiveStream = new MemoryStream();
 await using TarWriter writer = new TarWriter(archiveStream, leaveOpen: false);
 await Assert.ThrowsAsync<ArgumentException>("entry", () => writer.WriteEntryAsync(new UstarTarEntry(entryType, "link")));
 }
 }
}

10 changes: 10 additions & 0 deletions
src/libraries/System.Formats.Tar/tests/TarWriter/TarWriter.WriteEntryAsync.Entry.V7.Tests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -93,5 +93,15 @@ public async Task WriteDirectory_Async()
 VerifyDirectory(directory);
 }
 }

 [Theory]
 [InlineData(TarEntryType.HardLink)]
 [InlineData(TarEntryType.SymbolicLink)]
 public async Task Write_LinkEntry_EmptyLinkName_Throws_Async(TarEntryType entryType)
 {
 await using MemoryStream archiveStream = new MemoryStream();
 await using TarWriter writer = new TarWriter(archiveStream, leaveOpen: false);
 await Assert.ThrowsAsync<ArgumentException>("entry", () => writer.WriteEntryAsync(new V7TarEntry(entryType, "link")));
 }
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
[release/7.0] Disallow TarWriter from writing link entries without LinkName set#74939

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

Sep 2, 2022
 Merged


[release/7.0] Disallow TarWriter from writing link entries without LinkName set
#74939
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
faf448f

Disallow TarWriter from writing link entries without LinkName set


carlossanlop Aug 31, 2022
e0cffca

Tests


carlossanlop Aug 31, 2022
c4252b3

Docs


carlossanlop Aug 31, 2022
45e35f5

Apply suggestions from code review


carlossanlop Aug 31, 2022
a1eec88

Apply suggestions from code review


jozkee Sep 1, 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


3 changes: 3 additions & 0 deletions
src/libraries/System.Formats.Tar/src/System/Formats/Tar/TarHeader.Write.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -391,6 +391,9 @@ private int WritePosixName(Span<byte> buffer)
 // Writes all the common fields shared by all formats into the specified spans.
 private int WriteCommonFields(Span<byte> buffer, long actualLength, TarEntryType actualEntryType)
 {
 // Don't write an empty LinkName if the entry is a hardlink or symlink
 Debug.Assert(!string.IsNullOrEmpty(_linkName) ^ (_typeFlag is not TarEntryType.SymbolicLink and not TarEntryType.HardLink));

 int checksum = 0;

 if (_mode > 0)
Expand Down

15 changes: 15 additions & 0 deletions
src/libraries/System.Formats.Tar/src/System/Formats/Tar/TarWriter.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -209,13 +209,15 @@ private async Task ReadFileFromDiskAndWriteToArchiveStreamAsEntryAsync(string fu
 /// </item>
 /// </list>
 /// </remarks>
 /// <exception cref="ArgumentException">The entry type is <see cref="TarEntryType.HardLink"/> or <see cref="TarEntryType.SymbolicLink"/> and the <see cref="TarEntry.LinkName"/> is <see langword="null"/> or empty.</exception>
 /// <exception cref="ObjectDisposedException">The archive stream is disposed.</exception>
 /// <exception cref="InvalidOperationException">The entry type of the <paramref name="entry"/> is not supported for writing.</exception>
 /// <exception cref="IOException">An I/O problem occurred.</exception>
 public void WriteEntry(TarEntry entry)
 {
 ObjectDisposedException.ThrowIf(_isDisposed, this);
 ArgumentNullException.ThrowIfNull(entry);
 ValidateEntryLinkName(entry._header._typeFlag, entry._header._linkName);
 WriteEntryInternal(entry);
 }

Expand DownExpand Up@@ -250,6 +252,7 @@ public void WriteEntry(TarEntry entry)
 /// </item>
 /// </list>
 /// </remarks>
 /// <exception cref="ArgumentException">The entry type is <see cref="TarEntryType.HardLink"/> or <see cref="TarEntryType.SymbolicLink"/> and the <see cref="TarEntry.LinkName"/> is <see langword="null"/> or empty.</exception>
 /// <exception cref="ObjectDisposedException">The archive stream is disposed.</exception>
 /// <exception cref="InvalidOperationException">The entry type of the <paramref name="entry"/> is not supported for writing.</exception>
 /// <exception cref="IOException">An I/O problem occurred.</exception>
Expand All@@ -262,6 +265,7 @@ public Task WriteEntryAsync(TarEntry entry, CancellationToken cancellationToken

 ObjectDisposedException.ThrowIf(_isDisposed, this);
 ArgumentNullException.ThrowIfNull(entry);
 ValidateEntryLinkName(entry._header._typeFlag, entry._header._linkName);
 return WriteEntryAsyncInternal(entry, cancellationToken);
 }

Expand DownExpand Up@@ -365,5 +369,16 @@ private async ValueTask WriteFinalRecordsAsync()

 return (fullPath, actualEntryName);
 }

 private static void ValidateEntryLinkName(TarEntryType entryType, string? linkName)
 {
 if (entryType is TarEntryType.HardLink or TarEntryType.SymbolicLink)
 {
 if (string.IsNullOrEmpty(linkName))
 {
 throw new ArgumentException(SR.TarEntryHardLinkOrSymlinkLinkNameEmpty, "entry");
 }
 }
 }
 }
}

14 changes: 14 additions & 0 deletions
src/libraries/System.Formats.Tar/tests/TarWriter/TarWriter.WriteEntry.Entry.Gnu.Tests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -167,6 +167,10 @@ public void Write_Long_Name(TarEntryType entryType)
 using (TarWriter writer = new TarWriter(archiveStream, TarEntryFormat.Gnu, leaveOpen: true))
 {
 GnuTarEntry entry = new GnuTarEntry(entryType, longName);
 if (entryType is TarEntryType.HardLink or TarEntryType.SymbolicLink)
 {
 entry.LinkName = "linktarget";
 }
 writer.WriteEntry(entry);
 }

Expand DownExpand Up@@ -231,5 +235,15 @@ public void Write_LongName_And_LongLinkName(TarEntryType entryType)
 Assert.Equal(longLinkName, entry.LinkName);
 }
 }

 [Theory]
 [InlineData(TarEntryType.HardLink)]
 [InlineData(TarEntryType.SymbolicLink)]
 public void Write_LinkEntry_EmptyLinkName_Throws(TarEntryType entryType)
 {
 using MemoryStream archiveStream = new MemoryStream();
 using TarWriter writer = new TarWriter(archiveStream, leaveOpen: false);
 Assert.Throws<ArgumentException>("entry", () => writer.WriteEntry(new GnuTarEntry(entryType, "link")));
 }
 }
}

10 changes: 10 additions & 0 deletions
src/libraries/System.Formats.Tar/tests/TarWriter/TarWriter.WriteEntry.Entry.Pax.Tests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -485,5 +485,15 @@ public void WriteTimestampsBeyondOctalLimitInPax()
 Assert.Equal(overLimitTimestamp, actualCTime);
 }
 }

 [Theory]
 [InlineData(TarEntryType.HardLink)]
 [InlineData(TarEntryType.SymbolicLink)]
 public void Write_LinkEntry_EmptyLinkName_Throws(TarEntryType entryType)
 {
 using MemoryStream archiveStream = new MemoryStream();
 using TarWriter writer = new TarWriter(archiveStream, leaveOpen: false);
 Assert.Throws<ArgumentException>("entry", () => writer.WriteEntry(new PaxTarEntry(entryType, "link")));
 }
 }
}

10 changes: 10 additions & 0 deletions
src/libraries/System.Formats.Tar/tests/TarWriter/TarWriter.WriteEntry.Entry.Ustar.Tests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -152,5 +152,15 @@ public void WriteFifo()
 VerifyFifo(fifo);
 }
 }

 [Theory]
 [InlineData(TarEntryType.HardLink)]
 [InlineData(TarEntryType.SymbolicLink)]
 public void Write_LinkEntry_EmptyLinkName_Throws(TarEntryType entryType)
 {
 using MemoryStream archiveStream = new MemoryStream();
 using TarWriter writer = new TarWriter(archiveStream, leaveOpen: false);
 Assert.Throws<ArgumentException>("entry", () => writer.WriteEntry(new UstarTarEntry(entryType, "link")));
 }
 }
}

10 changes: 10 additions & 0 deletions
src/libraries/System.Formats.Tar/tests/TarWriter/TarWriter.WriteEntry.Entry.V7.Tests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -92,5 +92,15 @@ public void WriteDirectory()
 VerifyDirectory(directory);
 }
 }

 [Theory]
 [InlineData(TarEntryType.HardLink)]
 [InlineData(TarEntryType.SymbolicLink)]
 public void Write_LinkEntry_EmptyLinkName_Throws(TarEntryType entryType)
 {
 using MemoryStream archiveStream = new MemoryStream();
 using TarWriter writer = new TarWriter(archiveStream, leaveOpen: false);
 Assert.Throws<ArgumentException>("entry", () => writer.WriteEntry(new V7TarEntry(entryType, "link")));
 }
 }
}

14 changes: 14 additions & 0 deletions
...libraries/System.Formats.Tar/tests/TarWriter/TarWriter.WriteEntryAsync.Entry.Gnu.Tests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -183,6 +183,10 @@ public async Task Write_Long_Name_Async(TarEntryType entryType)
 await using (TarWriter writer = new TarWriter(archiveStream, TarEntryFormat.Gnu, leaveOpen: true))
 {
 GnuTarEntry entry = new GnuTarEntry(entryType, longName);
 if (entryType is TarEntryType.HardLink or TarEntryType.SymbolicLink)
 {
 entry.LinkName = "linktarget";
 }
 await writer.WriteEntryAsync(entry);
 }

Expand DownExpand Up@@ -252,5 +256,15 @@ public async Task Write_LongName_And_LongLinkName_Async(TarEntryType entryType)
 }
 }
 }

 [Theory]
 [InlineData(TarEntryType.HardLink)]
 [InlineData(TarEntryType.SymbolicLink)]
 public async Task Write_LinkEntry_EmptyLinkName_Throws_Async(TarEntryType entryType)
 {
 await using MemoryStream archiveStream = new MemoryStream();
 await using TarWriter writer = new TarWriter(archiveStream, leaveOpen: false);
 await Assert.ThrowsAsync<ArgumentException>("entry", () => writer.WriteEntryAsync(new GnuTarEntry(entryType, "link")));
 }
 }
}

10 changes: 10 additions & 0 deletions
...libraries/System.Formats.Tar/tests/TarWriter/TarWriter.WriteEntryAsync.Entry.Pax.Tests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -505,5 +505,15 @@ public async Task WriteTimestampsBeyondOctalLimitInPax_Async()
 Assert.Equal(overLimitTimestamp, actualCTime);
 }
 }

 [Theory]
 [InlineData(TarEntryType.HardLink)]
 [InlineData(TarEntryType.SymbolicLink)]
 public async Task Write_LinkEntry_EmptyLinkName_Throws_Async(TarEntryType entryType)
 {
 await using MemoryStream archiveStream = new MemoryStream();
 await using TarWriter writer = new TarWriter(archiveStream, leaveOpen: false);
 await Assert.ThrowsAsync<ArgumentException>("entry", () => writer.WriteEntryAsync(new PaxTarEntry(entryType, "link")));
 }
 }
}

10 changes: 10 additions & 0 deletions
...braries/System.Formats.Tar/tests/TarWriter/TarWriter.WriteEntryAsync.Entry.Ustar.Tests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -153,5 +153,15 @@ public async Task WriteFifo_Async()
 VerifyFifo(fifo);
 }
 }

 [Theory]
 [InlineData(TarEntryType.HardLink)]
 [InlineData(TarEntryType.SymbolicLink)]
 public async Task Write_LinkEntry_EmptyLinkName_Throws_Async(TarEntryType entryType)
 {
 await using MemoryStream archiveStream = new MemoryStream();
 await using TarWriter writer = new TarWriter(archiveStream, leaveOpen: false);
 await Assert.ThrowsAsync<ArgumentException>("entry", () => writer.WriteEntryAsync(new UstarTarEntry(entryType, "link")));
 }
 }
}

10 changes: 10 additions & 0 deletions
src/libraries/System.Formats.Tar/tests/TarWriter/TarWriter.WriteEntryAsync.Entry.V7.Tests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -93,5 +93,15 @@ public async Task WriteDirectory_Async()
 VerifyDirectory(directory);
 }
 }

 [Theory]
 [InlineData(TarEntryType.HardLink)]
 [InlineData(TarEntryType.SymbolicLink)]
 public async Task Write_LinkEntry_EmptyLinkName_Throws_Async(TarEntryType entryType)
 {
 await using MemoryStream archiveStream = new MemoryStream();
 await using TarWriter writer = new TarWriter(archiveStream, leaveOpen: false);
 await Assert.ThrowsAsync<ArgumentException>("entry", () => writer.WriteEntryAsync(new V7TarEntry(entryType, "link")));
 }
 }
}