Changeset 242390 in webkit

Timestamp:

Mar 4, 2019, 1:59:09 PM (7 years ago)

Author:

Alan Coon

Message:

Cherry-pick r242376. rdar://problem/47820581

Correctly handle sandbox extensions when the same WKWebView loads multiple ​file:// URLs.
<rdar://problem/47820581> and ​https://bugs.webkit.org/show_bug.cgi?id=195291

Reviewed by Andy Estes.

• WebProcess/WebPage/WebPage.cpp: (WebKit::shouldReuseCommittedSandboxExtension): Only retain the previous sandbox extension if the file URL we're currently loading is functionally equivalent to the previous one.

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

Location:

tags/Safari-608.1.7.1.1/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebPage/WebPage.cpp (modified) (1 diff)

tags/Safari-608.1.7.1.1/Source/WebKit/ChangeLog

@@ +1 @@
+2019-03-04  Alan Coon  <alancoon@apple.com>
+
+        Cherry-pick r242376. rdar://problem/47820581
+
+    Correctly handle sandbox extensions when the same WKWebView loads multiple file:// URLs.
+    <rdar://problem/47820581> and https://bugs.webkit.org/show_bug.cgi?id=195291
+    
+    Reviewed by Andy Estes.
+    
+    * WebProcess/WebPage/WebPage.cpp:
+    (WebKit::shouldReuseCommittedSandboxExtension): Only retain the previous sandbox extension if the file URL
+      we're currently loading is functionally equivalent to the previous one.
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@242376 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-03-04  Brady Eidson  <beidson@apple.com>
+
+            Correctly handle sandbox extensions when the same WKWebView loads multiple file:// URLs.
+            <rdar://problem/47820581> and https://bugs.webkit.org/show_bug.cgi?id=195291
+
+            Reviewed by Andy Estes.
+
+            * WebProcess/WebPage/WebPage.cpp:
+            (WebKit::shouldReuseCommittedSandboxExtension): Only retain the previous sandbox extension if the file URL
+              we're currently loading is functionally equivalent to the previous one.
+
 2019-02-26  Philippe Normand <pnormand@igalia.com> and Carlos Garcia Campos  <cgarcia@igalia.com>
 

tags/Safari-608.1.7.1.1/Source/WebKit/WebProcess/WebPage/WebPage.cpp

@@ -4416 +4416 @@
         return false;
 
-    if (documentLoader->url().isLocalFile() && provisionalDocumentLoader->url().isLocalFile())
+    if (documentLoader->url().isLocalFile() && provisionalDocumentLoader->url().isLocalFile() && equalIgnoringQueryAndFragment(documentLoader->url(), provisionalDocumentLoader->url()))
         return true;