1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disallow non-character Unicode codepoints in QUrl/QUrlQuery

Browse Source 
Since they are non-characters and should not be used for text
interchange, it stands to reason that they should not appear in
unencoded for in a URL. To change the behavior, we just need to toggle
a simple flag for QUtf8Functions.

This behavior also matches the recommendation from RFC 3987. We do not
usually follow recommendations from that RFC (as it is generally
believed to be a bad RFC), but this one seems like a good idea.

Change-Id: Ifea6e497f11a461db432ffff1447486c623c12bd
Reviewed-by: David Faure <david.faure@kdab.com>
This commit is contained in:
Thiago Macieira 2016-04-20 22:23:54 -07:00
parent 40e4f75786
commit 6e306e8d94
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/corelib/io/qurlrecode.cpp
View File

@ -234,6 +234,30 @@ static void ensureDetached(QString &result, ushort *&output, const ushort *begin
namespace {
struct QUrlUtf8Traits : public QUtf8BaseTraitsNoAscii
{
// From RFC 3987:
// iunreserved = ALPHA / DIGIT / "-" / "." / "_" / "~" / ucschar
//
// ucschar = %xA0-D7FF / %xF900-FDCF / %xFDF0-FFEF
// / %x10000-1FFFD / %x20000-2FFFD / %x30000-3FFFD
// / %x40000-4FFFD / %x50000-5FFFD / %x60000-6FFFD
// / %x70000-7FFFD / %x80000-8FFFD / %x90000-9FFFD
// / %xA0000-AFFFD / %xB0000-BFFFD / %xC0000-CFFFD
// / %xD0000-DFFFD / %xE1000-EFFFD
//
// iprivate = %xE000-F8FF / %xF0000-FFFFD / %x100000-10FFFD
//
// That RFC allows iprivate only as part of iquery, but we don't know here
// whether we're looking at a query or another part of an URI, so we accept
// them too. The definition above excludes U+FFF0 to U+FFFD from appearing
// unencoded, but we see no reason for its exclusion, so we allow them to
// be decoded (and we need U+FFFD the replacement character to indicate
// failure to decode).
//
// That means we must disallow:
// * unpaired surrogates (QUtf8Functions takes care of that for us)
// * non-characters
static const bool allowNonCharacters = false;
// override: our "bytes" are three percent-encoded UTF-16 characters
static void appendByte(ushort *&ptr, uchar b)
{

2
tests/auto/corelib/io/qurlinternal/tst_qurlinternal.cpp
View File

@ -998,7 +998,9 @@ void tst_QUrlInternal::encodingRecodeInvalidUtf8_data()
QTest::addColumn<QString>("utf16");
extern void loadInvalidUtf8Rows();
extern void loadNonCharactersRows();
loadInvalidUtf8Rows();
loadNonCharactersRows();
QTest::newRow("utf8-mix-4") << QByteArray("\xE0.A2\x80");
QTest::newRow("utf8-mix-5") << QByteArray("\xE0\xA2.80");