Skip to content

fix GetContentDispositionFileName can not correctly handle RFC 6266 specific filename* param #1013

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ttys3 wants to merge 1 commit into
base: feature/latest-dev
Choose a base branch
from
Open

fix GetContentDispositionFileName can not correctly handle RFC 6266 specific filename* param #1013

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
34 changes: 19 additions & 15 deletions app/XDM/XDM.Core/Clients/Http/WebRequestExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ namespace XDM.Core.Clients.Http
{
public static class WebRequestExtensions
{
private static readonly char[] QuoteChars = new char[] { '"' };
public static void EnsureSuccessStatusCode(this HttpWebResponse response)
{
if (response.StatusCode != HttpStatusCode.OK && response.StatusCode != HttpStatusCode.PartialContent)
Expand Down Expand Up @@ -92,28 +93,31 @@ public static long ContentLengthFromContentRange(string? contentRange)

public static string? GetContentDispositionFileName(string contentDisposition)
{
//var contentDisposition = response.Headers.Get("Content-Disposition");
if (string.IsNullOrEmpty(contentDisposition))
{
return null;
}

Log.Debug("Trying to get filename from: " + contentDisposition);
try
{
var r1 = new Regex(@"\s*filename\*\s*=\s*[^']*\'\s*\'(.*)");
var r2 = new Regex("\\s*filename\\s*=\\s*\"([^\"]*)\"");
var r3 = new Regex("filename\\s*=\\s*([^\"]+)");
var headerValue = System.Net.Http.Headers.ContentDispositionHeaderValue.Parse(contentDisposition);

//var contentDisposition = response.Headers.Get("Content-Disposition");
if (contentDisposition != null)
if (headerValue.FileNameStar != null)
{
Log.Debug("Trying to get filename from: " + contentDisposition);
foreach (var r in new Regex[] { r1, r2, r3 })
{
var m = r.Match(contentDisposition);
if (m.Success && m.Groups.Count >= 2)
{
return FileHelper.SanitizeFileName(Uri.UnescapeDataString(m.Groups[1].Value));
}
}
return FileHelper.SanitizeFileName(Uri.UnescapeDataString(headerValue.FileNameStar));
}
else if (headerValue.FileName != null)
{
// https://github.com/dotnet/runtime/issues/32765#issuecomment-766768351
// response.Content.Headers.ContentDisposition.FileName contains quotes #32765
return FileHelper.SanitizeFileName(headerValue.FileName.Trim(QuoteChars));
}
}
catch (Exception ex)
catch (FormatException ex)
{
// Invalid Content-Disposition header format
Log.Debug(ex, ex.Message);
}

Expand Down