<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[209779] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/209779">209779</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2016-12-13 14:56:28 -0800 (Tue, 13 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Mac][WK2] Tighten Keychain directory access
https://bugs.webkit.org/show_bug.cgi?id=165818
<rdar://problem/16863857>
Reviewed by Anders Carlsson.
Lock down Keychain directory access to just the file-read-data, file-read-metadata, and
file-write-data operations we actually need.
* NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in:
* PluginProcess/mac/com.apple.WebKit.plugin-common.sb.in:
* WebProcess/com.apple.WebProcess.sb.in:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessmaccomappleWebKitNetworkProcesssbin">trunk/Source/WebKit2/NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in</a></li>
<li><a href="#trunkSourceWebKit2PluginProcessmaccomappleWebKitplugincommonsbin">trunk/Source/WebKit2/PluginProcess/mac/com.apple.WebKit.plugin-common.sb.in</a></li>
<li><a href="#trunkSourceWebKit2WebProcesscomappleWebProcesssbin">trunk/Source/WebKit2/WebProcess/com.apple.WebProcess.sb.in</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (209778 => 209779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-12-13 22:27:48 UTC (rev 209778)
+++ trunk/Source/WebKit2/ChangeLog 2016-12-13 22:56:28 UTC (rev 209779)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-12-13 Brent Fulgham <bfulgham@apple.com>
+
+ [Mac][WK2] Tighten Keychain directory access
+ https://bugs.webkit.org/show_bug.cgi?id=165818
+ <rdar://problem/16863857>
+
+ Reviewed by Anders Carlsson.
+
+ Lock down Keychain directory access to just the file-read-data, file-read-metadata, and
+ file-write-data operations we actually need.
+
+ * NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in:
+ * PluginProcess/mac/com.apple.WebKit.plugin-common.sb.in:
+ * WebProcess/com.apple.WebProcess.sb.in:
+
</ins><span class="cx"> 2016-12-13 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><span class="cx"> [Cocoa] Implement -shouldInsertText: on WKWebProcessPlugInEditingDelegate
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessmaccomappleWebKitNetworkProcesssbin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in (209778 => 209779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in 2016-12-13 22:27:48 UTC (rev 209778)
+++ trunk/Source/WebKit2/NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in 2016-12-13 22:56:28 UTC (rev 209779)
</span><span class="lines">@@ -37,6 +37,32 @@
</span><span class="cx"> (define (home-literal home-relative-literal)
</span><span class="cx"> (literal (string-append (param "HOME_DIR") home-relative-literal)))
</span><span class="cx">
</span><ins>+;; Remove when <rdar://problem/29646094> is fixed.
+(define (HEX-pattern-match-generator pattern-descriptor)
+ (letrec ((pattern-string ""))
+ (for-each (lambda (repeat-count)
+ (if (zero? repeat-count)
+ (set! pattern-string (string-append pattern-string "-"))
+ (let appender ((count repeat-count))
+ (if (> count 0)
+ (begin
+ (set! pattern-string (string-append pattern-string "[0-9A-F]"))
+ (appender (- count 1)))))))
+ pattern-descriptor)
+ pattern-string))
+
+;; return a regex pattern matching string for 8-4-4-4-12 UUIDs:
+(define (uuid-HEX-pattern-match-string)
+ (HEX-pattern-match-generator '(8 0 4 0 4 0 4 0 12)))
+
+;; global to hold the computed UUID matching pattern.
+(define *uuid-pattern* "")
+
+(define (uuid-regex-string)
+ (if (zero? (string-length *uuid-pattern*))
+ (set! *uuid-pattern* (uuid-HEX-pattern-match-string)))
+ *uuid-pattern*)
+
</ins><span class="cx"> ;; Read-only preferences and data
</span><span class="cx"> (allow user-preference-read
</span><span class="cx"> (preference-domain
</span><span class="lines">@@ -110,7 +136,16 @@
</span><span class="cx"> (global-name "com.apple.SecurityServer"))
</span><span class="cx">
</span><span class="cx"> #if __MAC_OS_X_VERSION_MIN_REQUIRED < 101240
</span><del>-(allow file-read* file-write* (home-subpath "/Library/Keychains")) ;; FIXME: This should be removed when <rdar://problem/10479685> is fixed.
</del><ins>+;; FIXME: This should be removed when <rdar://problem/10479685> is fixed.
+;; Restrict AppSandboxed processes from creating /Library/Keychains, but allow access to the contents of /Library/Keychains:
+(allow file-read-data file-read-metadata file-write-data
+ (subpath "/Library/Keychains")
+ (home-subpath "/Library/Keychains"))
+
+;; Except deny access to new-style iOS Keychain folders which are UUIDs.
+(deny file-read* file-write*
+ (regex (string-append "/Library/Keychains/" (uuid-regex-string) "(/|$)"))
+ (home-regex (string-append "/Library/Keychains/" (uuid-regex-string) "(/|$)")))
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> (allow file-read* file-write* (subpath "/private/var/db/mds/system")) ;; FIXME: This should be removed when <rdar://problem/9538414> is fixed.
</span><span class="lines">@@ -123,9 +158,6 @@
</span><span class="cx"> "com.apple.security.revocation"))
</span><span class="cx">
</span><span class="cx"> (allow file-read*
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED < 101240
- (subpath "/Library/Keychains")
-#endif
</del><span class="cx"> (subpath "/private/var/db/mds")
</span><span class="cx"> (literal "/private/var/db/DetachedSignatures")
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2PluginProcessmaccomappleWebKitplugincommonsbin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PluginProcess/mac/com.apple.WebKit.plugin-common.sb.in (209778 => 209779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PluginProcess/mac/com.apple.WebKit.plugin-common.sb.in 2016-12-13 22:27:48 UTC (rev 209778)
+++ trunk/Source/WebKit2/PluginProcess/mac/com.apple.WebKit.plugin-common.sb.in 2016-12-13 22:56:28 UTC (rev 209779)
</span><span class="lines">@@ -73,6 +73,32 @@
</span><span class="cx"> (home-library-preferences-regex (string-append #"/ByHost/" (regex-quote domain) #"\..*\.plist$")))))
</span><span class="cx"> domains))
</span><span class="cx">
</span><ins>+;; Remove when <rdar://problem/29646094> is fixed.
+(define (HEX-pattern-match-generator pattern-descriptor)
+ (letrec ((pattern-string ""))
+ (for-each (lambda (repeat-count)
+ (if (zero? repeat-count)
+ (set! pattern-string (string-append pattern-string "-"))
+ (let appender ((count repeat-count))
+ (if (> count 0)
+ (begin
+ (set! pattern-string (string-append pattern-string "[0-9A-F]"))
+ (appender (- count 1)))))))
+ pattern-descriptor)
+ pattern-string))
+
+;; return a regex pattern matching string for 8-4-4-4-12 UUIDs:
+(define (uuid-HEX-pattern-match-string)
+ (HEX-pattern-match-generator '(8 0 4 0 4 0 4 0 12)))
+
+;; global to hold the computed UUID matching pattern.
+(define *uuid-pattern* "")
+
+(define (uuid-regex-string)
+ (if (zero? (string-length *uuid-pattern*))
+ (set! *uuid-pattern* (uuid-HEX-pattern-match-string)))
+ *uuid-pattern*)
+
</ins><span class="cx"> ;; WebKit2 sandbox launcher needs to define an _OS_VERSION parameter
</span><span class="cx"> ;; This parameter is the major OS Version number.
</span><span class="cx"> (if (not (defined? 'os-version))
</span><span class="lines">@@ -162,14 +188,23 @@
</span><span class="cx">
</span><span class="cx"> (subpath "/Library/ColorSync")
</span><span class="cx">
</span><del>- (home-literal "/Library/Preferences/com.apple.lookup.shared.plist")
</del><ins>+ (home-literal "/Library/Preferences/com.apple.lookup.shared.plist"))
</ins><span class="cx">
</span><del>- ;; FIXME: This should be removed when <rdar://problem/10479685> is fixed.
- (subpath "/Library/Keychains"))
</del><ins>+#if __MAC_OS_X_VERSION_MIN_REQUIRED < 101240
+;; FIXME: This should be removed when <rdar://problem/10479685> is fixed.
+;; Restrict AppSandboxed processes from creating /Library/Keychains, but allow access to the contents of /Library/Keychains:
+(allow file-read-data file-read-metadata file-write-data
+ (subpath "/Library/Keychains")
+ (home-library-subpath "/Keychains"))
</ins><span class="cx">
</span><ins>+;; Except deny access to new-style iOS Keychain folders which are UUIDs.
+(deny file-read* file-write*
+ (regex (string-append "/Library/Keychains/" (uuid-regex-string) "(/|$)"))
+ (home-library-regex (string-append "/Library/Keychains/" (uuid-regex-string) "(/|$)")))
+#endif
+
</ins><span class="cx"> ;; Security framework
</span><span class="cx"> (allow mach-lookup (global-name "com.apple.ocspd"))
</span><del>-(allow file-read* file-write* (home-library-subpath "/Keychains"))
</del><span class="cx"> (allow file-read*
</span><span class="cx"> (subpath "/private/var/db/mds")
</span><span class="cx"> (literal "/private/var/db/DetachedSignatures"))
</span><span class="lines">@@ -177,9 +212,6 @@
</span><span class="cx"> (ipc-posix-name "com.apple.AppleDatabaseChanged"))
</span><span class="cx">
</span><span class="cx"> ;; Read-write preferences and data
</span><del>-(allow file*
- ;; FIXME: This should be removed when <rdar://problem/10479685> is fixed.
- (home-library-subpath "/Keychains"))
</del><span class="cx"> (allow system-fsctl (fsctl-command (_IO "h" 47)))
</span><span class="cx">
</span><span class="cx"> ;; IOKit user clients
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcesscomappleWebProcesssbin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/com.apple.WebProcess.sb.in (209778 => 209779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/com.apple.WebProcess.sb.in 2016-12-13 22:27:48 UTC (rev 209778)
+++ trunk/Source/WebKit2/WebProcess/com.apple.WebProcess.sb.in 2016-12-13 22:56:28 UTC (rev 209779)
</span><span class="lines">@@ -43,6 +43,32 @@
</span><span class="cx"> (allow file-read* (subpath path))
</span><span class="cx"> (allow file-issue-extension (require-all (extension-class "com.apple.app-sandbox.read") (subpath path))))))
</span><span class="cx">
</span><ins>+;; Remove when <rdar://problem/29646094> is fixed.
+(define (HEX-pattern-match-generator pattern-descriptor)
+ (letrec ((pattern-string ""))
+ (for-each (lambda (repeat-count)
+ (if (zero? repeat-count)
+ (set! pattern-string (string-append pattern-string "-"))
+ (let appender ((count repeat-count))
+ (if (> count 0)
+ (begin
+ (set! pattern-string (string-append pattern-string "[0-9A-F]"))
+ (appender (- count 1)))))))
+ pattern-descriptor)
+ pattern-string))
+
+;; return a regex pattern matching string for 8-4-4-4-12 UUIDs:
+(define (uuid-HEX-pattern-match-string)
+ (HEX-pattern-match-generator '(8 0 4 0 4 0 4 0 12)))
+
+;; global to hold the computed UUID matching pattern.
+(define *uuid-pattern* "")
+
+(define (uuid-regex-string)
+ (if (zero? (string-length *uuid-pattern*))
+ (set! *uuid-pattern* (uuid-HEX-pattern-match-string)))
+ *uuid-pattern*)
+
</ins><span class="cx"> ;; Read-only preferences and data
</span><span class="cx"> (allow file-read*
</span><span class="cx"> ;; Basic system paths
</span><span class="lines">@@ -221,15 +247,21 @@
</span><span class="cx"> (global-name "com.apple.SecurityServer"))
</span><span class="cx">
</span><span class="cx"> #if __MAC_OS_X_VERSION_MIN_REQUIRED < 101240
</span><del>-(allow file-read* file-write* (home-subpath "/Library/Keychains")) ;; FIXME: This should be removed when <rdar://problem/10479685> is fixed.
</del><ins>+;; FIXME: This should be removed when <rdar://problem/10479685> is fixed.
+;; Restrict AppSandboxed processes from creating /Library/Keychains, but allow access to the contents of /Library/Keychains:
+(allow file-read-data file-read-metadata file-write-data
+ (subpath "/Library/Keychains")
+ (home-subpath "/Library/Keychains"))
+
+;; Except deny access to new-style iOS Keychain folders which are UUIDs.
+(deny file-read* file-write*
+ (regex (string-append "/Library/Keychains/" (uuid-regex-string) "(/|$)"))
+ (home-regex (string-append "/Library/Keychains/" (uuid-regex-string) "(/|$)")))
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> (allow file-read* file-write* (subpath "/private/var/db/mds/system")) ;; FIXME: This should be removed when <rdar://problem/9538414> is fixed.
</span><span class="cx">
</span><span class="cx"> (allow file-read*
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED < 101240
- (subpath "/Library/Keychains")
-#endif
</del><span class="cx"> (subpath "/private/var/db/mds")
</span><span class="cx"> (literal "/private/var/db/DetachedSignatures")
</span><span class="cx"> ; The following are needed until <rdar://problem/11134688> is resolved.
</span></span></pre>
</div>
</div>
</body>
</html>