fix handling of apostrophes in content-disposition (yuck)

Gargaj · Oct 8, 2023 · 047bd2a · 047bd2a
1 parent 0ba19c4
commit 047bd2a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Source/Dialogs/DownloadDialog.cs b/Source/Dialogs/DownloadDialog.cs
@@ -95,11 +95,11 @@ private async Task<string> DownloadFile(string url, string targetPath)
           }
           if (response.Headers["Content-Disposition"] != null)
           {
-            var regex = new System.Text.RegularExpressions.Regex("filename=['\"]?([^'\";]*)", System.Text.RegularExpressions.RegexOptions.IgnoreCase);
+            var regex = new System.Text.RegularExpressions.Regex("filename=([^;]*)", System.Text.RegularExpressions.RegexOptions.IgnoreCase);
             var match = regex.Match(response.Headers["Content-Disposition"]);
             if (match != null && match.Groups.Count == 2)
             {
-              filename = match.Groups[1].Value;
+              filename = match.Groups[1].Value.Trim('\'', '"');
             }
           }
           if (response.ContentLength > 0)