Title: [217871] trunk/Source/WebKit2
- Revision
- 217871
- Author
- [email protected]
- Date
- 2017-06-06 20:25:12 -0700 (Tue, 06 Jun 2017)
Log Message
[WK2][Cocoa] Allow network process to bind addresses without webrtc extension
https://bugs.webkit.org/show_bug.cgi?id=173032
<rdar://problem/32597426>
Reviewed by Youenn Fablet.
Remove the unnecessary WebRTC sandbox extension handle and conditional sandbox rules, since we've
decided that all WebKit clients should be able to use the WebRTC protocol.
* NetworkProcess/NetworkProcessCreationParameters.cpp:
(WebKit::NetworkProcessCreationParameters::encode): Remove unused sandbox extension from serialization.
(WebKit::NetworkProcessCreationParameters::decode): Ditto.
* NetworkProcess/NetworkProcessCreationParameters.h:
* NetworkProcess/cocoa/NetworkProcessCocoa.mm:
(WebKit::NetworkProcess::platformInitializeNetworkProcessCocoa): We no longer send the sandbox extension,
so don't attempt to consume it.
* NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in: Remove check for 'com.apple.webkit.webrtc'
extension. Make rules conditional on building with WEB_RTC feature enabled.
* Resources/SandboxProfiles/ios/com.apple.WebKit.Networking.sb: Remove check for 'com.apple.webkit.webrtc'
* UIProcess/Cocoa/WebProcessPoolCocoa.mm:
(WebKit::WebProcessPool::platformInitializeNetworkProcess): Do not create unnecessary sandbox extension
handle.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (217870 => 217871)
--- trunk/Source/WebKit2/ChangeLog 2017-06-07 02:17:27 UTC (rev 217870)
+++ trunk/Source/WebKit2/ChangeLog 2017-06-07 03:25:12 UTC (rev 217871)
@@ -1,3 +1,28 @@
+2017-06-06 Brent Fulgham <[email protected]>
+
+ [WK2][Cocoa] Allow network process to bind addresses without webrtc extension
+ https://bugs.webkit.org/show_bug.cgi?id=173032
+ <rdar://problem/32597426>
+
+ Reviewed by Youenn Fablet.
+
+ Remove the unnecessary WebRTC sandbox extension handle and conditional sandbox rules, since we've
+ decided that all WebKit clients should be able to use the WebRTC protocol.
+
+ * NetworkProcess/NetworkProcessCreationParameters.cpp:
+ (WebKit::NetworkProcessCreationParameters::encode): Remove unused sandbox extension from serialization.
+ (WebKit::NetworkProcessCreationParameters::decode): Ditto.
+ * NetworkProcess/NetworkProcessCreationParameters.h:
+ * NetworkProcess/cocoa/NetworkProcessCocoa.mm:
+ (WebKit::NetworkProcess::platformInitializeNetworkProcessCocoa): We no longer send the sandbox extension,
+ so don't attempt to consume it.
+ * NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in: Remove check for 'com.apple.webkit.webrtc'
+ extension. Make rules conditional on building with WEB_RTC feature enabled.
+ * Resources/SandboxProfiles/ios/com.apple.WebKit.Networking.sb: Remove check for 'com.apple.webkit.webrtc'
+ * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
+ (WebKit::WebProcessPool::platformInitializeNetworkProcess): Do not create unnecessary sandbox extension
+ handle.
+
2017-06-06 Tim Horton <[email protected]>
Crash trying to drag the entire text of a long book out of Mail compose view
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcessCreationParameters.cpp (217870 => 217871)
--- trunk/Source/WebKit2/NetworkProcess/NetworkProcessCreationParameters.cpp 2017-06-07 02:17:27 UTC (rev 217870)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcessCreationParameters.cpp 2017-06-07 03:25:12 UTC (rev 217871)
@@ -100,9 +100,6 @@
encoder << recordReplayMode;
encoder << recordReplayCacheLocation;
#endif
-#if ENABLE(WEB_RTC)
- encoder << webRTCNetworkingHandle;
-#endif
}
bool NetworkProcessCreationParameters::decode(IPC::Decoder& decoder, NetworkProcessCreationParameters& result)
@@ -209,11 +206,6 @@
return false;
#endif
-#if ENABLE(WEB_RTC)
- if (!decoder.decode(result.webRTCNetworkingHandle))
- return false;
-#endif
-
return true;
}
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcessCreationParameters.h (217870 => 217871)
--- trunk/Source/WebKit2/NetworkProcess/NetworkProcessCreationParameters.h 2017-06-07 02:17:27 UTC (rev 217870)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcessCreationParameters.h 2017-06-07 03:25:12 UTC (rev 217871)
@@ -114,9 +114,6 @@
String recordReplayMode;
String recordReplayCacheLocation;
#endif
-#if ENABLE(WEB_RTC)
- SandboxExtension::Handle webRTCNetworkingHandle;
-#endif
};
} // namespace WebKit
Modified: trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm (217870 => 217871)
--- trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2017-06-07 02:17:27 UTC (rev 217870)
+++ trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2017-06-07 03:25:12 UTC (rev 217871)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014, 2015 Apple Inc. All rights reserved.
+ * Copyright (C) 2014-2017 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -72,9 +72,6 @@
SandboxExtension::consumePermanently(parameters.containerCachesDirectoryExtensionHandle);
SandboxExtension::consumePermanently(parameters.parentBundleDirectoryExtensionHandle);
#endif
-#if ENABLE(WEB_RTC)
- SandboxExtension::consumePermanently(parameters.webRTCNetworkingHandle);
-#endif
m_diskCacheDirectory = parameters.diskCacheDirectory;
#if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
Modified: trunk/Source/WebKit2/NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in (217870 => 217871)
--- trunk/Source/WebKit2/NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in 2017-06-07 02:17:27 UTC (rev 217870)
+++ trunk/Source/WebKit2/NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in 2017-06-07 03:25:12 UTC (rev 217871)
@@ -273,9 +273,9 @@
(set! allow orig-allow))))
;; FIXME should be removed when <rdar://problem/30498072> is fixed.
-(with-filter (extension "com.apple.webkit.webrtc")
- (allow network*
- (local udp)
- (remote udp)
- (local tcp)
- (remote tcp)))
+(allow network*
+ (local udp)
+ (remote udp)
+ (local tcp)
+ (remote tcp))
+
Modified: trunk/Source/WebKit2/Resources/SandboxProfiles/ios/com.apple.WebKit.Networking.sb (217870 => 217871)
--- trunk/Source/WebKit2/Resources/SandboxProfiles/ios/com.apple.WebKit.Networking.sb 2017-06-07 02:17:27 UTC (rev 217870)
+++ trunk/Source/WebKit2/Resources/SandboxProfiles/ios/com.apple.WebKit.Networking.sb 2017-06-07 03:25:12 UTC (rev 217871)
@@ -77,12 +77,11 @@
(vnode-type SYMLINK))
;; FIXME should be removed when <rdar://problem/30498072> is fixed.
-(with-filter (extension "com.apple.webkit.webrtc")
- (allow network*
- (local udp)
- (remote udp)
- (local tcp)
- (remote tcp)))
+(allow network*
+ (local udp)
+ (remote udp)
+ (local tcp)
+ (remote tcp))
;; Various services required by system frameworks
(allow mach-lookup
Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm (217870 => 217871)
--- trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2017-06-07 02:17:27 UTC (rev 217870)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2017-06-07 03:25:12 UTC (rev 217871)
@@ -303,14 +303,6 @@
if (parameters.recordReplayCacheLocation.isEmpty())
parameters.recordReplayCacheLocation = parameters.diskCacheDirectory;
#endif
-#if ENABLE(WEB_RTC)
- bool webRTCEnabled = m_defaultPageGroup->preferences().peerConnectionEnabled();
- if ([defaults objectForKey:@"ExperimentalPeerConnectionEnabled"])
- webRTCEnabled = [defaults boolForKey:@"ExperimentalPeerConnectionEnabled"];
-
- if (webRTCEnabled)
- SandboxExtension::createHandleForGenericExtension("com.apple.webkit.webrtc", parameters.webRTCNetworkingHandle);
-#endif
}
void WebProcessPool::platformInvalidateContext()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
