Changeset 204128 in webkit

Timestamp:

Aug 4, 2016 11:48:16 AM (8 years ago)

Author:

commit-queue@webkit.org

Message:

Temporary redirected m3u8 streaming stopped working.
​https://bugs.webkit.org/show_bug.cgi?id=160472
rdar://problem/27592694

Patch by Jeremy Jones <​jeremyj@apple.com> on 2016-08-04
Reviewed by Alex Christensen.

Source/WebCore:

Test: http/tests/media/hls/hls-redirect.html

The change for ​https://trac.webkit.org/changeset/202466 hides knowledge of the temporary redirected URL from
WebCoreNSURLSession clients. MPEG playlists (e.g. .m3u8) can contain paths relative to the redirected URL.

This change exposes the redirected URL for MPEG playlists.

• platform/MIMETypeRegistry.cpp:

(WebCore::initializeMPEGPlaylistMIMETypes): Added.
(WebCore::initializeMIMETypeRegistry):
(WebCore::MIMETypeRegistry::isMPEGPlaylistMIMEType): Added.

• platform/MIMETypeRegistry.h:
• platform/network/cocoa/WebCoreNSURLSession.mm:

(-[WebCoreNSURLSessionDataTask resource:receivedResponse:]): Add MPEG playlist condition.
(-[WebCoreNSURLSessionDataTask resource:receivedRedirect:request:]): Add MPEG playlist condition.

LayoutTests:

This tests that m3u8 files can be loaded when going through a temporary redirect.

• http/tests/media/hls/hls-redirect-expected.txt: Added.
• http/tests/media/hls/hls-redirect.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/media/hls/hls-redirect-expected.txt (added)
• LayoutTests/http/tests/media/hls/hls-redirect.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/MIMETypeRegistry.cpp (modified) (4 diffs)
• Source/WebCore/platform/MIMETypeRegistry.h (modified) (1 diff)
• Source/WebCore/platform/network/cocoa/WebCoreNSURLSession.mm (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-08-04  Jeremy Jones  <jeremyj@apple.com>
+
+        Temporary redirected m3u8 streaming stopped working.
+        https://bugs.webkit.org/show_bug.cgi?id=160472
+        rdar://problem/27592694
+
+        Reviewed by Alex Christensen.
+
+        This tests that m3u8 files can be loaded when going through a temporary redirect.
+
+        * http/tests/media/hls/hls-redirect-expected.txt: Added.
+        * http/tests/media/hls/hls-redirect.html: Added.
+
 2016-08-04  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-08-04  Jeremy Jones  <jeremyj@apple.com>
+
+        Temporary redirected m3u8 streaming stopped working.
+        https://bugs.webkit.org/show_bug.cgi?id=160472
+        rdar://problem/27592694
+
+        Reviewed by Alex Christensen.
+
+        Test: http/tests/media/hls/hls-redirect.html
+
+        The change for https://trac.webkit.org/changeset/202466 hides knowledge of the temporary redirected URL from 
+        WebCoreNSURLSession clients. MPEG playlists (e.g. .m3u8) can contain paths relative to the redirected URL.
+
+        This change exposes the redirected URL for MPEG playlists.
+
+        * platform/MIMETypeRegistry.cpp:
+        (WebCore::initializeMPEGPlaylistMIMETypes): Added.
+        (WebCore::initializeMIMETypeRegistry):
+        (WebCore::MIMETypeRegistry::isMPEGPlaylistMIMEType): Added.
+        * platform/MIMETypeRegistry.h:
+        * platform/network/cocoa/WebCoreNSURLSession.mm:
+        (-[WebCoreNSURLSessionDataTask resource:receivedResponse:]): Add MPEG playlist condition.
+        (-[WebCoreNSURLSessionDataTask resource:receivedRedirect:request:]): Add MPEG playlist condition.
+
 2016-08-04  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebCore/platform/MIMETypeRegistry.cpp

@@ -147 +147 @@
 static HashSet<String, ASCIICaseInsensitiveHash>* supportedNonImageMIMETypes;
 static HashSet<String, ASCIICaseInsensitiveHash>* supportedMediaMIMETypes;
+static HashSet<String, ASCIICaseInsensitiveHash>* mpegPlaylistMIMETypes;
 static HashSet<String, ASCIICaseInsensitiveHash>* pdfMIMETypes;
 static HashSet<String, ASCIICaseInsensitiveHash>* pdfAndPostScriptMIMETypes;
@@ -302 +303 @@
 }
 
+static void initializeMPEGPlaylistMIMETypes()
+{
+    const char* const types[] = {
+        "application/vnd.apple.mpegurl",
+        "application/mpegurl",
+        "application/x-mpegurl",
+        "audio/mpegurl",
+        "audio/x-mpegurl",
+        "audio/mpegurl",
+        "audio/x-mpegurl"
+    };
+
+    for (auto& type : types)
+        mpegPlaylistMIMETypes->add(type);
+}
+
 static void initializePDFMIMETypes()
 {
@@ -456 +473 @@
     initializeSupportedImageMIMETypes();
 
+    mpegPlaylistMIMETypes = new HashSet<String, ASCIICaseInsensitiveHash>;
+    initializeMPEGPlaylistMIMETypes();
+
     pdfMIMETypes = new HashSet<String, ASCIICaseInsensitiveHash>;
     initializePDFMIMETypes();
@@ -552 +572 @@
         || mimeType.startsWith("application/x-java-bean", false)
         || mimeType.startsWith("application/x-java-vm", false);
+}
+
+bool MIMETypeRegistry::isMPEGPlaylistMIMEType(const String& mimeType)
+{
+    if (mimeType.isEmpty())
+        return false;
+    if (!mpegPlaylistMIMETypes)
+        initializeMIMETypeRegistry();
+    return mpegPlaylistMIMETypes->contains(mimeType);
 }
 

trunk/Source/WebCore/platform/MIMETypeRegistry.h

@@ -77 +77 @@
     static bool isApplicationPluginMIMEType(const String& mimeType);
 
+    // Check to see if a MIME type is one of the MPEG playlists types.
+    static bool isMPEGPlaylistMIMEType(const String& mimeType);
+
     // Check to see if a MIME type is one of the common PDF/PS types.
     WEBCORE_EXPORT static bool isPDFOrPostScriptMIMEType(const String& mimeType);

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

@@ -30 +30 @@
 
 #import "CachedResourceRequest.h"
+#import "MIMETypeRegistry.h"
 #import "PlatformMediaResourceLoader.h"
 #import "SecurityOrigin.h"
@@ -587 +588 @@
         // certain features of CORS, as well as being against the HTTP spec in the case of
         // non-permanent redirects.
-        auto responseData = response.crossThreadData();
-        responseData.url = URL(self.currentRequest.URL);
-        strongResponse = ResourceResponseBase::fromCrossThreadData(WTFMove(responseData)).nsURLResponse();
+
+        // Exclude MPEG Playlists since these require the redirected URL as the base URL
+        // for relative paths.
+        String mimeType = response.nsURLResponse().MIMEType;
+        if (mimeType.isEmpty() || mimeType == "application/octet-stream" || mimeType == "text/plain") {
+            String extension = response.nsURLResponse().URL.pathExtension;
+            mimeType = MIMETypeRegistry::getMediaMIMETypeForExtension(extension);
+
+        }
+        if (!MIMETypeRegistry::isMPEGPlaylistMIMEType(mimeType)) {
+            auto responseData = response.crossThreadData();
+            responseData.url = URL(self.currentRequest.URL);
+            strongResponse = ResourceResponseBase::fromCrossThreadData(WTFMove(responseData)).nsURLResponse();
+        }
     }
 
@@ -659 +671 @@
     // Do not update the current request if the redirect is temporary; use this
     // current request during responseReceieved: to work around a CoreMedia bug.
-    if (response.httpStatusCode() != 302 && response.httpStatusCode() != 307)
-        self.currentRequest = [NSURLRequest requestWithURL:request.url()];
+
+    // Exclude MPEG Playlists since these require the redirected URL as the base URL
+    // for relative paths.
+    if (response.httpStatusCode() != 302 && response.httpStatusCode() != 307) {
+        String mimeType = response.nsURLResponse().MIMEType;
+        if (mimeType.isEmpty() || mimeType == "application/octet-stream" || mimeType == "text/plain") {
+            String extension = response.nsURLResponse().URL.pathExtension;
+            mimeType = MIMETypeRegistry::getMediaMIMETypeForExtension(extension);
+        }
+        if (!MIMETypeRegistry::isMPEGPlaylistMIMEType(mimeType))
+            self.currentRequest = [NSURLRequest requestWithURL:request.url()];
+    }
 
     [self.session updateHasSingleSecurityOrigin:SecurityOrigin::create(request.url())];