Skip to content

[WTF] URL::setHost parses the raw host: IDNA-mapped delimiters no longer become URL structure #724

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
robobun wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[WTF] URL::setHost parses the raw host: IDNA-mapped delimiters no longer become URL structure #724

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 2 additions & 37 deletions Source/WTF/wtf/URL.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
#include <wtf/URL.h>

#include <stdio.h>
#include <unicode/uidna.h>
#include <wtf/HashMap.h>
#include <wtf/HashSet.h>
#include <wtf/Lock.h>
Expand Down Expand Up @@ -490,32 +489,6 @@ bool URL::setProtocol(StringView newProtocol)
return true;
}

// Appends the punycoded hostname identified by the given string and length to
// the output buffer. The result will not be null terminated.
// Return value of false means error in encoding.
static bool appendEncodedHostname(Vector<char16_t, 512>& buffer, StringView string)
{
// hostnameBuffer needs to be big enough to hold an IDN-encoded name.
// For host names bigger than this, we won't do IDN encoding, which is almost certainly OK.
if (string.length() > URLParser::hostnameBufferLength || string.containsOnlyASCII()) {
append(buffer, string);
return true;
}

std::array<char16_t, URLParser::hostnameBufferLength> hostnameBuffer;
UErrorCode error = U_ZERO_ERROR;
UIDNAInfo processingDetails = UIDNA_INFO_INITIALIZER;
// struct UIDNA is forward declared in WTF/icu/unicode/uidna.h.
SUPPRESS_FORWARD_DECL_ARG int32_t numCharactersConverted = uidna_nameToASCII(&URLParser::internationalDomainNameTranscoder(),
string.upconvertedCharacters(), string.length(), hostnameBuffer.data(), hostnameBuffer.size(), &processingDetails, &error);

if (U_SUCCESS(error) && !(processingDetails.errors & ~URLParser::allowedNameToASCIIErrors) && numCharactersConverted) {
buffer.append(std::span { hostnameBuffer }.first(numCharactersConverted));
return true;
}
return false;
}

unsigned URL::hostStart() const
{
return (m_passwordEnd == m_userStart) ? m_passwordEnd : m_passwordEnd + 1;
Expand Down Expand Up @@ -556,15 +529,11 @@ bool URL::setHost(StringView newHost)
if (newHost.contains(':') && !newHost.startsWith('['))
return false;
Comment thread
robobun marked this conversation as resolved.
Resolved

Vector<char16_t, 512> encodedHostName;
if (hasSpecialScheme() && !appendEncodedHostname(encodedHostName, newHost))
return false;

bool slashSlashNeeded = m_userStart == m_schemeEnd + 1U;
parse(makeString(
StringView(m_string).left(hostStart()),
slashSlashNeeded ? "//"_s : ""_s,
hasSpecialScheme() ? StringView(encodedHostName.span()) : newHost,
newHost,
StringView(m_string).substring(m_hostEnd)
));
Comment thread
robobun marked this conversation as resolved.
Resolved

Expand Down Expand Up @@ -634,15 +603,11 @@ void URL::setHostAndPort(StringView hostAndPort)
if (!parseInteger<uint16_t>(portString))
portString = { };

Vector<char16_t, 512> encodedHostName;
if (hasSpecialScheme() && !appendEncodedHostname(encodedHostName, hostName))
return;

bool slashSlashNeeded = m_userStart == m_schemeEnd + 1U;
parse(makeString(
StringView(m_string).left(hostStart()),
slashSlashNeeded ? "//"_s : ""_s,
hasSpecialScheme() ? StringView(encodedHostName.span()) : hostName,
hostName,
portString.isEmpty() ? ""_s : ":"_s,
portString,
StringView(m_string).substring(pathStart())
Expand Down
98 changes: 98 additions & 0 deletions Tools/TestWebKitAPI/Tests/WTF/URL.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
#include <wtf/URL.h>
#include <wtf/URLParser.h>
#include <wtf/Vector.h>
#include <wtf/text/MakeString.h>
#include <wtf/text/StringHash.h>

namespace TestWebKitAPI {
Expand Down Expand Up @@ -192,6 +193,103 @@ TEST_F(WTF_URL, URLSetFragmentIdentifier)
EXPECT_EQ(urlWithQuery.string(), urlWithQuery3.string());
}

// The host of a special URL is parsed once, by the host parser: tab and newline removal, percent-decoding, then
// domain to ASCII. A value with no ASCII delimiter gives the host that the same text gives inside a URL. Domain to
// ASCII never sees the value before that parse, so what it maps to a delimiter cannot become URL structure.
struct SetHostTestCase {
std::u16string_view value;
ASCIILiteral expectedHost; // Null when the value is refused.
};

static constexpr std::array setHostTestCases {
SetHostTestCase { u"other.example", "other.example"_s },
SetHostTestCase { u"B\u00FCcher.example", "xn--bcher-kva.example"_s },
SetHostTestCase { u"\u05D0.example", "xn--4db.example"_s },
SetHostTestCase { u"\uFF45\uFF58\uFF41\uFF4D\uFF50\uFF4C\uFF45\u3002com", "example.com"_s },
SetHostTestCase { u"%C3%9F.de", "xn--zca.de"_s },
// Percent-decoding comes before domain to ASCII.
SetHostTestCase { u"\u00DF%41.de", "xn--a-pfa.de"_s },
SetHostTestCase { u"%C3%BC\u00FC.de", "xn--tdaa.de"_s },
SetHostTestCase { u"\u00DF%2e.de", "xn--zca..de"_s },
SetHostTestCase { u"\u00E9.%78n--a", { } },
SetHostTestCase { u"\u00E9%2Fx", { } },
// So does tab and newline removal.
SetHostTestCase { u"\t\u00DF.de", "xn--zca.de"_s },
SetHostTestCase { u"\u00DF\n.d\re", "xn--zca.de"_s },
// Domain to ASCII maps these to '/', '\\', '?', '#', '@', ':' and '%', which are forbidden in a host.
SetHostTestCase { u"a\uFF0Fb", { } },
SetHostTestCase { u"bad.c\u2100.good.com", { } },
SetHostTestCase { u"a\uFF3Cb", { } },
SetHostTestCase { u"a\uFF1Fb", { } },
SetHostTestCase { u"a\uFF03b", { } },
SetHostTestCase { u"a\uFF20b", { } },
SetHostTestCase { u"a\uFF1A81", { } },
SetHostTestCase { u"a\uFF0541", { } },
SetHostTestCase { u"\u00DF\uFF20b", { } },
// An IPv6 address is never mapped: a fullwidth digit or an ignored code point makes it invalid.
SetHostTestCase { u"[::1]", "[::1]"_s },
SetHostTestCase { u"[::\uFF11]", { } },
SetHostTestCase { u"[::\u00B9]", { } },
SetHostTestCase { u"[::1]\u00AD", { } },
};

template<typename Setter>
static void testSetHost(const SetHostTestCase& test, ASCIILiteral expectedPort, const Setter& set)
{
auto value16Bit = String(std::span { test.value });
Vector<String, 2> values { value16Bit };
if (value16Bit.containsOnlyLatin1())
values.append(String::make8Bit(std::span { test.value }));

for (auto& value : values) {
SCOPED_TRACE(testing::Message() << value << (value.is8Bit() ? " (8-bit)" : " (16-bit)"));
URL original { "https://user:pass@example.com:444/p?q#f"_s };
URL parsed { makeString("https://user:pass@"_s, value, expectedPort, "/p?q#f"_s) };
URL url = original;
set(url, value);
if (test.expectedHost.isNull()) {
EXPECT_FALSE(parsed.isValid());
EXPECT_TRUE(!url.isValid() || url == original);
continue;
}
EXPECT_TRUE(url.isValid());
EXPECT_EQ(url.string(), makeString("https://user:pass@"_s, test.expectedHost, expectedPort, "/p?q#f"_s));
EXPECT_EQ(url.string(), parsed.string());
EXPECT_EQ(url.string().is8Bit(), parsed.string().is8Bit());
}
}

TEST_F(WTF_URL, URLSetHost)
{
for (auto& test : setHostTestCases) {
testSetHost(test, ":444"_s, [&](URL& url, const String& value) {
EXPECT_EQ(url.setHost(value), !test.expectedHost.isNull());
});
}

// A fullwidth colon does not start a port.
URL withoutPort { "https://example.com/p"_s };
EXPECT_FALSE(withoutPort.setHost(String(std::span { std::u16string_view { u"a\uFF1A81" } })));
EXPECT_FALSE(withoutPort.isValid());

// A host that is not special is opaque: percent-encoded, never converted.
URL url { "foo://example.com/p"_s };
EXPECT_TRUE(url.setHost(String(std::span { std::u16string_view { u"\u00DF%41.de" } })));
EXPECT_EQ(url.string(), "foo://%C3%9F%41.de/p"_s);
}

TEST_F(WTF_URL, URLSetHostAndPort)
{
for (auto& test : setHostTestCases) {
testSetHost(test, ":444"_s, [](URL& url, const String& value) {
url.setHostAndPort(value);
});
testSetHost(test, ":8080"_s, [](URL& url, const String& value) {
url.setHostAndPort(makeString(value, ":8080"_s));
});
}
}

TEST_F(WTF_URL, URLRemoveQueryAndFragmentIdentifier)
{
URL url = createURL("http://www.webkit.org/"_s);
Expand Down
Loading