Changeset 271229 in webkit

Timestamp:

Jan 7, 2021, 12:31:21 AM (6 years ago)

Author:

youenn@apple.com

Message:

WKWebView should expose navigator.mediaDevices when content is loaded from app bundle
​https://bugs.webkit.org/show_bug.cgi?id=220184
<rdar://problem/72792032>

Reviewed by Eric Carlson.

In case of non HTTP or HTTPS origins, getUserMedia was always denied.
This patch updates the code by allowing getUserMedia prompts for other protocols.
In that case, the user is presented the prompt with the application name since the origin domain does not mean anything.
Manually tested.

• UIProcess/Cocoa/MediaPermissionUtilities.mm:

(WebKit::alertMessageText):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Cocoa/MediaPermissionUtilities.mm (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-01-07  Youenn Fablet  <youenn@apple.com>
+
+        WKWebView should expose navigator.mediaDevices when content is loaded from app bundle
+        https://bugs.webkit.org/show_bug.cgi?id=220184
+        <rdar://problem/72792032>
+
+        Reviewed by Eric Carlson.
+
+        In case of non HTTP or HTTPS origins, getUserMedia was always denied.
+        This patch updates the code by allowing getUserMedia prompts for other protocols.
+        In that case, the user is presented the prompt with the application name since the origin domain does not mean anything.
+        Manually tested.
+
+        * UIProcess/Cocoa/MediaPermissionUtilities.mm:
+        (WebKit::alertMessageText):
+
 2021-01-07  Jiewen Tan  <jiewen_tan@apple.com>
 

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

@@ -37 +37 @@
 #import <wtf/SoftLinking.h>
 #import <wtf/URLHelpers.h>
+#import <wtf/spi/cf/CFBundleSPI.h>
 #import <wtf/spi/darwin/SandboxSPI.h>
 
@@ -119 +120 @@
 static NSString *alertMessageText(MediaPermissionReason reason, OptionSet<MediaPermissionType> types, const WebCore::SecurityOrigin& origin)
 {
-    if (origin.protocol() != "http" && origin.protocol() != "https")
-        return nil;
+    NSString *visibleOrigin;
+    if (origin.protocol() != "http" && origin.protocol() != "https") {
+        NSBundle *appBundle = [NSBundle mainBundle];
+        NSString *displayName = appBundle.infoDictionary[(__bridge NSString *)_kCFBundleDisplayNameKey];
+        NSString *readableName = appBundle.infoDictionary[(__bridge NSString *)kCFBundleNameKey];
+        visibleOrigin = displayName ?: readableName;
+    } else
+        visibleOrigin = visibleDomain(origin.host());
 
     switch (reason) {
     case MediaPermissionReason::UserMedia:
         if (types.contains(MediaPermissionType::Audio) && types.contains(MediaPermissionType::Video))
-            return [NSString stringWithFormat:WEB_UI_NSSTRING(@"Allow “%@” to use your camera and microphone?", @"Message for user media prompt"), visibleDomain(origin.host())];
+            return [NSString stringWithFormat:WEB_UI_NSSTRING(@"Allow “%@” to use your camera and microphone?", @"Message for user media prompt"), visibleOrigin];
         if (types.contains(MediaPermissionType::Audio))
-            return [NSString stringWithFormat:WEB_UI_NSSTRING(@"Allow “%@” to use your microphone?", @"Message for user microphone access prompt"), visibleDomain(origin.host())];
+            return [NSString stringWithFormat:WEB_UI_NSSTRING(@"Allow “%@” to use your microphone?", @"Message for user microphone access prompt"), visibleOrigin];
         if (types.contains(MediaPermissionType::Video))
-            return [NSString stringWithFormat:WEB_UI_NSSTRING(@"Allow “%@” to use your camera?", @"Message for user camera access prompt"), visibleDomain(origin.host())];
+            return [NSString stringWithFormat:WEB_UI_NSSTRING(@"Allow “%@” to use your camera?", @"Message for user camera access prompt"), visibleOrigin];
         return nil;
     case MediaPermissionReason::SpeechRecognition: