Skip to content

[HTTP] Fix Content-Disposition name property getters #114771

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
ManickaP merged 1 commit into from
Apr 17, 2025
Merged

[HTTP] Fix Content-Disposition name property getters #114771

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -646,7 +646,7 @@ await LoopbackServer.CreateClientAndServerAsync(async uri =>
Assert.Contains("close", resp.Headers.Connection);
Assert.True(resp.Headers.ConnectionClose.GetValueOrDefault());
Assert.Equal("attachment", resp.Content.Headers.ContentDisposition.DispositionType);
Assert.Equal("\"fname.ext\"", resp.Content.Headers.ContentDisposition.FileName);
Assert.Equal("fname.ext", resp.Content.Headers.ContentDisposition.FileName);
Assert.Contains("gzip", resp.Content.Headers.ContentEncoding);
Assert.Contains("da", resp.Content.Headers.ContentLanguage);
Assert.Equal(new Uri("/index.htm", UriKind.Relative), resp.Content.Headers.ContentLocation);
Expand Down
5 changes: 2 additions & 3 deletions src/libraries/System.Net.Http/src/System/Net/Http/Headers/ContentDispositionHeaderValue.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,8 +188,7 @@ object ICloneable.Clone()
public static ContentDispositionHeaderValue Parse(string input)
{
int index = 0;
return (ContentDispositionHeaderValue)GenericHeaderParser.ContentDispositionParser.ParseValue(input,
null, ref index);
return (ContentDispositionHeaderValue)GenericHeaderParser.ContentDispositionParser.ParseValue(input, null, ref index);
}

public static bool TryParse([NotNullWhen(true)] string? input, [NotNullWhen(true)] out ContentDispositionHeaderValue? parsedValue)
Expand Down Expand Up @@ -349,7 +348,7 @@ private void SetDate(string parameter, DateTimeOffset? date)
return result;
}
// May not have been encoded.
return nameParameter.Value;
return IsQuoted(nameParameter.Value) ? nameParameter.Value!.Substring(1, nameParameter.Value.Length - 2) : nameParameter.Value;
}
return null;
}
Expand Down
50 changes: 25 additions & 25 deletions src/libraries/System.Net.Http/tests/UnitTests/Headers/ContentDispositionHeaderValueTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ public void FileName_UnknownOrBadEncoding_PropertyFails()
Assert.Equal(1, contentDisposition.Parameters.Count);
Assert.Equal("FILENAME", contentDisposition.Parameters.First().Name);
Assert.Equal("\"=?utf-99?Q?R=mlsZcODTmFtZS5iYXQ=?=\"", contentDisposition.Parameters.First().Value);
Assert.Equal("\"=?utf-99?Q?R=mlsZcODTmFtZS5iYXQ=?=\"", contentDisposition.FileName);
Assert.Equal("=?utf-99?Q?R=mlsZcODTmFtZS5iYXQ=?=", contentDisposition.FileName);

contentDisposition.FileName = "new_name";
Assert.Equal("new_name", contentDisposition.FileName);
Expand Down Expand Up @@ -677,23 +677,23 @@ public void ContentDispositionHeader_Valid2_Success()
{
ContentDispositionValue cd = ContentDispositionTestCases["valid2"];
ContentDispositionHeaderValue header = TryParse(cd);
ValidateHeaderValues(header, "inline", @"""foo.html""");
ValidateHeaderValues(header, "inline", @"foo.html");
}

[Fact]
public void ContentDispositionHeader_Valid3_Success()
{
ContentDispositionValue cd = ContentDispositionTestCases["valid3"];
ContentDispositionHeaderValue header = TryParse(cd);
ValidateHeaderValues(header, "inline", @"""Not an attachment!""");
ValidateHeaderValues(header, "inline", @"Not an attachment!");
}

[Fact]
public void ContentDispositionHeader_Valid4_Success()
{
ContentDispositionValue cd = ContentDispositionTestCases["valid4"];
ContentDispositionHeaderValue header = TryParse(cd);
ValidateHeaderValues(header, "inline", @"""foo.pdf""");
ValidateHeaderValues(header, "inline", @"foo.pdf");
}

[Fact]
Expand All @@ -717,39 +717,39 @@ public void ContentDispositionHeader_Valid7_Success()
{
ContentDispositionValue cd = ContentDispositionTestCases["valid7"];
ContentDispositionHeaderValue header = TryParse(cd);
ValidateHeaderValues(header, "attachment", @"""foo.html""");
ValidateHeaderValues(header, "attachment", @"foo.html");
}

[Fact]
public void ContentDispositionHeader_Valid8_Success()
{
ContentDispositionValue cd = ContentDispositionTestCases["valid8"];
ContentDispositionHeaderValue header = TryParse(cd);
ValidateHeaderValues(header, "attachment", @"""f\oo.html""");
ValidateHeaderValues(header, "attachment", @"f\oo.html");
}

[Fact]
public void ContentDispositionHeader_Valid9_Success()
{
ContentDispositionValue cd = ContentDispositionTestCases["valid9"];
ContentDispositionHeaderValue header = TryParse(cd);
ValidateHeaderValues(header, "attachment", @"""\""quoting\"" tested.html""");
ValidateHeaderValues(header, "attachment", @"\""quoting\"" tested.html");
}

[Fact]
public void ContentDispositionHeader_Valid10_Success()
{
ContentDispositionValue cd = ContentDispositionTestCases["valid10"];
ContentDispositionHeaderValue header = TryParse(cd);
ValidateHeaderValues(header, "attachment", @"""Here's a semicolon;.html""");
ValidateHeaderValues(header, "attachment", @"Here's a semicolon;.html");
}

[Fact]
public void ContentDispositionHeader_Valid11_Success()
{
ContentDispositionValue cd = ContentDispositionTestCases["valid11"];
ContentDispositionHeaderValue header = TryParse(cd);
ValidateHeaderValues(header, "attachment", @"""foo.html""");
ValidateHeaderValues(header, "attachment", @"foo.html");
ValidateExtensionParameter(header, "foo", @"""bar""");
}

Expand All @@ -758,7 +758,7 @@ public void ContentDispositionHeader_Valid12_Success()
{
ContentDispositionValue cd = ContentDispositionTestCases["valid12"];
ContentDispositionHeaderValue header = TryParse(cd);
ValidateHeaderValues(header, "attachment", @"""foo.html""");
ValidateHeaderValues(header, "attachment", @"foo.html");
ValidateExtensionParameter(header, "foo", @"""\""\\""");
}

Expand All @@ -767,7 +767,7 @@ public void ContentDispositionHeader_Valid13_Success()
{
ContentDispositionValue cd = ContentDispositionTestCases["valid13"];
ContentDispositionHeaderValue header = TryParse(cd);
ValidateHeaderValues(header, "attachment", @"""foo.html""");
ValidateHeaderValues(header, "attachment", @"foo.html");
}

[Fact]
Expand All @@ -791,39 +791,39 @@ public void ContentDispositionHeader_Valid16_Success()
{
ContentDispositionValue cd = ContentDispositionTestCases["valid16"];
ContentDispositionHeaderValue header = TryParse(cd);
ValidateHeaderValues(header, "attachment", @"""foo-\u00E4.html""");
ValidateHeaderValues(header, "attachment", @"foo-\u00E4.html");
}

[Fact]
public void ContentDispositionHeader_Valid17_Success()
{
ContentDispositionValue cd = ContentDispositionTestCases["valid17"];
ContentDispositionHeaderValue header = TryParse(cd);
ValidateHeaderValues(header, "attachment", @"""foo-ä.html""");
ValidateHeaderValues(header, "attachment", @"foo-ä.html");
}

[Fact]
public void ContentDispositionHeader_Valid18_Success()
{
ContentDispositionValue cd = ContentDispositionTestCases["valid18"];
ContentDispositionHeaderValue header = TryParse(cd);
ValidateHeaderValues(header, "attachment", @"""foo-%41.html""");
ValidateHeaderValues(header, "attachment", @"foo-%41.html");
}

[Fact]
public void ContentDispositionHeader_Valid19_Success()
{
ContentDispositionValue cd = ContentDispositionTestCases["valid19"];
ContentDispositionHeaderValue header = TryParse(cd);
ValidateHeaderValues(header, "attachment", @"""50%.html""");
ValidateHeaderValues(header, "attachment", @"50%.html");
}

[Fact]
public void ContentDispositionHeader_Valid20_Success()
{
ContentDispositionValue cd = ContentDispositionTestCases["valid20"];
ContentDispositionHeaderValue header = TryParse(cd);
ValidateHeaderValues(header, "attachment", @"""foo-%\41.html""");
ValidateHeaderValues(header, "attachment", @"foo-%\41.html");
}

[Fact]
Expand All @@ -840,23 +840,23 @@ public void ContentDispositionHeader_Valid22_Success()
{
ContentDispositionValue cd = ContentDispositionTestCases["valid22"];
ContentDispositionHeaderValue header = TryParse(cd);
ValidateHeaderValues(header, "attachment", @"""\u00E4-%41.html""");
ValidateHeaderValues(header, "attachment", @"\u00E4-%41.html");
}

[Fact]
public void ContentDispositionHeader_Valid23_Success()
{
ContentDispositionValue cd = ContentDispositionTestCases["valid23"];
ContentDispositionHeaderValue header = TryParse(cd);
ValidateHeaderValues(header, "attachment", @"""foo-%c3%a4-%e2%82%ac.html""");
ValidateHeaderValues(header, "attachment", @"foo-%c3%a4-%e2%82%ac.html");
}

[Fact]
public void ContentDispositionHeader_Valid24_Success()
{
ContentDispositionValue cd = ContentDispositionTestCases["valid24"];
ContentDispositionHeaderValue header = TryParse(cd);
ValidateHeaderValues(header, "attachment", @"""foo.html""");
ValidateHeaderValues(header, "attachment", @"foo.html");
}

[Fact]
Expand All @@ -873,15 +873,15 @@ public void ContentDispositionHeader_Valid26_Success()
{
ContentDispositionValue cd = ContentDispositionTestCases["valid26"];
ContentDispositionHeaderValue header = TryParse(cd);
ValidateHeaderValues(header, "attachment", @"""/foo.html""");
ValidateHeaderValues(header, "attachment", @"/foo.html");
}

[Fact]
public void ContentDispositionHeader_Valid27_Success()
{
ContentDispositionValue cd = ContentDispositionTestCases["valid27"];
ContentDispositionHeaderValue header = TryParse(cd);
ValidateHeaderValues(header, "attachment", @"""\\foo.html""");
ValidateHeaderValues(header, "attachment", @"\\foo.html");
}

[Fact]
Expand Down Expand Up @@ -1056,7 +1056,7 @@ public void ContentDispositionHeader_Valid46_Success()
{
ContentDispositionValue cd = ContentDispositionTestCases["valid46"];
ContentDispositionHeaderValue header = TryParse(cd);
ValidateHeaderValues(header, "attachment", @"""foo-ae.html""");
ValidateHeaderValues(header, "attachment", @"foo-ae.html");
ValidateExtensionParameter(header, "filename*", @"UTF-8''foo-%c3%a4.html");
}

Expand All @@ -1065,7 +1065,7 @@ public void ContentDispositionHeader_Valid47_Success()
{
ContentDispositionValue cd = ContentDispositionTestCases["valid47"];
ContentDispositionHeaderValue header = TryParse(cd);
ValidateHeaderValues(header, "attachment", @"""foo-ae.html""");
ValidateHeaderValues(header, "attachment", @"foo-ae.html");
ValidateExtensionParameter(header, "filename*", @"UTF-8''foo-%c3%a4.html");
}

Expand All @@ -1074,7 +1074,7 @@ public void ContentDispositionHeader_Valid48_Success()
{
ContentDispositionValue cd = ContentDispositionTestCases["valid48"];
ContentDispositionHeaderValue header = TryParse(cd);
ValidateHeaderValues(header, "attachment", @"""foo.html""");
ValidateHeaderValues(header, "attachment", @"foo.html");
ValidateExtensionParameter(header, "foobar", @"x");
}

Expand All @@ -1083,7 +1083,7 @@ public void ContentDispositionHeader_Valid49_Success()
{
ContentDispositionValue cd = ContentDispositionTestCases["valid49"];
ContentDispositionHeaderValue header = TryParse(cd);
ValidateHeaderValues(header, "attachment", @"""=?ISO-8859-1?Q?foo-=E4.html?=""");
ValidateHeaderValues(header, "attachment", @"=?ISO-8859-1?Q?foo-=E4.html?=");
}

#endregion
Expand Down