Web Automation: consider file extensions in the "accept" attribute when deciding...

https://bugs.webkit.org/show_bug.cgi?id=175081

Reviewed by Joseph Pecoraro.

* UIProcess/Automation/WebAutomationSession.cpp:
(WebKit::fileCanBeAcceptedForUpload):
(WebKit::WebAutomationSession::handleRunOpenPanel):
In cases where a file has an extension, try to match it against the
accepted extensions list. Give up if there's no extension. Otherwise,
proceed as normal to infer a MIME type based on the extension.
In cases where extension-less files are inside hidden folders, the MIME
inference will fail as well.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@220222 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
index abefbf80ccb221cc7aeaf6e57200caf7f5bb2db6..12669e172f6355996e341a77b814b8cdebdf3e61 100644 (file)
--- a/Source/WebKit/ChangeLog
+++ b/Source/WebKit/ChangeLog
@@ -1,3 +1,19 @@
+2017-08-02  Brian Burg  <bburg@apple.com>
+
+        Web Automation: consider file extensions in the "accept" attribute when deciding if a file can be uploaded
+        https://bugs.webkit.org/show_bug.cgi?id=175081
+
+        Reviewed by Joseph Pecoraro.
+
+        * UIProcess/Automation/WebAutomationSession.cpp:
+        (WebKit::fileCanBeAcceptedForUpload):
+        (WebKit::WebAutomationSession::handleRunOpenPanel):
+        In cases where a file has an extension, try to match it against the
+        accepted extensions list. Give up if there's no extension. Otherwise,
+        proceed as normal to infer a MIME type based on the extension.
+        In cases where extension-less files are inside hidden folders, the MIME
+        inference will fail as well.
+
 2017-08-03  Brady Eidson  <beidson@apple.com>
 
         Add SW IDLs and stub out basic functionality.

diff --git a/Source/WebKit/UIProcess/Automation/WebAutomationSession.cpp b/Source/WebKit/UIProcess/Automation/WebAutomationSession.cpp
index 9b9720521e0acbf8408f0c581b3ded8f4639f0be..9f0161ba7354a45fc44947740d9157ea7cea7912 100644 (file)
--- a/Source/WebKit/UIProcess/Automation/WebAutomationSession.cpp
+++ b/Source/WebKit/UIProcess/Automation/WebAutomationSession.cpp
@@ -528,16 +528,23 @@ void WebAutomationSession::willClosePage(const WebPageProxy& page)
     m_domainNotifier->browsingContextCleared(handle);
 }
 
-static bool fileCanBeAcceptedForUpload(const String& filename, const HashSet<String>& allowedMIMETypes) {
+static bool fileCanBeAcceptedForUpload(const String& filename, const HashSet<String>& allowedMIMETypes, const HashSet<String>& allowedFileExtensions)
+{
     if (!WebCore::fileExists(filename))
         return false;
 
-    if (allowedMIMETypes.isEmpty())
+    if (allowedMIMETypes.isEmpty() && allowedFileExtensions.isEmpty())
+        return true;
+
+    // We can't infer a MIME type from a file without an extension, just give up.
+    auto dotOffset = filename.reverseFind('.');
+    if (dotOffset == notFound)
+        return false;
+
+    String extension = filename.substring(dotOffset + 1);
+    if (allowedFileExtensions.contains(extension))
         return true;
 
-    // Validate filenames against allowed MIME types before choosing them.
-    // FIXME: validate against allowed file extensions when <https://webkit.org/b/95698> is fixed.
-    String extension = filename.substring(filename.reverseFind('.') + 1);
     String mappedMIMEType = WebCore::MIMETypeRegistry::getMIMETypeForExtension(extension);
     if (allowedMIMETypes.contains(mappedMIMEType))
         return true;
@@ -573,10 +580,14 @@ void WebAutomationSession::handleRunOpenPanel(const WebPageProxy& page, const We
     for (auto type : parameters.acceptMIMETypes()->elementsOfType<API::String>())
         allowedMIMETypes.add(type->string());
 
+    HashSet<String> allowedFileExtensions;
+    for (auto type : parameters.acceptFileExtensions()->elementsOfType<API::String>())
+        allowedFileExtensions.add(type->string());
+
     // Per §14.3.10.5 in the W3C spec, if at least one file cannot be accepted, the command should fail.
     // The REST API service can tell that this failed by checking the "files" attribute of the input element.
     for (const String& filename : m_filesToSelectForFileUpload) {
-        if (!fileCanBeAcceptedForUpload(filename, allowedMIMETypes)) {
+        if (!fileCanBeAcceptedForUpload(filename, allowedMIMETypes, allowedFileExtensions)) {
             resultListener.cancel();
             m_domainNotifier->fileChooserDismissed(m_activeBrowsingContextHandle, true);
             return;