Changeset 269906 in webkit

Timestamp:

Nov 17, 2020 9:21:49 AM (3 years ago)

Author:

pvollan@apple.com

Message:

[macOS] Perform AX TCC check in the UI process
​https://bugs.webkit.org/show_bug.cgi?id=218870
<rdar://problem/71339830>

Reviewed by Brent Fulgham.

Source/WebCore/PAL:

Add typedef for TCC authentication callback.

• pal/spi/mac/HIServicesSPI.h:

Source/WebKit:

On behalf of the WebContent process, perform AX TCC check in the UI process on macOS.
This is in preparation of blocking tccd in the WebContent process.

No new tests. It has been manually tested that the WebContent process is allowing VoiceOver
to perform AX requests with this patch.

• UIProcess/Cocoa/WebProcessProxyCocoa.mm:

(WebKit::WebProcessProxy::isAXAuthenticated):

• UIProcess/WebProcessProxy.h:
• UIProcess/WebProcessProxy.messages.in:
• WebProcess/cocoa/WebProcessCocoa.mm:

(WebKit::isAXAuthenticatedCallback):
(WebKit::WebProcess::platformInitializeWebProcess):

Location:

trunk/Source

Files:

• WebCore/PAL/ChangeLog (modified) (1 diff)
• WebCore/PAL/pal/spi/mac/HIServicesSPI.h (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/UIProcess/Cocoa/WebProcessProxyCocoa.mm (modified) (2 diffs)
• WebKit/UIProcess/WebProcessProxy.h (modified) (1 diff)
• WebKit/UIProcess/WebProcessProxy.messages.in (modified) (1 diff)
• WebKit/WebProcess/cocoa/WebProcessCocoa.mm (modified) (3 diffs)

trunk/Source/WebCore/PAL/ChangeLog

@@ +1 @@
+2020-11-17  Per Arne Vollan  <pvollan@apple.com>
+
+        [macOS] Perform AX TCC check in the UI process
+        https://bugs.webkit.org/show_bug.cgi?id=218870
+        <rdar://problem/71339830>
+
+        Reviewed by Brent Fulgham.
+
+        Add typedef for TCC authentication callback.
+
+        * pal/spi/mac/HIServicesSPI.h:
+
 2020-11-17  Kimmo Kinnunen  <kkinnunen@apple.com>
 

trunk/Source/WebCore/PAL/pal/spi/mac/HIServicesSPI.h

@@ -157 +157 @@
 #endif // USE(APPLE_INTERNAL_SDK)
 
+WTF_EXTERN_C_BEGIN
+
+typedef Boolean (*AXAuditTokenIsAuthenticatedCallback)(audit_token_t);
+
+WTF_EXTERN_C_END
+
 #define kAXClientTypeWebKitTesting 999999

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-11-17  Per Arne Vollan  <pvollan@apple.com>
+
+        [macOS] Perform AX TCC check in the UI process
+        https://bugs.webkit.org/show_bug.cgi?id=218870
+        <rdar://problem/71339830>
+
+        Reviewed by Brent Fulgham.
+
+        On behalf of the WebContent process, perform AX TCC check in the UI process on macOS.
+        This is in preparation of blocking tccd in the WebContent process.
+
+        No new tests. It has been manually tested that the WebContent process is allowing VoiceOver
+        to perform AX requests with this patch.
+
+        * UIProcess/Cocoa/WebProcessProxyCocoa.mm:
+        (WebKit::WebProcessProxy::isAXAuthenticated):
+        * UIProcess/WebProcessProxy.h:
+        * UIProcess/WebProcessProxy.messages.in:
+        * WebProcess/cocoa/WebProcessCocoa.mm:
+        (WebKit::isAXAuthenticatedCallback):
+        (WebKit::WebProcess::platformInitializeWebProcess):
+
 2020-11-17  Brian Burg  <bburg@apple.com>
 

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

@@ -50 +50 @@
 #endif
 
+#if PLATFORM(MAC)
+#import <wtf/SoftLinking.h>
+
+SOFT_LINK_PRIVATE_FRAMEWORK(TCC)
+SOFT_LINK(TCC, TCCAccessCheckAuditToken, Boolean, (CFStringRef service, audit_token_t auditToken, CFDictionaryRef options), (service, auditToken, options))
+SOFT_LINK_CONSTANT(TCC, kTCCServiceAccessibility, CFStringRef)
+#endif
+
 namespace WebKit {
 
@@ -259 +267 @@
 }
 
-}
+#if PLATFORM(MAC)
+void WebProcessProxy::isAXAuthenticated(audit_token_t auditToken, CompletionHandler<void(bool)>&& completionHandler)
+{
+    auto authenticated = TCCAccessCheckAuditToken(getkTCCServiceAccessibility(), auditToken, nullptr);
+    completionHandler(authenticated);
+}
+#endif
+
+}

trunk/Source/WebKit/UIProcess/WebProcessProxy.h

@@ -509 +509 @@
     void systemBeep();
     
+#if PLATFORM(MAC)
+    void isAXAuthenticated(audit_token_t, CompletionHandler<void(bool)>&&);
+#endif
+
     enum class IsWeak { No, Yes };
     template<typename T> class WeakOrStrongPtr {

trunk/Source/WebKit/UIProcess/WebProcessProxy.messages.in

@@ -89 +89 @@
 
     SystemBeep()
+    
+#if PLATFORM(MAC)
+    IsAXAuthenticated(audit_token_t auditToken) -> (bool authenticated) Synchronous
+#endif
 }

trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm

@@ -152 +152 @@
 #define RELEASE_LOG_ERROR_IF_ALLOWED(channel, fmt, ...) RELEASE_LOG_ERROR_IF(isAlwaysOnLoggingAllowed(), channel, "%p - [sessionID=%" PRIu64 "] WebProcess::" fmt, this, RELEASE_LOG_SESSION_ID, ##__VA_ARGS__)
 
+#if PLATFORM(MAC)
+SOFT_LINK_FRAMEWORK_IN_UMBRELLA(ApplicationServices, HIServices)
+SOFT_LINK_FUNCTION_MAY_FAIL_FOR_SOURCE(WebKit, HIServices, _AXSetAuditTokenIsAuthenticatedCallback, void, (AXAuditTokenIsAuthenticatedCallback callback), (callback))
+#endif
+
 namespace WebKit {
 using namespace WebCore;
@@ -172 +177 @@
 
     return [page->accessibilityRemoteObject() accessibilityFocusedUIElement];
+}
+#endif
+
+
+#if PLATFORM(MAC)
+static Boolean isAXAuthenticatedCallback(audit_token_t auditToken)
+{
+    bool authenticated = false;
+    WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebProcessProxy::IsAXAuthenticated(auditToken), Messages::WebProcessProxy::IsAXAuthenticated::Reply(authenticated), 0);
+    return authenticated;
 }
 #endif
@@ -362 +377 @@
     
     SystemSoundManager::singleton().setSystemSoundDelegate(makeUnique<WebSystemSoundDelegate>());
+
+#if PLATFORM(MAC)
+    if (canLoad_HIServices__AXSetAuditTokenIsAuthenticatedCallback())
+        softLink_HIServices__AXSetAuditTokenIsAuthenticatedCallback(isAXAuthenticatedCallback);
+#endif
 }