Changeset 286017 in webkit

Timestamp:

Nov 18, 2021, 11:19:20 AM (5 years ago)

Author:

Alan Coon

Message:

Cherry-pick r285130. rdar://problem/85166839

[macOS] Opening local html files is failing
​https://bugs.webkit.org/show_bug.cgi?id=232572
<rdar://81330442>

Reviewed by Brent Fulgham.

Source/WebKit:

On some macOS versions, opening local html files is failing. In order for the WebContent process
to successfully issue the file extension to the Networking process, the flags for the extension
in the WebContent process must include the user intent flag when the extension is issued with an
audit token.

• Shared/Cocoa/SandboxExtensionCocoa.mm: (WebKit::SandboxExtensionImpl::sandboxExtensionForType):

Source/WTF:

Declare sandbox flag.

• wtf/spi/darwin/SandboxSPI.h:

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

Location:

branches/safari-612.3.6.1-branch/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/spi/darwin/SandboxSPI.h (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/Shared/Cocoa/SandboxExtensionCocoa.mm (modified) (1 diff)

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

@@ +1 @@
+2021-11-18  Russell Epstein  <repstein@apple.com>
+
+        Cherry-pick r285130. rdar://problem/85166839
+
+    [macOS] Opening local html files is failing
+    https://bugs.webkit.org/show_bug.cgi?id=232572
+    <rdar://81330442>
+    
+    Reviewed by Brent Fulgham.
+    
+    Source/WebKit:
+    
+    On some macOS versions, opening local html files is failing. In order for the WebContent process
+    to successfully issue the file extension to the Networking process, the flags for the extension
+    in the WebContent process must include the user intent flag when the extension is issued with an
+    audit token.
+    
+    * Shared/Cocoa/SandboxExtensionCocoa.mm:
+    (WebKit::SandboxExtensionImpl::sandboxExtensionForType):
+    
+    Source/WTF:
+    
+    Declare sandbox flag.
+    
+    * wtf/spi/darwin/SandboxSPI.h:
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@285130 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-11-01  Per Arne  <pvollan@apple.com>
+
+            [macOS] Opening local html files is failing
+            https://bugs.webkit.org/show_bug.cgi?id=232572
+            <rdar://81330442>
+
+            Reviewed by Brent Fulgham.
+
+            Declare sandbox flag.
+
+            * wtf/spi/darwin/SandboxSPI.h:
+
 2021-11-11  Alan Coon  <alancoon@apple.com>
 

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

@@ -63 +63 @@
 extern const uint32_t SANDBOX_EXTENSION_NO_REPORT;
 extern const uint32_t SANDBOX_EXTENSION_CANONICAL;
+extern const uint32_t SANDBOX_EXTENSION_USER_INTENT;
 
 char *sandbox_extension_issue_file(const char *extension_class, const char *path, uint32_t flags);

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

@@ +1 @@
+2021-11-18  Russell Epstein  <repstein@apple.com>
+
+        Cherry-pick r285130. rdar://problem/85166839
+
+    [macOS] Opening local html files is failing
+    https://bugs.webkit.org/show_bug.cgi?id=232572
+    <rdar://81330442>
+    
+    Reviewed by Brent Fulgham.
+    
+    Source/WebKit:
+    
+    On some macOS versions, opening local html files is failing. In order for the WebContent process
+    to successfully issue the file extension to the Networking process, the flags for the extension
+    in the WebContent process must include the user intent flag when the extension is issued with an
+    audit token.
+    
+    * Shared/Cocoa/SandboxExtensionCocoa.mm:
+    (WebKit::SandboxExtensionImpl::sandboxExtensionForType):
+    
+    Source/WTF:
+    
+    Declare sandbox flag.
+    
+    * wtf/spi/darwin/SandboxSPI.h:
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@285130 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-11-01  Per Arne  <pvollan@apple.com>
+
+            [macOS] Opening local html files is failing
+            https://bugs.webkit.org/show_bug.cgi?id=232572
+            <rdar://81330442>
+
+            Reviewed by Brent Fulgham.
+
+            On some macOS versions, opening local html files is failing. In order for the WebContent process
+            to successfully issue the file extension to the Networking process, the flags for the extension
+            in the WebContent process must include the user intent flag when the extension is issued with an
+            audit token.
+
+            * Shared/Cocoa/SandboxExtensionCocoa.mm:
+            (WebKit::SandboxExtensionImpl::sandboxExtensionForType):
+
 2021-11-16  Kocsen Chung  <kocsen_chung@apple.com>
 

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

@@ -116 +116 @@
             if (!auditToken)
                 return nullptr;
+#if PLATFORM(MAC)
+            extensionFlags |= SANDBOX_EXTENSION_USER_INTENT;
+#endif
             return sandbox_extension_issue_file_to_process(APP_SANDBOX_READ, path, extensionFlags, *auditToken);
         }