Changeset 291057 in webkit

Timestamp:

Mar 9, 2022 11:43:46 AM (4 months ago)

Author:

sihui_liu@apple.com

Message:

File System Access: disallows names that are not permitted by underlying file system
​https://bugs.webkit.org/show_bug.cgi?id=237635
rdar://89291566

We use FileSystem::fileSystemRepresentation to convert input name to a name that is permitted in current file
system. This patch makes File System Access API to throw error if the input name does not match the converted
name.

Reviewed by Youenn Fablet.

• NetworkProcess/storage/FileSystemStorageHandle.cpp:

(WebKit::isValidFileName):
(WebKit::FileSystemStorageHandle::requestCreateHandle):
(WebKit::FileSystemStorageHandle::removeEntry):
(WebKit::FileSystemStorageHandle::move):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/storage/FileSystemStorageHandle.cpp (modified) (4 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2022-03-09  Sihui Liu  <sihui_liu@apple.com>
+
+        File System Access: disallows names that are not permitted by underlying file system
+        https://bugs.webkit.org/show_bug.cgi?id=237635
+        rdar://89291566
+
+        We use FileSystem::fileSystemRepresentation to convert input name to a name that is permitted in current file 
+        system. This patch makes File System Access API to throw error if the input name does not match the converted 
+        name. 
+
+        Reviewed by Youenn Fablet.
+
+        * NetworkProcess/storage/FileSystemStorageHandle.cpp:
+        (WebKit::isValidFileName):
+        (WebKit::FileSystemStorageHandle::requestCreateHandle):
+        (WebKit::FileSystemStorageHandle::removeEntry):
+        (WebKit::FileSystemStorageHandle::move):
+
 2022-03-09  Jon Lee  <jonlee@apple.com>
 

trunk/Source/WebKit/NetworkProcess/storage/FileSystemStorageHandle.cpp

@@ -92 +92 @@
 }
 
-static bool isValidFileName(const String& name)
-{
-    return !name.isEmpty() && name != "." && name != ".." && !name.contains(pathSeparator);
+static bool isValidFileName(const String& directory, const String& name)
+{
+    // https://wicg.github.io/file-system-access/#valid-file-name
+    if (name.isEmpty() || (name == ".") || (name == "..") || name.contains(pathSeparator))
+        return false;
+
+    return FileSystem::pathFileName(FileSystem::pathByAppendingComponent(directory, name)) == name;
 }
 
@@ -105 +109 @@
         return makeUnexpected(FileSystemStorageError::Unknown);
 
-    // https://wicg.github.io/file-system-access/#valid-file-name
-    if (!isValidFileName(name))
+    if (!isValidFileName(m_path, name))
         return makeUnexpected(FileSystemStorageError::InvalidName);
 
@@ -128 +131 @@
         return FileSystemStorageError::TypeMismatch;
 
-    if (!isValidFileName(name))
+    if (!isValidFileName(m_path, name))
         return FileSystemStorageError::InvalidName;
 
@@ -249 +252 @@
         return FileSystemStorageError::Unknown;
 
-    if (!isValidFileName(newName))
+    if (!isValidFileName(path, newName))
         return FileSystemStorageError::InvalidName;