whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QUrl: fix IDN whitelist checking when the TLD is in Unicode 

The whitelist is kept in ACE form, so if the TLD came in Unicode, we
need to run ToASCII before we can check the whitelist. This is slightly
inefficient because we'll run the same operation later in this domain.

Change-Id: Iadfecb6f28984634979dfffd14b831f37b0f4818
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Florian Bruhin <qt-project.org@the-compiler.org>
bb10
Thiago Macieira 2017-04-23 22:43:18 -03:00
parent fbb485d4f6
commit 21dd5d314a
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/io/qurlidna.cpp
View File

@ -2422,8 +2422,8 @@ static bool qt_is_idn_enabled(const QString &domain)
return false;
int len = domain.size() - idx - 1;
QString tldString(domain.constData() + idx + 1, len);
qt_nameprep(&tldString, 0);
QString tldString = qt_ACE_do(QString::fromRawData(domain.constData() + idx + 1, len), ToAceOnly, ForbidLeadingDot);
len = tldString.size();
const QChar *tld = tldString.constData();

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

@ -670,6 +670,14 @@ void tst_QUrlInternal::ace_testsuite()
QCOMPARE(QUrl::fromAce(domain.toLatin1()), fromace + suffix);
QCOMPARE(QUrl::fromAce(QUrl::toAce(domain)), unicode + suffix);
QUrl u;
u.setHost(domain);
QVERIFY(u.isValid());
QCOMPARE(u.host(), unicode + suffix);
QCOMPARE(u.host(QUrl::EncodeUnicode), toace + suffix);
QCOMPARE(u.toEncoded(), "//" + toace.toLatin1() + suffix);
QCOMPARE(u.toDisplayString(), "//" + unicode + suffix);
domain = in + (suffix ? ".troll.No" : "");
QCOMPARE(QString::fromLatin1(QUrl::toAce(domain)), toace + suffix);
if (fromace != ".")