Changeset 276986 in webkit

Timestamp:

May 4, 2021 3:37:08 PM (15 months ago)

Author:

Chris Dumez

Message:

Blob contentType with charset renders html as plain text
​https://bugs.webkit.org/show_bug.cgi?id=225226

Reviewed by Alex Christensen.

Source/WebCore:

Our code would use the Blob's Content-Type (media type) as a MIME type internally. As a result, if the Blob's
media type would contain anything besides the MIME type (e.g. a charget), then it would lead to failures.

Test: fast/files/blob-with-charget-as-main-resource.html

• platform/network/BlobResourceHandle.cpp:

(WebCore::BlobResourceHandle::notifyResponseOnSuccess):

• platform/network/HTTPParsers.h:

Source/WebKit:

Our code would use the Blob's Content-Type (media type) as a MIME type internally. As a result, if the Blob's
media type would contain anything besides the MIME type (e.g. a charget), then it would lead to failures.

• NetworkProcess/NetworkDataTaskBlob.cpp:

(WebKit::NetworkDataTaskBlob::dispatchDidReceiveResponse):

LayoutTests:

Add layout test coverage.

• fast/files/blob-with-charget-as-main-resource-expected.html: Added.
• fast/files/blob-with-charget-as-main-resource.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/files/blob-with-charget-as-main-resource-expected.html (added)
• LayoutTests/fast/files/blob-with-charget-as-main-resource.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/network/BlobResourceHandle.cpp (modified) (1 diff)
• Source/WebCore/platform/network/HTTPParsers.h (modified) (1 diff)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/NetworkProcess/NetworkDataTaskBlob.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-05-04  Chris Dumez  <cdumez@apple.com>
+
+        Blob contentType with charset renders html as plain text
+        https://bugs.webkit.org/show_bug.cgi?id=225226
+
+        Reviewed by Alex Christensen.
+
+        Add layout test coverage.
+
+        * fast/files/blob-with-charget-as-main-resource-expected.html: Added.
+        * fast/files/blob-with-charget-as-main-resource.html: Added.
+
 2021-05-04  Cameron McCormack  <heycam@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-05-04  Chris Dumez  <cdumez@apple.com>
+
+        Blob contentType with charset renders html as plain text
+        https://bugs.webkit.org/show_bug.cgi?id=225226
+
+        Reviewed by Alex Christensen.
+
+        Our code would use the Blob's Content-Type (media type) as a MIME type internally. As a result, if the Blob's
+        media type would contain anything besides the MIME type (e.g. a charget), then it would lead to failures.
+
+        Test: fast/files/blob-with-charget-as-main-resource.html
+
+        * platform/network/BlobResourceHandle.cpp:
+        (WebCore::BlobResourceHandle::notifyResponseOnSuccess):
+        * platform/network/HTTPParsers.h:
+
 2021-05-04  Cameron McCormack  <heycam@apple.com>
 

trunk/Source/WebCore/platform/network/BlobResourceHandle.cpp

@@ -570 +570 @@
 
     bool isRangeRequest = m_rangeOffset != kPositionNotSpecified;
-    ResourceResponse response(firstRequest().url(), m_blobData->contentType(), m_totalRemainingSize, String());
+    ResourceResponse response(firstRequest().url(), extractMIMETypeFromMediaType(m_blobData->contentType()), m_totalRemainingSize, String());
     response.setHTTPStatusCode(isRangeRequest ? httpPartialContent : httpOK);
     response.setHTTPStatusText(isRangeRequest ? httpPartialContentText : httpOKText);

trunk/Source/WebCore/platform/network/HTTPParsers.h

@@ -80 +80 @@
 Optional<WallTime> parseHTTPDate(const String&);
 String filenameFromHTTPContentDisposition(const String&);
-String extractMIMETypeFromMediaType(const String&);
+WEBCORE_EXPORT String extractMIMETypeFromMediaType(const String&);
 String extractCharsetFromMediaType(const String&);
 XSSProtectionDisposition parseXSSProtectionHeader(const String& header, String& failureReason, unsigned& failurePosition, String& reportURL);

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-05-04  Chris Dumez  <cdumez@apple.com>
+
+        Blob contentType with charset renders html as plain text
+        https://bugs.webkit.org/show_bug.cgi?id=225226
+
+        Reviewed by Alex Christensen.
+
+        Our code would use the Blob's Content-Type (media type) as a MIME type internally. As a result, if the Blob's
+        media type would contain anything besides the MIME type (e.g. a charget), then it would lead to failures. 
+
+        * NetworkProcess/NetworkDataTaskBlob.cpp:
+        (WebKit::NetworkDataTaskBlob::dispatchDidReceiveResponse):
+
 2021-05-04  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebKit/NetworkProcess/NetworkDataTaskBlob.cpp

@@ -256 +256 @@
 
     Ref<NetworkDataTaskBlob> protectedThis(*this);
-    ResourceResponse response(m_firstRequest.url(), errorCode != Error::NoError ? "text/plain" : m_blobData->contentType(), errorCode != Error::NoError ? 0 : m_totalRemainingSize, String());
+    ResourceResponse response(m_firstRequest.url(), errorCode != Error::NoError ? "text/plain" : extractMIMETypeFromMediaType(m_blobData->contentType()), errorCode != Error::NoError ? 0 : m_totalRemainingSize, String());
     switch (errorCode) {
     case Error::NoError: {