Changeset 294831 in webkit

Timestamp:

May 25, 2022, 3:45:26 PM (4 years ago)

Author:

Brent Fulgham

Message:

Prevent NSAttributedString crashes when AppSSO URLs are provided
​https://bugs.webkit.org/show_bug.cgi?id=240739
<rdar://93656000>

Reviewed by Chris Dumez.

When NSAttributedString is used in a sandboxed app, it is prevented from checking in with the
AppSSO plugin manager, causing a Sandbox Violation and crash. We don't want NSAttributedString
to ever hand-off to AppSSO, so we should configure it's internal WKWebView to do the right thing.
Reviewed by Chris Dumez.

• Source/WebKit/UIProcess/API/Cocoa/NSAttributedString.mm:

(+[_WKAttributedStringWebViewCache configuration]): Turn off AppSSO for string uses.

• Source/WebKit/UIProcess/Cocoa/NavigationState.mm:

(WebKit::trySOAuthorization): Use new lazy loading approach.

• Source/WebKit/UIProcess/WebPageProxy.cpp:

(WebKit::trySOAuthorization): Ditto.

• Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp:

(WebKit::WebsiteDataStore::WebsiteDataStore):
(WebKit::WebsiteDataStore::soAuthorizationCoordinator): Lazily initialize, and RELEASE_ASSERT
if we somehow reach this code without enabling AppSSO.

• Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h:

(WebKit::WebsiteDataStore::soAuthorizationCoordinator): Deleted.

Canonical link: ​https://commits.webkit.org/250981@main

Location:

trunk/Source/WebKit/UIProcess

Files:

• API/Cocoa/NSAttributedString.mm (modified) (2 diffs)
• Cocoa/NavigationState.mm (modified) (1 diff)
• WebPageProxy.cpp (modified) (1 diff)
• WebsiteData/WebsiteDataStore.cpp (modified) (3 diffs)
• WebsiteData/WebsiteDataStore.h (modified) (3 diffs)

trunk/Source/WebKit/UIProcess/API/Cocoa/NSAttributedString.mm

@@ -1 +1 @@
 /*
- * Copyright (C) 2019 Apple Inc. All rights reserved.
+ * Copyright (C) 2019-2022 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -145 +145 @@
         [configuration _setAllowsMetaRefresh:NO];
         [configuration _setAttachmentElementEnabled:YES];
+        [configuration preferences]._extensibleSSOEnabled = NO;
         [configuration _setInvisibleAutoplayNotPermitted:YES];
         [configuration _setMediaDataLoadsAutomatically:NO];

trunk/Source/WebKit/UIProcess/Cocoa/NavigationState.mm

@@ -425 +425 @@
         return;
     }
-    page.websiteDataStore().soAuthorizationCoordinator().tryAuthorize(WTFMove(navigationAction), page, WTFMove(completionHandler));
+    page.websiteDataStore().soAuthorizationCoordinator(page).tryAuthorize(WTFMove(navigationAction), page, WTFMove(completionHandler));
 #else
     completionHandler(false);

trunk/Source/WebKit/UIProcess/WebPageProxy.cpp

@@ -5997 +5997 @@
 {
 #if HAVE(APP_SSO)
-    page.websiteDataStore().soAuthorizationCoordinator().tryAuthorize(WTFMove(navigationAction), page, WTFMove(newPageCallback), WTFMove(uiClientCallback));
+    page.websiteDataStore().soAuthorizationCoordinator(page).tryAuthorize(WTFMove(navigationAction), page, WTFMove(newPageCallback), WTFMove(uiClientCallback));
 #else
     uiClientCallback(WTFMove(navigationAction), WTFMove(newPageCallback));

trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2014-2020 Apple Inc. All rights reserved.
+ * Copyright (C) 2014-2022 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -136 +136 @@
 #endif
     , m_client(makeUniqueRef<WebsiteDataStoreClient>())
-#if HAVE(APP_SSO)
-    , m_soAuthorizationCoordinator(makeUniqueRef<SOAuthorizationCoordinator>())
-#endif
     , m_webLockRegistry(WebCore::LocalWebLockRegistry::create())
 {
@@ -208 +205 @@
     return allDataStores().get(sessionID);
 }
+
+#if HAVE(APP_SSO)
+SOAuthorizationCoordinator& WebsiteDataStore::soAuthorizationCoordinator(const WebPageProxy& pageProxy)
+{
+    RELEASE_ASSERT(pageProxy.preferences().isExtensibleSSOEnabled());
+    if (!m_soAuthorizationCoordinator)
+        m_soAuthorizationCoordinator = WTF::makeUnique<SOAuthorizationCoordinator>();
+
+    return *m_soAuthorizationCoordinator;
+}
+#endif
 
 static Ref<NetworkProcessProxy> networkProcessForSession(PAL::SessionID sessionID)

trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2014-2020 Apple Inc. All rights reserved.
+ * Copyright (C) 2014-2022 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -337 +337 @@
 
 #if HAVE(APP_SSO)
-    SOAuthorizationCoordinator& soAuthorizationCoordinator() { return m_soAuthorizationCoordinator.get(); }
+    SOAuthorizationCoordinator& soAuthorizationCoordinator(const WebPageProxy&);
 #endif
 
@@ -489 +489 @@
 
 #if HAVE(APP_SSO)
-    UniqueRef<SOAuthorizationCoordinator> m_soAuthorizationCoordinator;
+    std::unique_ptr<SOAuthorizationCoordinator> m_soAuthorizationCoordinator;
 #endif
 #if ENABLE(INTELLIGENT_TRACKING_PREVENTION)