<!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>[211470] 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/211470">211470</a></dd>

<dt>Author</dt> <dd>bfulgham@apple.com</dd>

<dt>Date</dt> <dd>2017-01-31 22:07:51 -0800 (Tue, 31 Jan 2017)</dd>

</dl>

<h3>Log Message</h3>

<pre>[WebRTC][WebKit2] Support expanding the sandbox to allow microphone access at process launch

https://bugs.webkit.org/show_bug.cgi?id=167669

&lt;rdar://problem/29974333&gt;

Reviewed by Alexey Proskuryakov.

This change implements a temporary workaround to &lt;rdar://problem/29448368&gt; to allow us to do live

testing of WebRTC microphone access. It should be removed when that underlying bug is fixed.

This change adds a new process creation parameter that indicates whether we wish to expand the

sandbox to allow microphone access.

Tested by WebRTC suite (part of another set of bugs).

* Shared/WebProcessCreationParameters.cpp:

(WebKit::WebProcessCreationParameters::encode): Serialize the audio access entitlement handle.

(WebKit::WebProcessCreationParameters::decode): Ditto.

* Shared/WebProcessCreationParameters.h:

* UIProcess/WebProcessPool.cpp:

(WebKit::WebProcessPool::createNewWebProcess): Create an entitlement handle and pass along to

the child process.

* WebProcess/cocoa/WebProcessCocoa.mm:

(WebKit::WebProcess::platformInitializeWebProcess): If an audio entitlement (for the microphone)

was desired, expand the sandbox to include access.</pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>

<li><a href="#trunkSourceWebKit2SharedWebProcessCreationParameterscpp">trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp</a></li>

<li><a href="#trunkSourceWebKit2SharedWebProcessCreationParametersh">trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h</a></li>

<li><a href="#trunkSourceWebKit2UIProcessWebProcessPoolcpp">trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp</a></li>

<li><a href="#trunkSourceWebKit2WebProcesscocoaWebProcessCocoamm">trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunkSourceWebKit2ChangeLog"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (211469 => 211470)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebKit2/ChangeLog        2017-02-01 05:40:17 UTC (rev 211469)

+++ trunk/Source/WebKit2/ChangeLog        2017-02-01 06:07:51 UTC (rev 211470)

</span><span class="lines">@@ -1,3 +1,30 @@

</span><ins>+2017-01-31  Brent Fulgham  &lt;bfulgham@apple.com&gt;

+

+        [WebRTC][WebKit2] Support expanding the sandbox to allow microphone access at process launch

+        https://bugs.webkit.org/show_bug.cgi?id=167669

+        &lt;rdar://problem/29974333&gt;

+

+        Reviewed by Alexey Proskuryakov.

+

+        This change implements a temporary workaround to &lt;rdar://problem/29448368&gt; to allow us to do live

+        testing of WebRTC microphone access. It should be removed when that underlying bug is fixed.

+

+        This change adds a new process creation parameter that indicates whether we wish to expand the

+        sandbox to allow microphone access.

+

+        Tested by WebRTC suite (part of another set of bugs).

+

+        * Shared/WebProcessCreationParameters.cpp:

+        (WebKit::WebProcessCreationParameters::encode): Serialize the audio access entitlement handle.

+        (WebKit::WebProcessCreationParameters::decode): Ditto.

+        * Shared/WebProcessCreationParameters.h:

+        * UIProcess/WebProcessPool.cpp:

+        (WebKit::WebProcessPool::createNewWebProcess): Create an entitlement handle and pass along to

+        the child process.

+        * WebProcess/cocoa/WebProcessCocoa.mm:

+        (WebKit::WebProcess::platformInitializeWebProcess): If an audio entitlement (for the microphone)

+        was desired, expand the sandbox to include access.

+

</ins><span class="cx"> 2017-01-31  Tim Horton  &lt;timothy_horton@apple.com&gt;

</span><span class="cx"> 

</span><span class="cx">         Fix the build.

</span></span></pre></div>

<a id="trunkSourceWebKit2SharedWebProcessCreationParameterscpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp (211469 => 211470)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp        2017-02-01 05:40:17 UTC (rev 211469)

+++ trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp        2017-02-01 06:07:51 UTC (rev 211470)

</span><span class="lines">@@ -1,5 +1,5 @@

</span><span class="cx"> /*

</span><del>- * Copyright (C) 2010-2016 Apple Inc. All rights reserved.

</del><ins>+ * Copyright (C) 2010-2017 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">@@ -78,6 +78,9 @@

</span><span class="cx"> #endif

</span><span class="cx">     encoder &lt;&lt; mediaKeyStorageDirectory;

</span><span class="cx">     encoder &lt;&lt; mediaKeyStorageDirectoryExtensionHandle;

</span><ins>+#if ENABLE(MEDIA_STREAM)

+    encoder &lt;&lt; audioCaptureExtensionHandle;

+#endif

</ins><span class="cx">     encoder &lt;&lt; shouldUseTestingNetworkSession;

</span><span class="cx">     encoder &lt;&lt; urlSchemesRegisteredAsEmptyDocument;

</span><span class="cx">     encoder &lt;&lt; urlSchemesRegisteredAsSecure;

</span><span class="lines">@@ -194,6 +197,10 @@

</span><span class="cx">         return false;

</span><span class="cx">     if (!decoder.decode(parameters.mediaKeyStorageDirectoryExtensionHandle))

</span><span class="cx">         return false;

</span><ins>+#if ENABLE(MEDIA_STREAM)

+    if (!decoder.decode(parameters.audioCaptureExtensionHandle))

+        return false;

+#endif

</ins><span class="cx">     if (!decoder.decode(parameters.shouldUseTestingNetworkSession))

</span><span class="cx">         return false;

</span><span class="cx">     if (!decoder.decode(parameters.urlSchemesRegisteredAsEmptyDocument))

</span></span></pre></div>

<a id="trunkSourceWebKit2SharedWebProcessCreationParametersh"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h (211469 => 211470)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h        2017-02-01 05:40:17 UTC (rev 211469)

+++ trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h        2017-02-01 06:07:51 UTC (rev 211470)

</span><span class="lines">@@ -1,5 +1,5 @@

</span><span class="cx"> /*

</del><ins>+ * Copyright (C) 2010-2017 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">@@ -84,6 +84,9 @@

</span><span class="cx">     SandboxExtension::Handle containerTemporaryDirectoryExtensionHandle;

</span><span class="cx"> #endif

</span><span class="cx">     SandboxExtension::Handle mediaKeyStorageDirectoryExtensionHandle;

</span><ins>+#if ENABLE(MEDIA_STREAM)

+    SandboxExtension::Handle audioCaptureExtensionHandle;

+#endif

</ins><span class="cx">     String mediaKeyStorageDirectory;

</span><span class="cx"> 

</span><span class="cx">     bool shouldUseTestingNetworkSession;

</span></span></pre></div>

<a id="trunkSourceWebKit2UIProcessWebProcessPoolcpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp (211469 => 211470)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp        2017-02-01 05:40:17 UTC (rev 211469)

+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp        2017-02-01 06:07:51 UTC (rev 211470)

</span><span class="lines">@@ -1,5 +1,5 @@

</span><span class="cx"> /*

</del><ins>+ * Copyright (C) 2010-2017 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">@@ -61,6 +61,7 @@

</span><span class="cx"> #include &quot;WebNotificationManagerProxy.h&quot;

</span><span class="cx"> #include &quot;WebPageGroup.h&quot;

</span><span class="cx"> #include &quot;WebPreferences.h&quot;

</span><ins>+#include &quot;WebPreferencesKeys.h&quot;

</ins><span class="cx"> #include &quot;WebProcessCreationParameters.h&quot;

</span><span class="cx"> #include &quot;WebProcessMessages.h&quot;

</span><span class="cx"> #include &quot;WebProcessPoolMessages.h&quot;

</span><span class="lines">@@ -71,6 +72,7 @@

</span><span class="cx"> #include &lt;WebCore/LinkHash.h&gt;

</span><span class="cx"> #include &lt;WebCore/LogInitialization.h&gt;

</span><span class="cx"> #include &lt;WebCore/ResourceRequest.h&gt;

</span><ins>+#include &lt;WebCore/RuntimeEnabledFeatures.h&gt;

</ins><span class="cx"> #include &lt;WebCore/SessionID.h&gt;

</span><span class="cx"> #include &lt;WebCore/URLParser.h&gt;

</span><span class="cx"> #include &lt;runtime/JSCInlines.h&gt;

</span><span class="lines">@@ -574,6 +576,12 @@

</span><span class="cx">     if (!parameters.mediaKeyStorageDirectory.isEmpty())

</span><span class="cx">         SandboxExtension::createHandleWithoutResolvingPath(parameters.mediaKeyStorageDirectory, SandboxExtension::ReadWrite, parameters.mediaKeyStorageDirectoryExtensionHandle);

</span><span class="cx"> 

</span><ins>+#if ENABLE(MEDIA_STREAM)

+    // FIXME: Remove this and related parameter when &lt;rdar://problem/29448368&gt; is fixed.

+    if (RuntimeEnabledFeatures::sharedFeatures().mediaStreamEnabled())

+        SandboxExtension::createHandleForGenericExtension(&quot;com.apple.webkit.microphone&quot;, parameters.audioCaptureExtensionHandle);

+#endif

+    

</ins><span class="cx">     parameters.shouldUseTestingNetworkSession = m_shouldUseTestingNetworkSession;

</span><span class="cx"> 

</span><span class="cx">     parameters.cacheModel = cacheModel();

</span><span class="lines">@@ -794,8 +802,12 @@

</span><span class="cx">     } else if (pageConfiguration-&gt;relatedPage()) {

</span><span class="cx">         // Sharing processes, e.g. when creating the page via window.open().

</span><span class="cx">         process = &amp;pageConfiguration-&gt;relatedPage()-&gt;process();

</span><del>-    } else

</del><ins>+    } else {

+#if ENABLE(MEDIA_STREAM)

+        RuntimeEnabledFeatures::sharedFeatures().setMediaStreamEnabled(pageConfiguration-&gt;preferences()-&gt;store().getBoolValueForKey(WebPreferencesKey::mediaStreamEnabledKey()));

+#endif

</ins><span class="cx">         process = &amp;createNewWebProcessRespectingProcessCountLimit();

</span><ins>+    }

</ins><span class="cx"> 

</span><span class="cx">     return process-&gt;createWebPage(pageClient, WTFMove(pageConfiguration));

</span><span class="cx"> }

</span></span></pre></div>

<a id="trunkSourceWebKit2WebProcesscocoaWebProcessCocoamm"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm (211469 => 211470)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm        2017-02-01 05:40:17 UTC (rev 211469)

+++ trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm        2017-02-01 06:07:51 UTC (rev 211470)

</span><span class="lines">@@ -1,5 +1,5 @@

</span><span class="cx"> /*

</del><ins>+ * Copyright (C) 2010-2017 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">@@ -99,6 +99,9 @@

</span><span class="cx">     SandboxExtension::consumePermanently(parameters.applicationCacheDirectoryExtensionHandle);

</span><span class="cx">     SandboxExtension::consumePermanently(parameters.mediaCacheDirectoryExtensionHandle);

</span><span class="cx">     SandboxExtension::consumePermanently(parameters.mediaKeyStorageDirectoryExtensionHandle);

</span><ins>+#if ENABLE(MEDIA_STREAM)

+    SandboxExtension::consumePermanently(parameters.audioCaptureExtensionHandle);

+#endif

</ins><span class="cx"> #if PLATFORM(IOS)

</span><span class="cx">     SandboxExtension::consumePermanently(parameters.cookieStorageDirectoryExtensionHandle);

</span><span class="cx">     SandboxExtension::consumePermanently(parameters.containerCachesDirectoryExtensionHandle);

</span></span></pre>

</div>

</div>

</body>

</html>