Changeset 263537 in webkit

Timestamp:

Jun 25, 2020 3:39:22 PM (4 years ago)

Author:

jer.noble@apple.com

Message:

iOS Safari incorrectly reports "AppleCoreMedia" as UA string
​https://bugs.webkit.org/show_bug.cgi?id=213245
<rdar://problem/64471582>

Reviewed by Youenn Fablet.

Source/WebCore:

Tests: TestWebKitAPI.MediaLoading.UserAgentStringCRABS

TestWebKitAPI.MediaLoading.UserAgentStringHLS

• platform/network/cocoa/WebCoreNSURLSession.mm:

(-[WebCoreNSURLSessionDataTask initWithSession:identifier:request:]):

Tools:

• TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
• TestWebKitAPI/Tests/WebKitCocoa/MediaLoading.mm: Added.

(TestWebKitAPI::parseUserAgent):
(TestWebKitAPI::TEST):

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/network/cocoa/WebCoreNSURLSession.mm (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj (modified) (4 diffs)
• Tools/TestWebKitAPI/Tests/WebKitCocoa/MediaLoading.mm (added)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-06-25  Jer Noble  <jer.noble@apple.com>
+
+        iOS Safari incorrectly reports "AppleCoreMedia" as UA string
+        https://bugs.webkit.org/show_bug.cgi?id=213245
+        <rdar://problem/64471582>
+
+        Reviewed by Youenn Fablet.
+
+        Tests: TestWebKitAPI.MediaLoading.UserAgentStringCRABS
+               TestWebKitAPI.MediaLoading.UserAgentStringHLS
+
+        * platform/network/cocoa/WebCoreNSURLSession.mm:
+        (-[WebCoreNSURLSessionDataTask initWithSession:identifier:request:]):
+
 2020-06-25  Megan Gardner  <megan_gardner@apple.com>
 

trunk/Source/WebCore/platform/network/cocoa/WebCoreNSURLSession.mm

@@ -658 +658 @@
     self.state = NSURLSessionTaskStateSuspended;
     self.priority = NSURLSessionTaskPriorityDefault;
+
+    // CoreMedia will explicitly add a user agent header. Remove if present.
+    if (auto* userAgentValue = [request valueForHTTPHeaderField:@"User-Agent"]) {
+        NSMutableURLRequest* mutableRequest = [request mutableCopyWithZone:nil];
+        [mutableRequest setValue:nil forHTTPHeaderField:@"User-Agent"];
+        request = [mutableRequest autorelease];
+    }
+
     self.originalRequest = self.currentRequest = request;
 

trunk/Tools/ChangeLog

@@ +1 @@
+2020-06-25  Jer Noble  <jer.noble@apple.com>
+
+        iOS Safari incorrectly reports "AppleCoreMedia" as UA string
+        https://bugs.webkit.org/show_bug.cgi?id=213245
+        <rdar://problem/64471582>
+
+        Reviewed by Youenn Fablet.
+
+        * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
+        * TestWebKitAPI/Tests/WebKitCocoa/MediaLoading.mm: Added.
+        (TestWebKitAPI::parseUserAgent):
+        (TestWebKitAPI::TEST):
+
 2020-06-25  Daniel Bates  <dabates@apple.com>
 

trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj

@@ -958 +958 @@
                 CAB0FF5322332407006CA5B0 /* IndexedDBFileName-2.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = CAB0FF50223323F6006CA5B0 /* IndexedDBFileName-2.html */; };
                 CAB0FF5522332C57006CA5B0 /* IndexedDBFileName.mm in Sources */ = {isa = PBXBuildFile; fileRef = CAB0FF5422332C3A006CA5B0 /* IndexedDBFileName.mm */; };
+                CD0370E324A44D9600BA3CAE /* MediaLoading.mm in Sources */ = {isa = PBXBuildFile; fileRef = CD0370E224A44B7A00BA3CAE /* MediaLoading.mm */; };
                 CD0BD0A61F79924D001AB2CF /* ContextMenuImgWithVideo.mm in Sources */ = {isa = PBXBuildFile; fileRef = CD0BD0A51F799220001AB2CF /* ContextMenuImgWithVideo.mm */; };
                 CD0BD0A81F79982D001AB2CF /* ContextMenuImgWithVideo.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = CD0BD0A71F7997C2001AB2CF /* ContextMenuImgWithVideo.html */; };
@@ -2605 +2606 @@
                 CAB0FF51223323F6006CA5B0 /* IndexedDBFileName-1.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = "IndexedDBFileName-1.html"; sourceTree = "<group>"; };
                 CAB0FF5422332C3A006CA5B0 /* IndexedDBFileName.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = IndexedDBFileName.mm; sourceTree = "<group>"; };
+                CD0370E224A44B7A00BA3CAE /* MediaLoading.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MediaLoading.mm; sourceTree = "<group>"; };
                 CD0BD0A51F799220001AB2CF /* ContextMenuImgWithVideo.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = ContextMenuImgWithVideo.mm; sourceTree = "<group>"; };
                 CD0BD0A71F7997C2001AB2CF /* ContextMenuImgWithVideo.html */ = {isa = PBXFileReference; lastKnownFileType = text.html; path = ContextMenuImgWithVideo.html; sourceTree = "<group>"; };
@@ -3176 +3178 @@
                                 7A6A2C6F1DCCF87B00C0D085 /* LocalStorageQuirkTest.mm */,
                                 07CC7DFD2266330800E39181 /* MediaBufferingPolicy.mm */,
+                                CD0370E224A44B7A00BA3CAE /* MediaLoading.mm */,
                                 51BE9E652376089500B4E117 /* MediaType.mm */,
                                 5165FE03201EE617009F7EC3 /* MessagePortProviders.mm */,
@@ -4873 +4876 @@
                                 7CCE7EB51A411A7E00447C4C /* BackForwardList.mm in Sources */,
                                 1C7FEB20207C0F2E00D23278 /* BackgroundColor.mm in Sources */,
+                                CD0370E324A44D9600BA3CAE /* MediaLoading.mm in Sources */,
                                 C15CBB3023F1FF1A00300CC7 /* BacklightLevelNotification.mm in Sources */,
                                 C1692DCA23D10DAE006E88F7 /* Battery.mm in Sources */,