Title: [246446] trunk/Source
Revision
246446
Author
[email protected]
Date
2019-06-14 14:39:07 -0700 (Fri, 14 Jun 2019)

Log Message

Disable AppSSO for web processes and plugin processes
https://bugs.webkit.org/show_bug.cgi?id=198843
<rdar://problem/51642920>

Reviewed by Sam Weinig.

Source/WebCore/PAL:

* pal/spi/cf/CFNetworkSPI.h:
Adds a SPI to disable AppSSO for CFNetwork.

Source/WebKit:

This patch moves the disabling of AppSSO from AuxiliaryProcess to PluginProcess
and WebProcess such that NetworkingProcess will not be affected.

* PluginProcess/mac/PluginProcessMac.mm:
(WebKit::PluginProcess::platformInitializePluginProcess):
* Shared/ios/AuxiliaryProcessIOS.mm:
(WebKit::AuxiliaryProcess::platformInitialize):
* Shared/mac/AuxiliaryProcessMac.mm:
(WebKit::AuxiliaryProcess::platformInitialize):
* WebProcess/cocoa/WebProcessCocoa.mm:
(WebKit::WebProcess::platformInitializeProcess):

Modified Paths

Diff

Modified: trunk/Source/WebCore/PAL/ChangeLog (246445 => 246446)


--- trunk/Source/WebCore/PAL/ChangeLog	2019-06-14 21:17:02 UTC (rev 246445)
+++ trunk/Source/WebCore/PAL/ChangeLog	2019-06-14 21:39:07 UTC (rev 246446)
@@ -1,3 +1,14 @@
+2019-06-14  Jiewen Tan  <[email protected]>
+
+        Disable AppSSO for web processes and plugin processes
+        https://bugs.webkit.org/show_bug.cgi?id=198843
+        <rdar://problem/51642920>
+
+        Reviewed by Sam Weinig.
+
+        * pal/spi/cf/CFNetworkSPI.h:
+        Adds a SPI to disable AppSSO for CFNetwork.
+
 2019-06-12  Antoine Quint  <[email protected]>
 
         Show the web page URL when sharing an AR model

Modified: trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h (246445 => 246446)


--- trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h	2019-06-14 21:17:02 UTC (rev 246445)
+++ trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h	2019-06-14 21:39:07 UTC (rev 246446)
@@ -232,11 +232,14 @@
 @end
 #endif
 
+@interface NSURLSession (SPI)
 #if HAVE(CFNETWORK_NSURLSESSION_STRICTRUSTEVALUATE)
-@interface NSURLSession (SPI)
 + (void)_strictTrustEvaluate:(NSURLAuthenticationChallenge *)challenge queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSURLAuthenticationChallenge *challenge, OSStatus trustResult))cb;
+#endif
+#if HAVE(LOAD_OPTIMIZER)
++ (void)_disableAppSSO;
+#endif
 @end
-#endif
 
 extern NSString * const NSURLAuthenticationMethodOAuth;
 

Modified: trunk/Source/WebKit/ChangeLog (246445 => 246446)


--- trunk/Source/WebKit/ChangeLog	2019-06-14 21:17:02 UTC (rev 246445)
+++ trunk/Source/WebKit/ChangeLog	2019-06-14 21:39:07 UTC (rev 246446)
@@ -1,3 +1,23 @@
+2019-06-14  Jiewen Tan  <[email protected]>
+
+        Disable AppSSO for web processes and plugin processes
+        https://bugs.webkit.org/show_bug.cgi?id=198843
+        <rdar://problem/51642920>
+
+        Reviewed by Sam Weinig.
+
+        This patch moves the disabling of AppSSO from AuxiliaryProcess to PluginProcess
+        and WebProcess such that NetworkingProcess will not be affected.
+
+        * PluginProcess/mac/PluginProcessMac.mm:
+        (WebKit::PluginProcess::platformInitializePluginProcess):
+        * Shared/ios/AuxiliaryProcessIOS.mm:
+        (WebKit::AuxiliaryProcess::platformInitialize):
+        * Shared/mac/AuxiliaryProcessMac.mm:
+        (WebKit::AuxiliaryProcess::platformInitialize):
+        * WebProcess/cocoa/WebProcessCocoa.mm:
+        (WebKit::WebProcess::platformInitializeProcess):
+
 2019-06-14  Megan Gardner  <[email protected]>
 
         Move Synthetic Editing Commands to behind an experimental feature flag

Modified: trunk/Source/WebKit/PluginProcess/mac/PluginProcessMac.mm (246445 => 246446)


--- trunk/Source/WebKit/PluginProcess/mac/PluginProcessMac.mm	2019-06-14 21:17:02 UTC (rev 246445)
+++ trunk/Source/WebKit/PluginProcess/mac/PluginProcessMac.mm	2019-06-14 21:39:07 UTC (rev 246446)
@@ -47,6 +47,7 @@
 #import <mach/mach_vm.h>
 #import <mach/vm_statistics.h>
 #import <objc/runtime.h>
+#import <pal/spi/cf/CFNetworkSPI.h>
 #import <pal/spi/cg/CoreGraphicsSPI.h>
 #import <pal/spi/cocoa/LaunchServicesSPI.h>
 #import <pal/spi/mac/HIToolboxSPI.h>
@@ -404,6 +405,9 @@
     // Disable Dark Mode in the plugin process to avoid rendering issues.
     [NSApp setAppearance:[NSAppearance appearanceNamed:NSAppearanceNameAqua]];
 #endif
+#if HAVE(LOAD_OPTIMIZER)
+    [NSURLSession _disableAppSSO];
+#endif
 }
 
 void PluginProcess::platformInitializeProcess(const AuxiliaryProcessInitializationParameters& parameters)

Modified: trunk/Source/WebKit/Shared/ios/AuxiliaryProcessIOS.mm (246445 => 246446)


--- trunk/Source/WebKit/Shared/ios/AuxiliaryProcessIOS.mm	2019-06-14 21:17:02 UTC (rev 246445)
+++ trunk/Source/WebKit/Shared/ios/AuxiliaryProcessIOS.mm	2019-06-14 21:39:07 UTC (rev 246446)
@@ -43,10 +43,6 @@
 #import <wtf/spi/darwin/SandboxSPI.h>
 #endif
 
-#if USE(APPLE_INTERNAL_SDK)
-#include <WebKitAdditions/AuxiliaryProcessAdditions.h>
-#endif
-
 namespace WebKit {
 
 void AuxiliaryProcess::platformInitialize()
@@ -55,9 +51,6 @@
     floatingPointEnvironment.enableDenormalSupport(); 
     floatingPointEnvironment.saveMainThreadEnvironment(); 
     [[NSFileManager defaultManager] changeCurrentDirectoryPath:[[NSBundle mainBundle] bundlePath]];
-#if HAVE(LOAD_OPTIMIZER)
-AUXILIARYPROCESS_LOADOPTIMIZER_ADDITIONS
-#endif
 }
 
 void AuxiliaryProcess::initializeSandbox(const AuxiliaryProcessInitializationParameters& parameters, SandboxInitializationParameters& sandboxParameters)

Modified: trunk/Source/WebKit/Shared/mac/AuxiliaryProcessMac.mm (246445 => 246446)


--- trunk/Source/WebKit/Shared/mac/AuxiliaryProcessMac.mm	2019-06-14 21:17:02 UTC (rev 246445)
+++ trunk/Source/WebKit/Shared/mac/AuxiliaryProcessMac.mm	2019-06-14 21:39:07 UTC (rev 246446)
@@ -57,7 +57,6 @@
 
 #if USE(APPLE_INTERNAL_SDK)
 #import <ApplicationServices/ApplicationServicesPriv.h>
-#import <WebKitAdditions/AuxiliaryProcessAdditions.h>
 #import <rootless.h>
 #endif
 
@@ -160,9 +159,6 @@
 {
     initializeTimerCoalescingPolicy();
     [[NSFileManager defaultManager] changeCurrentDirectoryPath:[[NSBundle mainBundle] bundlePath]];
-#if HAVE(LOAD_OPTIMIZER)
-AUXILIARYPROCESS_LOADOPTIMIZER_ADDITIONS
-#endif
 }
 
 static OSStatus enableSandboxStyleFileQuarantine()

Modified: trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm (246445 => 246446)


--- trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm	2019-06-14 21:17:02 UTC (rev 246445)
+++ trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm	2019-06-14 21:39:07 UTC (rev 246446)
@@ -67,6 +67,7 @@
 #import <algorithm>
 #import <dispatch/dispatch.h>
 #import <objc/runtime.h>
+#import <pal/spi/cf/CFNetworkSPI.h>
 #import <pal/spi/cf/CFUtilitiesSPI.h>
 #import <pal/spi/cg/CoreGraphicsSPI.h>
 #import <pal/spi/cocoa/LaunchServicesSPI.h>
@@ -455,6 +456,10 @@
 #if USE(OS_STATE)
     registerWithStateDumper();
 #endif
+
+#if HAVE(LOAD_OPTIMIZER)
+    [NSURLSession _disableAppSSO];
+#endif
 }
 
 #if USE(APPKIT)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to