Attachment 372079 Details for Bug 198843 – Patch

[patch] Patch

bug-198843-20190613143853.patch (text/plain), 6.40 KB, created by Jiewen Tan on 2019-06-13 14:38:54 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Jiewen Tan

Created: 2019-06-13 14:38:54 PDT

Size: 6.40 KB

patch

obsolete

>Subversion Revision: 246344
>diff --git a/Source/WebCore/PAL/ChangeLog b/Source/WebCore/PAL/ChangeLog
>index 96691b28fca4c228d042055b67f94a51148bfa24..79ec57fc0bc9ce688621292432e0e3c3990c5c6b 100644
>--- a/Source/WebCore/PAL/ChangeLog
>+++ b/Source/WebCore/PAL/ChangeLog
>@@ -1,3 +1,14 @@
>+2019-06-13  Jiewen Tan  <jiewen_tan@apple.com>
>+
>+        Disable AppSSO for web processes and plugin processes
>+        https://bugs.webkit.org/show_bug.cgi?id=198843
>+        <rdar://problem/51642920>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * pal/spi/cf/CFNetworkSPI.h:
>+        Adds a SPI to disable AppSSO for CFNetwork.
>+
> 2019-06-10  Sam Weinig  <weinig@apple.com>
> 
>         Remove Dashboard support
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 8aa72248cb69be0f02c7c49bf399145a38d8622a..72dd436150e3117e81ab09efea45a8722988314f 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,23 @@
>+2019-06-13  Jiewen Tan  <jiewen_tan@apple.com>
>+
>+        Disable AppSSO for web processes and plugin processes
>+        https://bugs.webkit.org/show_bug.cgi?id=198843
>+        <rdar://problem/51642920>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        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-11  Patrick Griffis  <pgriffis@igalia.com>
> 
>         [GTK] Fix a11y support in bubblewrap sandbox
>diff --git a/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h b/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h
>index 897af04f685c58ea3f64fb8631f770eb7b6b074f..182ff8be651a8d262cc68643f2daddd266594b75 100644
>--- a/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h
>+++ b/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h
>@@ -232,11 +232,14 @@ typedef NS_ENUM(NSInteger, NSURLSessionCompanionProxyPreference) {
> @end
> #endif
> 
>-#if HAVE(CFNETWORK_NSURLSESSION_STRICTRUSTEVALUATE)
> @interface NSURLSession (SPI)
>+#if HAVE(CFNETWORK_NSURLSESSION_STRICTRUSTEVALUATE)
> + (void)_strictTrustEvaluate:(NSURLAuthenticationChallenge *)challenge queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSURLAuthenticationChallenge *challenge, OSStatus trustResult))cb;
>-@end
> #endif
>+#if HAVE(LOAD_OPTIMIZER)
>++ (void)_disableAppSSO;
>+#endif
>+@end
> 
> extern NSString * const NSURLAuthenticationMethodOAuth;
> 
>diff --git a/Source/WebKit/PluginProcess/mac/PluginProcessMac.mm b/Source/WebKit/PluginProcess/mac/PluginProcessMac.mm
>index bd3ab080bcc7b5303f7321f0ea0eb2d421f983ff..787bcbae41055c57b4f59aae6d5f9822d31605a6 100644
>--- a/Source/WebKit/PluginProcess/mac/PluginProcessMac.mm
>+++ b/Source/WebKit/PluginProcess/mac/PluginProcessMac.mm
>@@ -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 @@ void PluginProcess::platformInitializePluginProcess(PluginProcessCreationParamet
>     // 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)
>diff --git a/Source/WebKit/Shared/ios/AuxiliaryProcessIOS.mm b/Source/WebKit/Shared/ios/AuxiliaryProcessIOS.mm
>index 00e243cfd97ad2c2934b6e2c5021dd04899668e2..e5e946f97339aa7aae079dd83e5de12813f97581 100644
>--- a/Source/WebKit/Shared/ios/AuxiliaryProcessIOS.mm
>+++ b/Source/WebKit/Shared/ios/AuxiliaryProcessIOS.mm
>@@ -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 @@ void AuxiliaryProcess::platformInitialize()
>     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)
>diff --git a/Source/WebKit/Shared/mac/AuxiliaryProcessMac.mm b/Source/WebKit/Shared/mac/AuxiliaryProcessMac.mm
>index ac0f2d87a2ba39fe63ac6d0342665fe3473867c8..b157fcbcc7da3dfbf5e73c9f07f0f87677edf805 100644
>--- a/Source/WebKit/Shared/mac/AuxiliaryProcessMac.mm
>+++ b/Source/WebKit/Shared/mac/AuxiliaryProcessMac.mm
>@@ -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 @@ void AuxiliaryProcess::platformInitialize()
> {
>     initializeTimerCoalescingPolicy();
>     [[NSFileManager defaultManager] changeCurrentDirectoryPath:[[NSBundle mainBundle] bundlePath]];
>-#if HAVE(LOAD_OPTIMIZER)
>-AUXILIARYPROCESS_LOADOPTIMIZER_ADDITIONS
>-#endif
> }
> 
> static OSStatus enableSandboxStyleFileQuarantine()
>diff --git a/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm b/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm
>index b9ce79d274c4127ba78f54a52f637e95e851f6ac..b85c714c2f0e8657d25fe3abcb385a74836c19e9 100644
>--- a/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm
>+++ b/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm
>@@ -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>
>@@ -461,6 +462,10 @@ void WebProcess::platformInitializeProcess(const AuxiliaryProcessInitializationP
> #if USE(OS_STATE)
>     registerWithStateDumper();
> #endif
>+
>+#if HAVE(LOAD_OPTIMIZER)
>+    [NSURLSession _disableAppSSO];
>+#endif
> }
> 
> #if USE(APPKIT)

Actions: View | Formatted Diff | Diff

Attachments on bug 198843: 372079