From 7be8fa0745bf7b42dc81b0e6f031d975a933f8ae Mon Sep 17 00:00:00 2001 From: Austin Sullivan Date: Wed, 18 Oct 2023 08:51:08 +0000 Subject: [PATCH] Bug 1830580 [wpt PR 39755] - FSA: Relax file name checks in the BucketFS, a=testonly Automatic update from web-platform-tests FSA: Relax file name checks in the BucketFS Unlike when saving files to the local file system, the names of files in the the Bucket File System (a.k.a. OPFS) are obfuscated before they end up on disk - if they even end up on disk at all. As such, we don't need to perform the same name sanitization and obfuscation for these files as we do for files that end up on the user-visible file system. See https://github.com/whatwg/fs/issues/93 for context Bug: 1399536 Change-Id: I019b393b731cd20aa4c45eade4eca19b6633e9cd Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4492076 Reviewed-by: Daseul Lee Commit-Queue: Austin Sullivan Cr-Commit-Position: refs/heads/main@{#1206676} -- wpt-commits: e4c1bdf27a01716a605a70e171be797f560952bf wpt-pr: 39755 --- .../tests/fs/resources/test-helpers.js | 10 +++------- .../fs/script-tests/FileSystemFileHandle-move.js | 14 ++------------ 2 files changed, 5 insertions(+), 19 deletions(-) diff --git a/testing/web-platform/tests/fs/resources/test-helpers.js b/testing/web-platform/tests/fs/resources/test-helpers.js index f9409ff48523b..25945203db180 100644 --- a/testing/web-platform/tests/fs/resources/test-helpers.js +++ b/testing/web-platform/tests/fs/resources/test-helpers.js @@ -17,13 +17,9 @@ const LOCK_ACCESS = { }; // Array of separators used to separate components in hierarchical paths. -let kPathSeparators; -if (navigator.userAgent.includes('Windows NT')) { - // Windows uses both '/' and '\' as path separators. - kPathSeparators = ['/', '\\']; -} else { - kPathSeparators = ['/']; -} +// Consider both '/' and '\' as path separators to ensure file names are +// platform-agnostic. +let kPathSeparators = ['/', '\\']; async function getFileSize(handle) { const file = await handle.getFile(); diff --git a/testing/web-platform/tests/fs/script-tests/FileSystemFileHandle-move.js b/testing/web-platform/tests/fs/script-tests/FileSystemFileHandle-move.js index dd848626e4a74..c5d08f305d061 100644 --- a/testing/web-platform/tests/fs/script-tests/FileSystemFileHandle-move.js +++ b/testing/web-platform/tests/fs/script-tests/FileSystemFileHandle-move.js @@ -50,25 +50,15 @@ directory_test(async (t, root) => { assert_array_equals(await getSortedDirectoryEntries(root), ['file-1']); }, 'move(name) can be called multiple times'); -directory_test(async (t, root) => { - const dir = await root.getDirectoryHandle('dir', {create: true}); - const handle = await createFileWithContents(t, 'file-before', 'foo', dir); - await promise_rejects_js(t, TypeError, handle.move('Lorem.')); - - assert_array_equals(await getSortedDirectoryEntries(root), ['dir/']); - assert_array_equals(await getSortedDirectoryEntries(dir), ['file-before']); - assert_equals(await getFileContents(handle), 'foo'); - assert_equals(await getFileSize(handle), 3); -}, 'move(name) with a name with a trailing period should fail'); - directory_test(async (t, root) => { const handle = await createFileWithContents(t, 'file-before', 'foo', root); await promise_rejects_js(t, TypeError, handle.move('test/test')); + await promise_rejects_js(t, TypeError, handle.move('test\\test')); assert_array_equals(await getSortedDirectoryEntries(root), ['file-before']); assert_equals(await getFileContents(handle), 'foo'); assert_equals(await getFileSize(handle), 3); -}, 'move(name) with a name with invalid characters should fail'); +}, 'move(name) with a name with path separators should fail'); directory_test(async (t, root) => { const handle = await createFileWithContents(t, 'file-before', 'abc', root);