<!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>[212451] 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/212451">212451</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2017-02-16 11:40:43 -0800 (Thu, 16 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WebRTC][Mac] Conditionally add sandbox extensions to the Network Process
https://bugs.webkit.org/show_bug.cgi?id=168010
<rdar://problem/30245503>
Reviewed by Youenn Fablet.
Conditionally add sandbox extensions to the Network Process when the WebRTC/Media Capture
features are enabled.
* NetworkProcess/NetworkProcess.h:
* NetworkProcess/NetworkProcessCreationParameters.cpp:
(WebKit::NetworkProcessCreationParameters::encode): Serialize new process configuration flag.
(WebKit::NetworkProcessCreationParameters::decode): Ditto.
* NetworkProcess/NetworkProcessCreationParameters.h:
* NetworkProcess/mac/NetworkProcessMac.mm:
(WebKit::NetworkProcess::platformInitializeNetworkProcess): Remember state of WebRTC for when the
sandbox is established.
(WebKit::NetworkProcess::initializeSandbox): Add ENABLE_WEB_RTC parameter to sandbox launch state.
* NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in: Add conditional sandbox expansion to allow
bidirectional network access when the ENABLE_LIBWEBRTC flag is present in the sandbox launch parameters.
* UIProcess/Cocoa/WebProcessPoolCocoa.mm:
(WebKit::WebProcessPool::platformInitializeWebProcess): Use proper compile guards and check media stream
preference, rather than the peer connection preference.
(WebKit::WebProcessPool::platformInitializeNetworkProcess): Notify NetworkProcess at launch time whether the
user wants WebRTC support.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkProcessh">trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkProcessCreationParameterscpp">trunk/Source/WebKit2/NetworkProcess/NetworkProcessCreationParameters.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkProcessCreationParametersh">trunk/Source/WebKit2/NetworkProcess/NetworkProcessCreationParameters.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessmacNetworkProcessMacmm">trunk/Source/WebKit2/NetworkProcess/mac/NetworkProcessMac.mm</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessmaccomappleWebKitNetworkProcesssbin">trunk/Source/WebKit2/NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaWebProcessPoolCocoamm">trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (212450 => 212451)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-02-16 19:23:50 UTC (rev 212450)
+++ trunk/Source/WebKit2/ChangeLog 2017-02-16 19:40:43 UTC (rev 212451)
</span><span class="lines">@@ -1,5 +1,33 @@
</span><span class="cx"> 2017-02-16 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><ins>+ [WebRTC][Mac] Conditionally add sandbox extensions to the Network Process
+ https://bugs.webkit.org/show_bug.cgi?id=168010
+ <rdar://problem/30245503>
+
+ Reviewed by Youenn Fablet.
+
+ Conditionally add sandbox extensions to the Network Process when the WebRTC/Media Capture
+ features are enabled.
+
+ * NetworkProcess/NetworkProcess.h:
+ * NetworkProcess/NetworkProcessCreationParameters.cpp:
+ (WebKit::NetworkProcessCreationParameters::encode): Serialize new process configuration flag.
+ (WebKit::NetworkProcessCreationParameters::decode): Ditto.
+ * NetworkProcess/NetworkProcessCreationParameters.h:
+ * NetworkProcess/mac/NetworkProcessMac.mm:
+ (WebKit::NetworkProcess::platformInitializeNetworkProcess): Remember state of WebRTC for when the
+ sandbox is established.
+ (WebKit::NetworkProcess::initializeSandbox): Add ENABLE_WEB_RTC parameter to sandbox launch state.
+ * NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in: Add conditional sandbox expansion to allow
+ bidirectional network access when the ENABLE_LIBWEBRTC flag is present in the sandbox launch parameters.
+ * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
+ (WebKit::WebProcessPool::platformInitializeWebProcess): Use proper compile guards and check media stream
+ preference, rather than the peer connection preference.
+ (WebKit::WebProcessPool::platformInitializeNetworkProcess): Notify NetworkProcess at launch time whether the
+ user wants WebRTC support.
+
+2017-02-16 Brent Fulgham <bfulgham@apple.com>
+
</ins><span class="cx"> [WebRTC][Mac][WebKit2] Initial WebProcess does not support WebRTC
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=168438
</span><span class="cx"> <rdar://problem/30401818>
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h (212450 => 212451)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h 2017-02-16 19:23:50 UTC (rev 212450)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h 2017-02-16 19:40:43 UTC (rev 212451)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2012, 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2012-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">@@ -215,6 +215,10 @@
</span><span class="cx"> HashMap<uint64_t, Function<void ()>> m_sandboxExtensionForBlobsCompletionHandlers;
</span><span class="cx"> HashMap<uint64_t, Ref<NetworkResourceLoader>> m_waitingNetworkResourceLoaders;
</span><span class="cx">
</span><ins>+#if ENABLE(WEB_RTC)
+ bool m_webRTCEnabled { false };
+#endif
+
</ins><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> void platformInitializeNetworkProcessCocoa(const NetworkProcessCreationParameters&);
</span><span class="cx"> void setCookieStoragePartitioningEnabled(bool);
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcessCreationParameterscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcessCreationParameters.cpp (212450 => 212451)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcessCreationParameters.cpp 2017-02-16 19:23:50 UTC (rev 212450)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcessCreationParameters.cpp 2017-02-16 19:40:43 UTC (rev 212451)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2012 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2012-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">@@ -102,6 +102,9 @@
</span><span class="cx"> encoder << recordReplayMode;
</span><span class="cx"> encoder << recordReplayCacheLocation;
</span><span class="cx"> #endif
</span><ins>+#if ENABLE(WEB_RTC)
+ encoder << webRTCEnabled;
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool NetworkProcessCreationParameters::decode(IPC::Decoder& decoder, NetworkProcessCreationParameters& result)
</span><span class="lines">@@ -205,6 +208,10 @@
</span><span class="cx"> if (!decoder.decode(result.recordReplayCacheLocation))
</span><span class="cx"> return false;
</span><span class="cx"> #endif
</span><ins>+#if ENABLE(WEB_RTC)
+ if (!decoder.decode(result.webRTCEnabled))
+ return false;
+#endif
</ins><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcessCreationParametersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcessCreationParameters.h (212450 => 212451)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcessCreationParameters.h 2017-02-16 19:23:50 UTC (rev 212450)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcessCreationParameters.h 2017-02-16 19:40:43 UTC (rev 212451)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2012 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2012-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">@@ -113,6 +113,10 @@
</span><span class="cx"> String recordReplayMode;
</span><span class="cx"> String recordReplayCacheLocation;
</span><span class="cx"> #endif
</span><ins>+
+#if ENABLE(WEB_RTC)
+ bool webRTCEnabled { false };
+#endif
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessmacNetworkProcessMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/mac/NetworkProcessMac.mm (212450 => 212451)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/mac/NetworkProcessMac.mm 2017-02-16 19:23:50 UTC (rev 212450)
+++ trunk/Source/WebKit2/NetworkProcess/mac/NetworkProcessMac.mm 2017-02-16 19:40:43 UTC (rev 212451)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2012 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2012-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">@@ -105,6 +105,10 @@
</span><span class="cx">
</span><span class="cx"> if (!parameters.httpProxy.isNull() || !parameters.httpsProxy.isNull())
</span><span class="cx"> overrideSystemProxies(parameters.httpProxy, parameters.httpsProxy);
</span><ins>+
+#if ENABLE(WEB_RTC)
+ m_webRTCEnabled = parameters.webRTCEnabled;
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void NetworkProcess::allowSpecificHTTPSCertificateForHost(const CertificateInfo& certificateInfo, const String& host)
</span><span class="lines">@@ -118,6 +122,11 @@
</span><span class="cx"> NSBundle *webkit2Bundle = [NSBundle bundleForClass:NSClassFromString(@"WKView")];
</span><span class="cx"> sandboxParameters.setOverrideSandboxProfilePath([webkit2Bundle pathForResource:@"com.apple.WebKit.NetworkProcess" ofType:@"sb"]);
</span><span class="cx">
</span><ins>+#if ENABLE(WEB_RTC)
+ if (m_webRTCEnabled)
+ sandboxParameters.addParameter("ENABLE_WEB_RTC", "TRUE");
+#endif
+
</ins><span class="cx"> ChildProcess::initializeSandbox(parameters, sandboxParameters);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessmaccomappleWebKitNetworkProcesssbin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in (212450 => 212451)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in 2017-02-16 19:23:50 UTC (rev 212450)
+++ trunk/Source/WebKit2/NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in 2017-02-16 19:40:43 UTC (rev 212451)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-; Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</del><ins>+; Copyright (C) 2013-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">@@ -208,3 +208,9 @@
</span><span class="cx"> ;; FIXME: Should be removed after <rdar://problem/10463881> is fixed.
</span><span class="cx"> (home-literal "/Library/Preferences/com.apple.LaunchServices.QuarantineEventsV2")
</span><span class="cx"> (home-literal "/Library/Preferences/com.apple.LaunchServices.QuarantineEventsV2-journal"))
</span><ins>+
+#if ENABLE_WEB_RTC
+;; FIXME should be removed when <rdar://problem/30498072> is fixed.
+(if (positive? (string-length (param "ENABLE_WEB_RTC")))
+ (allow network*))
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaWebProcessPoolCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm (212450 => 212451)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2017-02-16 19:23:50 UTC (rev 212450)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2017-02-16 19:40:43 UTC (rev 212451)
</span><span class="lines">@@ -246,12 +246,12 @@
</span><span class="cx"> parameters.uiProcessCookieStorageIdentifier.append(CFDataGetBytePtr(cookieStorageData.get()), CFDataGetLength(cookieStorageData.get()));
</span><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(MEDIA_STREAM)
</span><del>- bool webRTCEnabled = m_defaultPageGroup->preferences().peerConnectionEnabled();
</del><ins>+ bool mediaStreamEnabled = m_defaultPageGroup->preferences().mediaStreamEnabled();
</ins><span class="cx"> if ([defaults objectForKey:@"ExperimentalPeerConnectionEnabled"])
</span><del>- webRTCEnabled = [defaults boolForKey:@"ExperimentalPeerConnectionEnabled"];
</del><ins>+ mediaStreamEnabled = [defaults boolForKey:@"ExperimentalPeerConnectionEnabled"];
</ins><span class="cx">
</span><span class="cx"> // FIXME: Remove this and related parameter when <rdar://problem/29448368> is fixed.
</span><del>- if (webRTCEnabled)
</del><ins>+ if (mediaStreamEnabled)
</ins><span class="cx"> SandboxExtension::createHandleForGenericExtension("com.apple.webkit.microphone", parameters.audioCaptureExtensionHandle);
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="lines">@@ -304,6 +304,13 @@
</span><span class="cx"> if (parameters.recordReplayCacheLocation.isEmpty())
</span><span class="cx"> parameters.recordReplayCacheLocation = parameters.diskCacheDirectory;
</span><span class="cx"> #endif
</span><ins>+#if ENABLE(WEB_RTC)
+ bool webRTCEnabled = m_defaultPageGroup->preferences().peerConnectionEnabled();
+ if ([defaults objectForKey:@"ExperimentalPeerConnectionEnabled"])
+ webRTCEnabled = [defaults boolForKey:@"ExperimentalPeerConnectionEnabled"];
+
+ parameters.webRTCEnabled = webRTCEnabled;
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebProcessPool::platformInvalidateContext()
</span></span></pre>
</div>
</div>
</body>
</html>