Changeset 283394 in webkit

Timestamp:

Oct 1, 2021, 1:32:42 PM (5 years ago)

Author:

Kate Cheney

Message:

GPU Process microphone attribution SPI adoption
​https://bugs.webkit.org/show_bug.cgi?id=231034
<rdar://problem/83732537>

Reviewed by Youenn Fablet.

Source/WebCore:

No new tests. Tested manually by inspecting APR JSON files.

• platform/audio/AudioSession.h:
• platform/audio/ios/AudioSessionIOS.h:
• platform/audio/ios/AudioSessionIOS.mm:

(WebCore::AudioSessionIOS::setHostProcessAttribution):

Source/WebCore/PAL:

• pal/spi/cocoa/LaunchServicesSPI.h:

Source/WebKit:

Adopt SPI for App Privacy Report that attributes mic capture to the
host app.

• GPUProcess/GPUConnectionToWebProcess.cpp:

(WebKit::GPUConnectionToWebProcess::audioSessionProxy):

• GPUProcess/media/RemoteAudioSessionProxyManager.cpp:

(WebKit::RemoteAudioSessionProxyManager::addProxy):

• GPUProcess/media/RemoteAudioSessionProxyManager.h:
• Scripts/process-entitlements.sh:

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/PAL/ChangeLog (modified) (1 diff)
• WebCore/PAL/pal/spi/cocoa/LaunchServicesSPI.h (modified) (1 diff)
• WebCore/platform/audio/AudioSession.h (modified) (1 diff)
• WebCore/platform/audio/ios/AudioSessionIOS.h (modified) (1 diff)
• WebCore/platform/audio/ios/AudioSessionIOS.mm (modified) (2 diffs)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/GPUProcess/GPUConnectionToWebProcess.cpp (modified) (1 diff)
• WebKit/GPUProcess/media/RemoteAudioSessionProxyManager.cpp (modified) (1 diff)
• WebKit/GPUProcess/media/RemoteAudioSessionProxyManager.h (modified) (1 diff)
• WebKit/Scripts/process-entitlements.sh (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-10-01  Kate Cheney  <katherine_cheney@apple.com>
+
+        GPU Process microphone attribution SPI adoption
+        https://bugs.webkit.org/show_bug.cgi?id=231034
+        <rdar://problem/83732537>
+
+        Reviewed by Youenn Fablet.
+
+        No new tests. Tested manually by inspecting APR JSON files.
+
+        * platform/audio/AudioSession.h:
+        * platform/audio/ios/AudioSessionIOS.h:
+        * platform/audio/ios/AudioSessionIOS.mm:
+        (WebCore::AudioSessionIOS::setHostProcessAttribution):
+
 2021-10-01  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/PAL/ChangeLog

@@ +1 @@
+2021-10-01  Kate Cheney  <katherine_cheney@apple.com>
+
+        GPU Process microphone attribution SPI adoption
+        https://bugs.webkit.org/show_bug.cgi?id=231034
+        <rdar://problem/83732537>
+
+        Reviewed by Youenn Fablet.
+
+        * pal/spi/cocoa/LaunchServicesSPI.h:
+
 2021-09-30  Devin Rousso  <drousso@apple.com>
 

trunk/Source/WebCore/PAL/pal/spi/cocoa/LaunchServicesSPI.h

@@ -56 +56 @@
 
 @interface LSBundleProxy : LSResourceProxy <NSSecureCoding>
++ (LSBundleProxy *)bundleProxyWithAuditToken:(audit_token_t)auditToken error:(NSError **)outError;
+@property (nonatomic, readonly) NSString *bundleIdentifier;
 @end
 

trunk/Source/WebCore/platform/audio/AudioSession.h

@@ -131 +131 @@
     static void setShouldManageAudioSessionCategory(bool flag) { s_shouldManageAudioSessionCategory = flag; }
 
+    virtual void setHostProcessAttribution(audit_token_t) { };
+
 protected:
     friend class NeverDestroyed<AudioSession>;

trunk/Source/WebCore/platform/audio/ios/AudioSessionIOS.h

@@ -43 +43 @@
     virtual ~AudioSessionIOS();
 
+    void setHostProcessAttribution(audit_token_t) final;
+
 private:
     // AudioSession

trunk/Source/WebCore/platform/audio/ios/AudioSessionIOS.mm

@@ -33 +33 @@
 #import <objc/runtime.h>
 #import <pal/spi/cocoa/AVFoundationSPI.h>
+#import <pal/spi/cocoa/LaunchServicesSPI.h>
 #import <wtf/BlockObjCExceptions.h>
 #import <wtf/RetainPtr.h>
@@ -136 +137 @@
     [m_interruptionObserverHelper clearCallback];
 }
+
+void AudioSessionIOS::setHostProcessAttribution(audit_token_t auditToken)
+{
+#if ENABLE(APP_PRIVACY_REPORT)
+    NSError *error = nil;
+    auto bundleProxy = [LSBundleProxy bundleProxyWithAuditToken:auditToken error:&error];
+    if (error) {
+        RELEASE_LOG_ERROR(WebRTC, "Failed to get attribution bundleID from audit token with error: %@.", error.localizedDescription);
+        return;
+    }
+
+    [[PAL::getAVAudioSessionClass() sharedInstance] setHostProcessAttribution:@[ bundleProxy.bundleIdentifier ] error:&error];
+    if (error)
+        RELEASE_LOG_ERROR(WebRTC, "Failed to set attribution bundleID with error: %@.", error.localizedDescription);
+#else
+    UNUSED_PARAM(auditToken);
+#endif
+};
+
 
 void AudioSessionIOS::setCategory(CategoryType newCategory, RouteSharingPolicy policy)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-10-01  Kate Cheney  <katherine_cheney@apple.com>
+
+        GPU Process microphone attribution SPI adoption
+        https://bugs.webkit.org/show_bug.cgi?id=231034
+        <rdar://problem/83732537>
+
+        Reviewed by Youenn Fablet.
+
+        Adopt SPI for App Privacy Report that attributes mic capture to the
+        host app.
+
+        * GPUProcess/GPUConnectionToWebProcess.cpp:
+        (WebKit::GPUConnectionToWebProcess::audioSessionProxy):
+        * GPUProcess/media/RemoteAudioSessionProxyManager.cpp:
+        (WebKit::RemoteAudioSessionProxyManager::addProxy):
+        * GPUProcess/media/RemoteAudioSessionProxyManager.h:
+        * Scripts/process-entitlements.sh:
+
 2021-10-01  Brent Fulgham  <bfulgham@apple.com>
 

trunk/Source/WebKit/GPUProcess/GPUConnectionToWebProcess.cpp

@@ -457 +457 @@
     if (!m_audioSessionProxy) {
         m_audioSessionProxy = RemoteAudioSessionProxy::create(*this).moveToUniquePtr();
-        gpuProcess().audioSessionManager().addProxy(*m_audioSessionProxy);
+
+        auto auditToken = gpuProcess().parentProcessConnection()->getAuditToken();
+        gpuProcess().audioSessionManager().addProxy(*m_audioSessionProxy, auditToken);
     }
     return *m_audioSessionProxy;

trunk/Source/WebKit/GPUProcess/media/RemoteAudioSessionProxyManager.cpp

@@ -56 +56 @@
 }
 
-void RemoteAudioSessionProxyManager::addProxy(RemoteAudioSessionProxy& proxy)
+void RemoteAudioSessionProxyManager::addProxy(RemoteAudioSessionProxy& proxy, std::optional<audit_token_t> auditToken)
 {
     ASSERT(!m_proxies.contains(proxy));
     m_proxies.add(proxy);
     updateCategory();
+
+    if (auditToken)
+        AudioSession::sharedSession().setHostProcessAttribution(*auditToken);
 }
 

trunk/Source/WebKit/GPUProcess/media/RemoteAudioSessionProxyManager.h

@@ -45 +45 @@
     ~RemoteAudioSessionProxyManager();
 
-    void addProxy(RemoteAudioSessionProxy&);
+    void addProxy(RemoteAudioSessionProxy&, std::optional<audit_token_t>);
     void removeProxy(RemoteAudioSessionProxy&);
 

trunk/Source/WebKit/Scripts/process-entitlements.sh

@@ -183 +183 @@
         plistbuddy Add :com.apple.private.security.message-filter bool YES
         plistbuddy Add :com.apple.UIKit.view-service-wants-custom-idiom-and-scale bool YES
-        plistbuddy add :com.apple.QuartzCore.webkit-limited-types bool YES
+        plistbuddy Add :com.apple.QuartzCore.webkit-limited-types bool YES
     fi
 
@@ -207 +207 @@
     plistbuddy Add :com.apple.QuartzCore.webkit-end-points bool YES
     plistbuddy Add :com.apple.private.memory.ownership_transfer bool YES
-    plistbuddy add :com.apple.QuartzCore.webkit-limited-types bool YES
+    plistbuddy Add :com.apple.QuartzCore.webkit-limited-types bool YES
 
     if [[ "${WK_USE_RESTRICTED_ENTITLEMENTS}" == YES ]]
@@ -321 +321 @@
     plistbuddy Add :com.apple.security.exception.mach-lookup.global-name array
     plistbuddy Add :com.apple.security.exception.mach-lookup.global-name:0 string com.apple.systemstatus.activityattribution
+    plistbuddy Add :com.apple.private.attribution.explicitly-assumed-identities array
+    plistbuddy Add :com.apple.private.attribution.explicitly-assumed-identities:0:type string wildcard
 }