<!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>[171007] tags/Safari-538.46/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/171007">171007</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2014-07-11 11:56:33 -0700 (Fri, 11 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/171003">r171003</a>. <rdar://problem/17642184></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#tagsSafari53846SourceWebKit2ChangeLog">tags/Safari-538.46/Source/WebKit2/ChangeLog</a></li>
<li><a href="#tagsSafari53846SourceWebKit2ResourcesSandboxProfilesioscomappleWebKitWebContentsb">tags/Safari-538.46/Source/WebKit2/Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="tagsSafari53846SourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.46/Source/WebKit2/ChangeLog (171006 => 171007)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.46/Source/WebKit2/ChangeLog 2014-07-11 18:54:20 UTC (rev 171006)
+++ tags/Safari-538.46/Source/WebKit2/ChangeLog 2014-07-11 18:56:33 UTC (rev 171007)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2014-07-11 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r171003
+
+ 2014-07-11 Oliver Hunt <oliver@apple.com>
+
+ Tighten WebContent sandbox
+ https://bugs.webkit.org/show_bug.cgi?id=134834
+
+ Reviewed by Sam Weinig.
+
+ Define a much tighter sandbox profile for the WebContent process
+
+ * Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb:
+
+2014-07-11 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r171001
</span><span class="cx">
</span><span class="cx"> 2014-07-11 Zalan Bujtas <zalan@apple.com>
</span></span></pre></div>
<a id="tagsSafari53846SourceWebKit2ResourcesSandboxProfilesioscomappleWebKitWebContentsb"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.46/Source/WebKit2/Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb (171006 => 171007)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.46/Source/WebKit2/Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb 2014-07-11 18:54:20 UTC (rev 171006)
+++ tags/Safari-538.46/Source/WebKit2/Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb 2014-07-11 18:56:33 UTC (rev 171007)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-; Copyright (C) 2014 Apple Inc. All rights reserved.
</del><ins>+; Copyright (C) 2010, 2011, 2012, 2013, 2014 Apple Inc. All rights reserved.
</ins><span class="cx"> ;
</span><span class="cx"> ; Redistribution and use in source and binary forms, with or without
</span><span class="cx"> ; modification, are permitted provided that the following conditions
</span><span class="lines">@@ -22,7 +22,68 @@
</span><span class="cx"> ; THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx">
</span><span class="cx"> (version 1)
</span><del>-(allow default)
</del><ins>+(deny default (with partial-symbolication))
+(allow system-audit file-read-metadata)
</ins><span class="cx">
</span><span class="cx"> (import "common.sb")
</span><span class="cx"> (import "removed-dev-nodes.sb")
</span><ins>+(import "apple-UI-apps.sb")
+
+(apple-ui-app "com.apple.WebKit.WebContent" 'with-webkit 'with-opengl)
+(opengl)
+
+;; Access CFNetwork shared cookies
+;; This is too generous -- <rdar://problem/17496756>
+(apple-cookie-access 'with-read-write)
+
+(play-media)
+
+;; Read-only preferences and data
+(mobile-preferences-read
+ "com.apple.LaunchServices"
+ "com.apple.WebFoundation")
+
+;; Sandbox extensions
+(define (apply-read-and-issue-extension op path-filter)
+ (op file-read* path-filter)
+ (op file-issue-extension (require-all (extension-class "com.apple.app-sandbox.read") path-filter)))
+(define (apply-write-and-issue-extension op path-filter)
+ (op file-write* path-filter)
+ (op file-issue-extension (require-all (extension-class "com.apple.app-sandbox.read-write") path-filter)))
+(define (read-only-and-issue-extensions path-filter)
+ (apply-read-and-issue-extension allow path-filter))
+(define (read-write-and-issue-extensions path-filter)
+ (apply-read-and-issue-extension allow path-filter)
+ (apply-write-and-issue-extension allow path-filter))
+(read-only-and-issue-extensions (extension "com.apple.app-sandbox.read"))
+(read-write-and-issue-extensions (extension "com.apple.app-sandbox.read-write"))
+
+(allow file-issue-extension
+ (require-all
+ (extension-class "com.apple.webkit.read")
+ (require-any
+ (extension "com.apple.app-sandbox.read")
+ (extension "com.apple.app-sandbox.read-write"))))
+
+
+(allow file-read* file-write* (extension "com.apple.nsurlstorage.extension-cache"))
+(allow file-issue-extension (extension-class "com.apple.nsurlstorage.extension-cache"))
+
+;; Access to own cache & temp folders.
+(allow file-read* (extension "com.apple.webkit.read"))
+(allow file-read* file-write* (extension "com.apple.webkit.read-write"))
+
+
+;; Allow the OpenGL Profiler to attach.
+(instruments-support) ; For <rdar://problem/7931952>
+
+;; MediaAccessibility
+(mobile-preferences-read "com.apple.mediaaccessibility")
+(mobile-preferences-read-write "com.apple.mediaaccessibility.public")
+
+;; Remote Web Inspector
+(allow mach-lookup
+ (global-name "com.apple.webinspector"))
+
+(deny file-write-create (vnode-type SYMLINK))
+(deny file-read-xattr file-write-xattr (xattr-regex #"^com\.apple\.security\.private\."))
</ins></span></pre>
</div>
</div>
</body>
</html>