<!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>[167521] 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/167521">167521</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-04-18 17:33:46 -0700 (Fri, 18 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't allow app sandboxed apps without the network client entitlement to launch the network process
https://bugs.webkit.org/show_bug.cgi?id=131868
<rdar://problem/12354188>
Reviewed by Dan Bernstein.
* NetworkProcess/EntryPoint/mac/XPCService/NetworkServiceEntryPoint.mm:
(WebKit::NetworkServiceInitializerDelegate::NetworkServiceInitializerDelegate):
Add a new delegate that implements checkEntitlements().
(NetworkServiceInitializer):
Pass the new delegate to XPCServiceInitializer.
* Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.h:
* Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.mm:
Call checkEntitlements.
(WebKit::XPCServiceInitializerDelegate::checkEntitlements):
Return true.
(WebKit::XPCServiceInitializerDelegate::hasEntitlement):
Helper function that returns whether a client has the given entitlement.
(WebKit::XPCServiceInitializerDelegate::isClientSandboxed):
Helper function that checks whether the client is sandboxed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessEntryPointmacXPCServiceNetworkServiceEntryPointmm">trunk/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkServiceEntryPoint.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedEntryPointUtilitiesmacXPCServiceXPCServiceEntryPointh">trunk/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.h</a></li>
<li><a href="#trunkSourceWebKit2SharedEntryPointUtilitiesmacXPCServiceXPCServiceEntryPointmm">trunk/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (167520 => 167521)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-04-19 00:29:45 UTC (rev 167520)
+++ trunk/Source/WebKit2/ChangeLog 2014-04-19 00:33:46 UTC (rev 167521)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2014-04-18 Anders Carlsson <andersca@apple.com>
+
+ Don't allow app sandboxed apps without the network client entitlement to launch the network process
+ https://bugs.webkit.org/show_bug.cgi?id=131868
+ <rdar://problem/12354188>
+
+ Reviewed by Dan Bernstein.
+
+ * NetworkProcess/EntryPoint/mac/XPCService/NetworkServiceEntryPoint.mm:
+ (WebKit::NetworkServiceInitializerDelegate::NetworkServiceInitializerDelegate):
+ Add a new delegate that implements checkEntitlements().
+
+ (NetworkServiceInitializer):
+ Pass the new delegate to XPCServiceInitializer.
+
+ * Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.h:
+ * Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.mm:
+ Call checkEntitlements.
+
+ (WebKit::XPCServiceInitializerDelegate::checkEntitlements):
+ Return true.
+
+ (WebKit::XPCServiceInitializerDelegate::hasEntitlement):
+ Helper function that returns whether a client has the given entitlement.
+
+ (WebKit::XPCServiceInitializerDelegate::isClientSandboxed):
+ Helper function that checks whether the client is sandboxed.
+
</ins><span class="cx"> 2014-04-18 Alice Barraclough <alice.barraclough@webkit.org>
</span><span class="cx">
</span><span class="cx"> Find on page - extend API by providing highlighted match index
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessEntryPointmacXPCServiceNetworkServiceEntryPointmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkServiceEntryPoint.mm (167520 => 167521)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkServiceEntryPoint.mm 2014-04-19 00:29:45 UTC (rev 167520)
+++ trunk/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkServiceEntryPoint.mm 2014-04-19 00:33:46 UTC (rev 167521)
</span><span class="lines">@@ -30,6 +30,34 @@
</span><span class="cx"> #import "WKBase.h"
</span><span class="cx"> #import "XPCServiceEntryPoint.h"
</span><span class="cx">
</span><ins>+namespace WebKit {
+
+class NetworkServiceInitializerDelegate : public XPCServiceInitializerDelegate {
+public:
+ NetworkServiceInitializerDelegate(xpc_connection_t connection, xpc_object_t initializerMessage)
+ : XPCServiceInitializerDelegate(connection, initializerMessage)
+ {
+ }
+
+#if PLATFORM(MAC)
+ virtual bool checkEntitlements() override
+ {
+ if (!isClientSandboxed())
+ return true;
+
+ if (!hasEntitlement("com.apple.security.network.client")) {
+ NSLog(@"Application does not have the 'com.apple.security.network.client' entitlement.");
+ return false;
+ }
+
+ return true;
+ }
+#endif
+
+};
+
+} // namespace WebKit
+
</ins><span class="cx"> using namespace WebKit;
</span><span class="cx">
</span><span class="cx"> extern "C" WK_EXPORT void NetworkServiceInitializer(xpc_connection_t connection, xpc_object_t initializerMessage);
</span><span class="lines">@@ -41,6 +69,6 @@
</span><span class="cx"> // the this process don't try to insert the shim and crash.
</span><span class="cx"> EnvironmentUtilities::stripValuesEndingWithString("DYLD_INSERT_LIBRARIES", "/SecItemShim.dylib");
</span><span class="cx">
</span><del>- XPCServiceInitializer<NetworkProcess, XPCServiceInitializerDelegate>(connection, initializerMessage);
</del><ins>+ XPCServiceInitializer<NetworkProcess, NetworkServiceInitializerDelegate>(connection, initializerMessage);
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedEntryPointUtilitiesmacXPCServiceXPCServiceEntryPointh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.h (167520 => 167521)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.h 2014-04-19 00:29:45 UTC (rev 167520)
+++ trunk/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.h 2014-04-19 00:33:46 UTC (rev 167521)
</span><span class="lines">@@ -42,12 +42,16 @@
</span><span class="cx">
</span><span class="cx"> virtual ~XPCServiceInitializerDelegate();
</span><span class="cx">
</span><ins>+ virtual bool checkEntitlements();
</ins><span class="cx"> virtual bool getConnectionIdentifier(IPC::Connection::Identifier& identifier);
</span><span class="cx"> virtual bool getClientIdentifier(String& clientIdentifier);
</span><span class="cx"> virtual bool getClientProcessName(String& clientProcessName);
</span><span class="cx"> virtual bool getExtraInitializationData(HashMap<String, String>& extraInitializationData);
</span><span class="cx">
</span><span class="cx"> protected:
</span><ins>+ bool hasEntitlement(const char* entitlement);
+ bool isClientSandboxed();
+
</ins><span class="cx"> xpc_connection_t m_connection;
</span><span class="cx"> xpc_object_t m_initializerMessage;
</span><span class="cx"> };
</span><span class="lines">@@ -63,6 +67,9 @@
</span><span class="cx">
</span><span class="cx"> InitializeWebKit2();
</span><span class="cx">
</span><ins>+ if (!delegate.checkEntitlements())
+ exit(EXIT_FAILURE);
+
</ins><span class="cx"> ChildProcessInitializationParameters parameters;
</span><span class="cx"> if (!delegate.getConnectionIdentifier(parameters.connectionIdentifier))
</span><span class="cx"> exit(EXIT_FAILURE);
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedEntryPointUtilitiesmacXPCServiceXPCServiceEntryPointmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.mm (167520 => 167521)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.mm 2014-04-19 00:29:45 UTC (rev 167520)
+++ trunk/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.mm 2014-04-19 00:33:46 UTC (rev 167521)
</span><span class="lines">@@ -27,14 +27,34 @@
</span><span class="cx">
</span><span class="cx"> #import "XPCServiceEntryPoint.h"
</span><span class="cx">
</span><ins>+#if __has_include(<xpc/private.h>)
+#import <xpc/private.h>
+#else
+extern "C" xpc_object_t xpc_connection_copy_entitlement_value(xpc_connection_t connection, const char *entitlement);
</ins><span class="cx"> extern "C" mach_port_t xpc_dictionary_copy_mach_send(xpc_object_t, const char*);
</span><ins>+#endif
</ins><span class="cx">
</span><ins>+#if __has_include(<sandbox/private.h>)
+#import <sandbox/private.h>
+#else
+enum sandbox_filter_type {
+ SANDBOX_FILTER_NONE,
+};
+extern "C"
+int sandbox_check(pid_t, const char *operation, enum sandbox_filter_type, ...);
+#endif
+
</ins><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> XPCServiceInitializerDelegate::~XPCServiceInitializerDelegate()
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool XPCServiceInitializerDelegate::checkEntitlements()
+{
+ return true;
+}
+
</ins><span class="cx"> bool XPCServiceInitializerDelegate::getConnectionIdentifier(IPC::Connection::Identifier& identifier)
</span><span class="cx"> {
</span><span class="cx"> identifier = IPC::Connection::Identifier(xpc_dictionary_copy_mach_send(m_initializerMessage, "server-port"), m_connection);
</span><span class="lines">@@ -62,4 +82,24 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool XPCServiceInitializerDelegate::hasEntitlement(const char* entitlement)
+{
+ xpc_object_t value = xpc_connection_copy_entitlement_value(m_connection, entitlement);
+ if (!value)
+ return false;
+
+ bool result = xpc_get_type(value) == XPC_TYPE_BOOL && xpc_bool_get_value(value);
+
+ xpc_release(value);
+
+ return result;
+}
+
+bool XPCServiceInitializerDelegate::isClientSandboxed()
+{
+ pid_t clientPID = xpc_connection_get_pid(m_connection);
+
+ return sandbox_check(clientPID, nullptr, SANDBOX_FILTER_NONE);
+}
+
</ins><span class="cx"> } // namespace WebKit
</span></span></pre>
</div>
</div>
</body>
</html>