Changeset 277881 in webkit

Timestamp:

May 21, 2021, 1:20:07 PM (5 years ago)

Author:

Chris Dumez

Message:

[Cocoa] Unable to upload files that are stored in the cloud (without a local copy)
​https://bugs.webkit.org/show_bug.cgi?id=226090
<rdar://77775887>

Reviewed by Darin Adler.

Source/WebKit:

Allow the network process to load / read dataless files stored in the cloud by allowing
the process to materialize such files. I initially only allowed the AsyncFileStream
thread to materialize the dataless files and this was enough to make the file upload
use cases work. However, I noticed that drag and dropping such file in the Safari URL
bar would fail loading, which I think is bad user experience. As a result, I have
decided to allow the materializing at network process level.

I have verified manually that I can now upload such dataless files via either file
picker or drag and drop (used ​https://blueimp.github.io/jQuery-File-Upload/). I have
also verified that drag and dropping such a file in the Safari URL bar successfuly
loads that file.

• NetworkProcess/cocoa/NetworkProcessCocoa.mm:

(WebKit::NetworkProcess::platformInitializeNetworkProcessCocoa):

Source/WTF:

Add FileSystem API to allow/disallow the materializing of dataless files stored
in the cloud, at process or thread level.

• wtf/FileSystem.h:
• wtf/cocoa/FileSystemCocoa.mm:

(WTF::FileSystemImpl::toIOPolicyScope):
(WTF::FileSystemImpl::setAllowsMaterializingDatalessFiles):
(WTF::FileSystemImpl::allowsMaterializingDatalessFiles):

Location:

trunk/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/FileSystem.h (modified) (1 diff)
• WTF/wtf/cocoa/FileSystemCocoa.mm (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm (modified) (2 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2021-05-21  Chris Dumez  <cdumez@apple.com>
+
+        [Cocoa] Unable to upload files that are stored in the cloud (without a local copy)
+        https://bugs.webkit.org/show_bug.cgi?id=226090
+        <rdar://77775887>
+
+        Reviewed by Darin Adler.
+
+        Add FileSystem API to allow/disallow the materializing of dataless files stored
+        in the cloud, at process or thread level.
+
+        * wtf/FileSystem.h:
+        * wtf/cocoa/FileSystemCocoa.mm:
+        (WTF::FileSystemImpl::toIOPolicyScope):
+        (WTF::FileSystemImpl::setAllowsMaterializingDatalessFiles):
+        (WTF::FileSystemImpl::allowsMaterializingDatalessFiles):
+
 2021-05-21  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WTF/wtf/FileSystem.h

@@ -197 +197 @@
 #if PLATFORM(COCOA)
 WTF_EXPORT_PRIVATE NSString *createTemporaryDirectory(NSString *directoryPrefix);
+
+// Allow reading cloud files with no local copy.
+enum class PolicyScope : uint8_t { Process, Thread };
+WTF_EXPORT_PRIVATE bool setAllowsMaterializingDatalessFiles(bool, PolicyScope);
+WTF_EXPORT_PRIVATE Optional<bool> allowsMaterializingDatalessFiles(PolicyScope);
 #endif
 

trunk/Source/WTF/wtf/cocoa/FileSystemCocoa.mm

@@ -151 +151 @@
 }
 
+static int toIOPolicyScope(PolicyScope scope)
+{
+    switch (scope) {
+    case PolicyScope::Process:
+        return IOPOL_SCOPE_PROCESS;
+    case PolicyScope::Thread:
+        return IOPOL_SCOPE_THREAD;
+    }
+}
+
+bool setAllowsMaterializingDatalessFiles(bool allow, PolicyScope scope)
+{
+    if (setiopolicy_np(IOPOL_TYPE_VFS_MATERIALIZE_DATALESS_FILES, toIOPolicyScope(scope), allow ? IOPOL_MATERIALIZE_DATALESS_FILES_ON : IOPOL_MATERIALIZE_DATALESS_FILES_OFF) == -1) {
+        LOG_ERROR("FileSystem::setAllowsMaterializingDatalessFiles(%d): setiopolicy_np call failed, errno: %d", allow, errno);
+        return false;
+    }
+    return true;
+}
+
+Optional<bool> allowsMaterializingDatalessFiles(PolicyScope scope)
+{
+    int ret = getiopolicy_np(IOPOL_TYPE_VFS_MATERIALIZE_DATALESS_FILES, toIOPolicyScope(scope));
+    if (ret == IOPOL_MATERIALIZE_DATALESS_FILES_ON)
+        return true;
+    if (ret == IOPOL_MATERIALIZE_DATALESS_FILES_OFF)
+        return false;
+    LOG_ERROR("FileSystem::allowsMaterializingDatalessFiles(): getiopolicy_np call failed, errno: %d", errno);
+    return WTF::nullopt;
+}
+
 #if PLATFORM(IOS_FAMILY)
 bool isSafeToUseMemoryMapForPath(const String& path)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-05-21  Chris Dumez  <cdumez@apple.com>
+
+        [Cocoa] Unable to upload files that are stored in the cloud (without a local copy)
+        https://bugs.webkit.org/show_bug.cgi?id=226090
+        <rdar://77775887>
+
+        Reviewed by Darin Adler.
+
+        Allow the network process to load / read dataless files stored in the cloud by allowing
+        the process to materialize such files. I initially only allowed the AsyncFileStream
+        thread to materialize the dataless files and this was enough to make the file upload
+        use cases work. However, I noticed that drag and dropping such file in the Safari URL
+        bar would fail loading, which I think is bad user experience. As a result, I have
+        decided to allow the materializing at network process level.
+
+        I have verified manually that I can now upload such dataless files via either file
+        picker or drag and drop (used https://blueimp.github.io/jQuery-File-Upload/). I have
+        also verified that drag and dropping such a file in the Safari URL bar successfuly
+        loads that file.
+
+        * NetworkProcess/cocoa/NetworkProcessCocoa.mm:
+        (WebKit::NetworkProcess::platformInitializeNetworkProcessCocoa):
+
 2021-05-21  Brent Fulgham  <bfulgham@apple.com>
 

trunk/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm

@@ -46 +46 @@
 #import <wtf/BlockPtr.h>
 #import <wtf/CallbackAggregator.h>
+#import <wtf/FileSystem.h>
 #import <wtf/ProcessPrivilege.h>
 #import <wtf/RetainPtr.h>
@@ -90 +91 @@
     setSharedHTTPCookieStorage(parameters.uiProcessCookieStorageIdentifier);
 #endif
+
+    // Allow the network process to materialize files stored in the cloud so that loading/reading such files actually succeeds.
+    FileSystem::setAllowsMaterializingDatalessFiles(true, FileSystem::PolicyScope::Process);
 
     // FIXME: Most of what this function does for cache size gets immediately overridden by setCacheModel().