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

QUrl::fromLocalFile: accept invalid hostnames

Browse Source 
QUrl hostnames must be compliant with STD3, but we must somehow accept
file paths that begin with double slash but aren't valid hostnames.
Because the file URI spec requires us to start with "file://" anyway, we
can represent those with four slashes. Note that on Unix "//X/y" is a
valid but local file path. If given to QUrl::fromLocalFile(), if the
path at the root does parse as a hostname, we will still try to
normalize (the above becomes "file://x/y").

[ChangeLog][QtCore][QUrl] Changed QUrl::fromLocalFile() to accept
Windows UNC paths whose hostname component is not a valid Internet
hostname. This makes QUrl able to accept extended-length paths (\\?\),
device namespace (\\.\),  WSL (\\wsl$), etc.

Pick-to: 5.15
Fixes: QTBUG-86277
Change-Id: I3eb349b832c14610895efffd1635759348214a3b
Reviewed-by: David Faure <david.faure@kdab.com>
This commit is contained in:
Thiago Macieira 2020-09-16 20:48:38 -07:00
parent dfa35ee6c8
commit 97de53ee8c
2 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/corelib/io/qurl.cpp
View File

@ -3342,13 +3342,21 @@ QUrl QUrl::fromLocalFile(const QString &localFile)
hostSpec.truncate(hostSpec.size() - 4);
scheme = webDavScheme();
}
url.setHost(hostSpec.toString());
if (indexOfPath > 2)
// hosts can't be IPv6 addresses without [], so we can use QUrlPrivate::setHost
url.detach();
if (!url.d->setHost(hostSpec.toString(), 0, hostSpec.size(), StrictMode)) {
if (url.d->error->code != QUrlPrivate::InvalidRegNameError)
return url;
// Path hostname is not a valid URL host, so set it entirely in the path
// (by leaving deslashified unchanged)
} else if (indexOfPath > 2) {
deslashified = deslashified.right(deslashified.length() - indexOfPath);
else
} else {
deslashified.clear();
}
}
url.setScheme(scheme);
url.setPath(deslashified, DecodedMode);

15
tests/auto/corelib/io/qurl/tst_qurl.cpp
View File

@ -1275,6 +1275,9 @@ void tst_QUrl::toLocalFile_data()
QTest::newRow("windows-unc-path") << QString::fromLatin1("file://somehost/somedir/somefile") << QString::fromLatin1("//somehost/somedir/somefile");
QTest::newRow("windows-unc-root") << QString::fromLatin1("file://somehost/") << QString::fromLatin1("//somehost/");
QTest::newRow("windows-unc-nopath") << QString::fromLatin1("file://somehost") << QString::fromLatin1("//somehost");
QTest::newRow("windows-extlen-path") << QString::fromLatin1("file:////%3F/somedir/somefile") << QString::fromLatin1("//?/somedir/somefile");
QTest::newRow("windows-wsl-path") << QString::fromLatin1("file:////wsl$/somedir/somefile") << QString::fromLatin1("//wsl$/somedir/somefile");
QTest::newRow("windows-device-path") << QString::fromLatin1("file:////./somedir/somefile") << QString::fromLatin1("//./somedir/somefile");
// and some that result in empty (i.e., not local)
QTest::newRow("noscheme-absolute") << QString::fromLatin1("/a.txt") << QString();
@ -1327,6 +1330,18 @@ void tst_QUrl::fromLocalFile_data()
<< QString("file://somehost") + suffix
<< QString(suffix);
#endif
QTest::addRow("windows-extlen-%s", pathDescription)
<< QString("//?") + suffix
<< QString("file:////%3F") + suffix
<< QString("//?") + suffix;
QTest::addRow("windows-wsl-%s", pathDescription)
<< QString("//wsl$") + suffix
<< QString("file:////wsl$") + suffix
<< QString("//wsl$") + suffix;
QTest::addRow("windows-device--%s", pathDescription)
<< QString("//.") + suffix
<< QString("file:////.") + suffix
<< QString("//.") + suffix;
}
QTest::newRow("windows-webdav")