Changeset 248744 in webkit

Timestamp:

Aug 15, 2019, 1:50:00 PM (7 years ago)

Author:

Alan Coon

Message:

Cherry-pick r248731. rdar://problem/54360857

Unreviewed, rolling out r248440.
​https://bugs.webkit.org/show_bug.cgi?id=200772

Introduced regressions related to loading of local files.
(Requested by perarne on #webkit).

Reverted changeset:

"[Mac] Use the PID of the WebContent process when issuing
local file read sandbox extensions"
​https://bugs.webkit.org/show_bug.cgi?id=200543
​https://trac.webkit.org/changeset/248440

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

Location:

branches/safari-608-branch/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/Platform.h (modified) (1 diff)
• WTF/wtf/spi/darwin/SandboxSPI.h (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/Shared/Cocoa/SandboxExtensionCocoa.mm (modified) (2 diffs)
• WebKit/Shared/SandboxExtension.h (modified) (2 diffs)
• WebKit/UIProcess/WebPageProxy.cpp (modified) (2 diffs)

branches/safari-608-branch/Source/WTF/ChangeLog

@@ +1 @@
+2019-08-15  Alan Coon  <alancoon@apple.com>
+
+        Cherry-pick r248731. rdar://problem/54360857
+
+    Unreviewed, rolling out r248440.
+    https://bugs.webkit.org/show_bug.cgi?id=200772
+    
+    Introduced regressions related to loading of local files.
+    (Requested by perarne on #webkit).
+    
+    Reverted changeset:
+    
+    "[Mac] Use the PID of the WebContent process when issuing
+    local file read sandbox extensions"
+    https://bugs.webkit.org/show_bug.cgi?id=200543
+    https://trac.webkit.org/changeset/248440
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@248731 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-08-15  Commit Queue  <commit-queue@webkit.org>
+
+            Unreviewed, rolling out r248440.
+            https://bugs.webkit.org/show_bug.cgi?id=200772
+
+            Introduced regressions related to loading of local files.
+            (Requested by perarne on #webkit).
+
+            Reverted changeset:
+
+            "[Mac] Use the PID of the WebContent process when issuing
+            local file read sandbox extensions"
+            https://bugs.webkit.org/show_bug.cgi?id=200543
+            https://trac.webkit.org/changeset/248440
+
 2019-08-13  Alan Coon  <alancoon@apple.com>
 

branches/safari-608-branch/Source/WTF/wtf/Platform.h

@@ -1527 +1527 @@
 #endif
 
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000)
-#define HAVE_SANDBOX_ISSUE_READ_EXTENSION_TO_PROCESS_BY_PID 1
-#endif
-
 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000)
 #define HAVE_MDNS_FAST_REGISTRATION 1

branches/safari-608-branch/Source/WTF/wtf/spi/darwin/SandboxSPI.h

@@ -65 +65 @@
 char *sandbox_extension_issue_generic(const char *extension_class, uint32_t flags);
 char *sandbox_extension_issue_mach_to_process_by_pid(const char *extension_class, const char *name, uint32_t flags, pid_t);
-char *sandbox_extension_issue_file_to_process_by_pid(const char *extension_class, const char *path, uint32_t flags, pid_t);
 int sandbox_check(pid_t, const char *operation, enum sandbox_filter_type, ...);
 int sandbox_check_by_audit_token(audit_token_t, const char *operation, enum sandbox_filter_type, ...);

branches/safari-608-branch/Source/WebKit/ChangeLog

@@ +1 @@
+2019-08-15  Alan Coon  <alancoon@apple.com>
+
+        Cherry-pick r248731. rdar://problem/54360857
+
+    Unreviewed, rolling out r248440.
+    https://bugs.webkit.org/show_bug.cgi?id=200772
+    
+    Introduced regressions related to loading of local files.
+    (Requested by perarne on #webkit).
+    
+    Reverted changeset:
+    
+    "[Mac] Use the PID of the WebContent process when issuing
+    local file read sandbox extensions"
+    https://bugs.webkit.org/show_bug.cgi?id=200543
+    https://trac.webkit.org/changeset/248440
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@248731 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-08-15  Commit Queue  <commit-queue@webkit.org>
+
+            Unreviewed, rolling out r248440.
+            https://bugs.webkit.org/show_bug.cgi?id=200772
+
+            Introduced regressions related to loading of local files.
+            (Requested by perarne on #webkit).
+
+            Reverted changeset:
+
+            "[Mac] Use the PID of the WebContent process when issuing
+            local file read sandbox extensions"
+            https://bugs.webkit.org/show_bug.cgi?id=200543
+            https://trac.webkit.org/changeset/248440
+
 2019-08-15  Alan Coon  <alancoon@apple.com>
 

branches/safari-608-branch/Source/WebKit/Shared/Cocoa/SandboxExtensionCocoa.mm

@@ -101 +101 @@
         case SandboxExtension::Type::Generic:
             return sandbox_extension_issue_generic(path, 0);
-        case SandboxExtension::Type::ReadByPid:
-#if HAVE(SANDBOX_ISSUE_READ_EXTENSION_TO_PROCESS_BY_PID)
-            return sandbox_extension_issue_file_to_process_by_pid(APP_SANDBOX_READ, path, 0, pid.value());
-#else
-            UNUSED_PARAM(pid);
-            ASSERT_NOT_REACHED();
-            return nullptr;
-#endif
         }
     }
@@ -345 +337 @@
 }
 
-bool SandboxExtension::createHandleForReadByPid(const String& path, ProcessID pid, Handle& handle)
-{
-    ASSERT(!handle.m_sandboxExtension);
-    
-    handle.m_sandboxExtension = SandboxExtensionImpl::create(path.utf8().data(), Type::ReadByPid, pid);
-    if (!handle.m_sandboxExtension) {
-        WTFLogAlways("Could not create a '%s' sandbox extension", path.utf8().data());
-        return false;
-    }
-    
-    return true;
-}
-
 SandboxExtension::SandboxExtension(const Handle& handle)
     : m_sandboxExtension(WTFMove(handle.m_sandboxExtension))

branches/safari-608-branch/Source/WebKit/Shared/SandboxExtension.h

@@ -50 +50 @@
         Mach,
         Generic,
-        ReadByPid
     };
 
@@ -106 +105 @@
     static bool createHandleForGenericExtension(const String& extensionClass, Handle&);
     static bool createHandleForMachLookupByPid(const String& service, ProcessID, Handle&);
-    static bool createHandleForReadByPid(const String& path, ProcessID, Handle&);
     ~SandboxExtension();
 

branches/safari-608-branch/Source/WebKit/UIProcess/WebPageProxy.cpp

@@ -1066 +1066 @@
     ASSERT_WITH_SECURITY_IMPLICATION(!WebKit::isInspectorPage(*this));
 
-#if PLATFORM(MAC) && HAVE(SANDBOX_ISSUE_READ_EXTENSION_TO_PROCESS_BY_PID)
-    if (SandboxExtension::createHandleForReadByPid("/", processIdentifier(), sandboxExtensionHandle)) {
-#else
     if (SandboxExtension::createHandle("/", SandboxExtension::Type::ReadOnly, sandboxExtensionHandle)) {
-#endif
         willAcquireUniversalFileReadSandboxExtension(process);
         return;
@@ -1083 +1079 @@
     auto baseURL = URL(URL(), url.baseAsString());
     auto basePath = baseURL.fileSystemPath();
-    if (basePath.isNull())
-        return;
-#if PLATFORM(MAC) && HAVE(SANDBOX_ISSUE_READ_EXTENSION_TO_PROCESS_BY_PID)
-    if (SandboxExtension::createHandleForReadByPid(basePath, processIdentifier(), sandboxExtensionHandle))
-#else
-    if (SandboxExtension::createHandle(basePath, SandboxExtension::Type::ReadOnly, sandboxExtensionHandle))
-#endif
+    if (!basePath.isNull() && SandboxExtension::createHandle(basePath, SandboxExtension::Type::ReadOnly, sandboxExtensionHandle))
         m_process->assumeReadAccessToBaseURL(*this, baseURL);
 }