Changeset 264154 in webkit

Timestamp:

Jul 9, 2020, 12:01:16 AM (6 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r258741 - Sanitize suggested download filename received from web process
​https://bugs.webkit.org/show_bug.cgi?id=209300
<rdar://problem/59487723>

Patch by Alex Christensen <​achristensen@webkit.org> on 2020-03-19
Reviewed by Chris Dumez.

Source/WebKit:

• UIProcess/Downloads/DownloadProxy.cpp:

(WebKit::DownloadProxy::decideDestinationWithSuggestedFilenameAsync):

LayoutTests:

• fast/dom/HTMLAnchorElement/anchor-file-blob-download-includes-backslash-expected.txt:
• fast/dom/HTMLAnchorElement/anchor-file-blob-download-includes-backslash.html:

Location:

releases/WebKitGTK/webkit-2.28

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/HTMLAnchorElement/anchor-file-blob-download-includes-backslash-expected.txt (modified) (1 diff)
• LayoutTests/fast/dom/HTMLAnchorElement/anchor-file-blob-download-includes-backslash.html (modified) (1 diff)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/UIProcess/Downloads/DownloadProxy.cpp (modified) (2 diffs)

releases/WebKitGTK/webkit-2.28/LayoutTests/ChangeLog

@@ +1 @@
+2020-03-19  Alex Christensen  <achristensen@webkit.org>
+
+        Sanitize suggested download filename received from web process
+        https://bugs.webkit.org/show_bug.cgi?id=209300
+        <rdar://problem/59487723>
+
+        Reviewed by Chris Dumez.
+
+        * fast/dom/HTMLAnchorElement/anchor-file-blob-download-includes-backslash-expected.txt:
+        * fast/dom/HTMLAnchorElement/anchor-file-blob-download-includes-backslash.html:
+
 2020-03-27  Simon Fraser  <simon.fraser@apple.com>
 

releases/WebKitGTK/webkit-2.28/LayoutTests/fast/dom/HTMLAnchorElement/anchor-file-blob-download-includes-backslash-expected.txt

@@ -1 +1 @@
 Download started.
-Downloading URL with suggested filename "*\.png"
+Downloading URL with suggested filename "*.png"
 Download completed.
-The suggested filename above should be "*\.png" and the download should succeed.
+The suggested filename above should be "*.png" and the download should succeed.
 
 File backed blob URL

releases/WebKitGTK/webkit-2.28/LayoutTests/fast/dom/HTMLAnchorElement/anchor-file-blob-download-includes-backslash.html

@@ -13 +13 @@
 </head>
 <body>
-<p>The suggested filename above should be "*\.png" and the download should succeed.</p>
+<p>The suggested filename above should be "*.png" and the download should succeed.</p>
 <a id="blob-url" download="*\">File backed blob URL</a>
 <script>

releases/WebKitGTK/webkit-2.28/Source/WebKit/ChangeLog

@@ +1 @@
+2020-03-19  Alex Christensen  <achristensen@webkit.org>
+
+        Sanitize suggested download filename received from web process
+        https://bugs.webkit.org/show_bug.cgi?id=209300
+        <rdar://problem/59487723>
+
+        Reviewed by Chris Dumez.
+
+        * UIProcess/Downloads/DownloadProxy.cpp:
+        (WebKit::DownloadProxy::decideDestinationWithSuggestedFilenameAsync):
+
 2020-07-03  Michael Catanzaro  <mcatanzaro@gnome.org>
 

releases/WebKitGTK/webkit-2.28/Source/WebKit/UIProcess/Downloads/DownloadProxy.cpp

@@ -39 +39 @@
 #include "WebProtectionSpace.h"
 #include <WebCore/MIMETypeRegistry.h>
+#include <WebCore/ResourceResponseBase.h>
 #include <wtf/FileSystem.h>
 #include <wtf/text/CString.h>
@@ -185 +186 @@
         return;
     
-    m_processPool->downloadClient().decideDestinationWithSuggestedFilename(*this, suggestedFilename, [this, protectedThis = makeRef(*this), downloadID = downloadID] (AllowOverwrite allowOverwrite, String destination) {
+    m_processPool->downloadClient().decideDestinationWithSuggestedFilename(*this, ResourceResponseBase::sanitizeSuggestedFilename(suggestedFilename), [this, protectedThis = makeRef(*this), downloadID = downloadID] (AllowOverwrite allowOverwrite, String destination) {
         SandboxExtension::Handle sandboxExtensionHandle;
         if (!destination.isNull())