Changeset 290115 in webkit

Timestamp:

Feb 17, 2022, 11:45:54 PM (3 years ago)

Author:

sihui_liu@apple.com

Message:

Exclude new LocalStorage directory from backup on iOS
​https://bugs.webkit.org/show_bug.cgi?id=236423
<rdar://problem/89060863>

Reviewed by Chris Dumez.

We've been excluding LocalStorage data from backup on iOS since r212555, and we need to make sure this applies
to new LocalStorage directory after migration (r289878).

Manually tested on iOS device.

• NetworkProcess/storage/OriginStorageManager.cpp:

(WebKit::OriginStorageManager::StorageBucket::resolvedLocalStoragePath):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/storage/OriginStorageManager.cpp (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2022-02-17  Sihui Liu  <sihui_liu@apple.com>
+
+        Exclude new LocalStorage directory from backup on iOS
+        https://bugs.webkit.org/show_bug.cgi?id=236423
+        <rdar://problem/89060863>
+
+        Reviewed by Chris Dumez.
+
+        We've been excluding LocalStorage data from backup on iOS since r212555, and we need to make sure this applies
+        to new LocalStorage directory after migration (r289878).
+
+        Manually tested on iOS device.
+
+        * NetworkProcess/storage/OriginStorageManager.cpp:
+        (WebKit::OriginStorageManager::StorageBucket::resolvedLocalStoragePath):
+
 2022-02-17  Diego Pino Garcia  <dpino@igalia.com>
 

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

@@ -253 +253 @@
             ASSERT(m_customLocalStoragePath.isEmpty() == m_rootPath.isEmpty());
             m_resolvedLocalStoragePath = m_customLocalStoragePath;
-        } else {
-            auto localStoragePath = LocalStorageManager::localStorageFilePath(typeStoragePath(StorageType::LocalStorage));
-            if (!m_customLocalStoragePath.isEmpty() && !FileSystem::fileExists(localStoragePath)) {
-                FileSystem::makeAllDirectories(FileSystem::parentPath(localStoragePath));
+        } else if (!m_rootPath.isEmpty()) {
+            auto localStorageDirectory = typeStoragePath(StorageType::LocalStorage);
+            FileSystem::makeAllDirectories(localStorageDirectory);
+            FileSystem::excludeFromBackup(localStorageDirectory);
+
+            auto localStoragePath = LocalStorageManager::localStorageFilePath(localStorageDirectory);
+            if (!m_customLocalStoragePath.isEmpty() && !FileSystem::fileExists(localStoragePath))
                 WebCore::SQLiteFileSystem::moveDatabaseFile(m_customLocalStoragePath, localStoragePath);
-            }
 
             m_resolvedLocalStoragePath = localStoragePath;
-        }
+        } else
+            m_resolvedLocalStoragePath = emptyString();
 
         return m_resolvedLocalStoragePath;