Changeset 264382 in webkit

Timestamp:

Jul 14, 2020, 4:36:58 PM (5 years ago)

Author:

commit-queue@webkit.org

Message:

REGRESSION(r262341) URL::createCFURL should produce a CFURL that uses UTF-8 to decode its percent-encoded sequences
​https://bugs.webkit.org/show_bug.cgi?id=214314
<rdar://problem/65079249>

Patch by Alex Christensen <​achristensen@webkit.org> on 2020-07-14
Reviewed by Darin Adler.

Source/WTF:

r262341 made it so we usually pass kCFStringEncodingISOLatin1 into CFURLCreateAbsoluteURLWithBytes when creating a CFURLRef from a WTF::URL.
This is correct for the interpretation of the bytes to create a CFStringRef, and that is a change we want to make.
The encoding, however, is also stored with the CFURL and used later when interpreting percent-encoded sequences.
We want to use kCFStringEncodingUTF8 to make the interpretation of percent-encoded sequences the same as it used to be.
To avoid making a separate CString most of the time, use characters8() only for ASCII-only URLs, where UTF-8 and Latin1 are the same.
For all other URLs, we have to make a CString containing the UTF-8 representation of the string to get the percent-encoded sequences interpreted the same.

• wtf/cf/URLCF.cpp:

(WTF::URL::createCFURL const):

• wtf/cocoa/URLCocoa.mm:

(WTF::URL::createCFURL const):

Tools:

• TestWebKitAPI/Tests/WTF/cocoa/URLExtras.mm:

Add a direct test and update the Mojave test expectations for the test introduced in r262341 with the change that introduced this regression.

• TestWebKitAPI/Tests/WebKitCocoa/LoadInvalidURLRequest.mm:

Update a test from r263475 which fixed another regression from r262341.
The test verified that nothing crashed or timed out, and that is still the case even with this intentional change in behavior.

Location:

trunk

Files:

• Source/WTF/ChangeLog (modified) (1 diff)
• Source/WTF/wtf/cf/URLCF.cpp (modified) (1 diff)
• Source/WTF/wtf/cocoa/URLCocoa.mm (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WTF/cocoa/URLExtras.mm (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebKitCocoa/LoadInvalidURLRequest.mm (modified) (1 diff)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2020-07-14  Alex Christensen  <achristensen@webkit.org>
+
+        REGRESSION(r262341) URL::createCFURL should produce a CFURL that uses UTF-8 to decode its percent-encoded sequences
+        https://bugs.webkit.org/show_bug.cgi?id=214314
+        <rdar://problem/65079249>
+
+        Reviewed by Darin Adler.
+
+        r262341 made it so we usually pass kCFStringEncodingISOLatin1 into CFURLCreateAbsoluteURLWithBytes when creating a CFURLRef from a WTF::URL.
+        This is correct for the interpretation of the bytes to create a CFStringRef, and that is a change we want to make.
+        The encoding, however, is also stored with the CFURL and used later when interpreting percent-encoded sequences.
+        We want to use kCFStringEncodingUTF8 to make the interpretation of percent-encoded sequences the same as it used to be.
+        To avoid making a separate CString most of the time, use characters8() only for ASCII-only URLs, where UTF-8 and Latin1 are the same.
+        For all other URLs, we have to make a CString containing the UTF-8 representation of the string to get the percent-encoded sequences interpreted the same.
+
+        * wtf/cf/URLCF.cpp:
+        (WTF::URL::createCFURL const):
+        * wtf/cocoa/URLCocoa.mm:
+        (WTF::URL::createCFURL const):
+
 2020-07-14  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WTF/wtf/cf/URLCF.cpp

@@ -52 +52 @@
 {
     RetainPtr<CFURLRef> cfURL;
-    if (LIKELY(m_string.is8Bit()))
-        cfURL = adoptCF(CFURLCreateAbsoluteURLWithBytes(nullptr, reinterpret_cast<const UInt8*>(m_string.characters8()), m_string.length(), kCFStringEncodingISOLatin1, nullptr, true));
+    if (LIKELY(m_string.is8Bit() && m_string.isAllASCII()))
+        cfURL = adoptCF(CFURLCreateAbsoluteURLWithBytes(nullptr, reinterpret_cast<const UInt8*>(m_string.characters8()), m_string.length(), kCFStringEncodingUTF8, nullptr, true));
     else {
         CString utf8 = m_string.utf8();

trunk/Source/WTF/wtf/cocoa/URLCocoa.mm

@@ -70 +70 @@
 
     RetainPtr<CFURLRef> cfURL;
-    if (LIKELY(m_string.is8Bit()))
-        cfURL = adoptCF(CFURLCreateAbsoluteURLWithBytes(nullptr, reinterpret_cast<const UInt8*>(m_string.characters8()), m_string.length(), kCFStringEncodingISOLatin1, nullptr, true));
+    if (LIKELY(m_string.is8Bit() && m_string.isAllASCII()))
+        cfURL = adoptCF(CFURLCreateAbsoluteURLWithBytes(nullptr, reinterpret_cast<const UInt8*>(m_string.characters8()), m_string.length(), kCFStringEncodingUTF8, nullptr, true));
     else {
         CString utf8 = m_string.utf8();

trunk/Tools/ChangeLog

@@ +1 @@
+2020-07-14  Alex Christensen  <achristensen@webkit.org>
+
+        REGRESSION(r262341) URL::createCFURL should produce a CFURL that uses UTF-8 to decode its percent-encoded sequences
+        https://bugs.webkit.org/show_bug.cgi?id=214314
+        <rdar://problem/65079249>
+
+        Reviewed by Darin Adler.
+
+        * TestWebKitAPI/Tests/WTF/cocoa/URLExtras.mm:
+        Add a direct test and update the Mojave test expectations for the test introduced in r262341 with the change that introduced this regression.
+        * TestWebKitAPI/Tests/WebKitCocoa/LoadInvalidURLRequest.mm:
+        Update a test from r263475 which fixed another regression from r262341.
+        The test verified that nothing crashed or timed out, and that is still the case even with this intentional change in behavior.
+
 2020-07-14  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Tools/TestWebKitAPI/Tests/WTF/cocoa/URLExtras.mm

@@ -219 +219 @@
     EXPECT_FALSE(url4.isValid());
     EXPECT_TRUE(url4.string().is8Bit());
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED < 101500
-    // CFURLCreateAbsoluteURLWithBytes has incorrect behavior on Mojave
-    // See https://bugs.webkit.org/show_bug.cgi?id=212486#c6
-    EXPECT_STREQ([[url4 absoluteString] UTF8String], "%C2%B6");
-#else
     EXPECT_STREQ([[url4 absoluteString] UTF8String], "%C3%82%C2%B6");
-#endif
+
+    char buffer[100];
+    memset(buffer, 0, sizeof(buffer));
+    WTF::URL url5(URL(), "file:///A%C3%A7%C3%A3o.html"_s);
+    CFURLGetFileSystemRepresentation(url5.createCFURL().get(), false, reinterpret_cast<UInt8*>(buffer), sizeof(buffer));
+    EXPECT_STREQ(buffer, "/Ação.html");
 }
 

trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/LoadInvalidURLRequest.mm

@@ -94 +94 @@
         EXPECT_WK_STREQ(error.domain, @"WebKitErrorDomain");
         EXPECT_EQ(error.code, WebKitErrorCannotShowURL);
-        EXPECT_WK_STREQ([error.userInfo[@"NSErrorFailingURLKey"] absoluteString], "http://%E2%80%80");
+        EXPECT_WK_STREQ([error.userInfo[@"NSErrorFailingURLKey"] absoluteString], "http://%C3%A2%C2%80%C2%80");
         done = true;
     };