feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Utils: Fix FilePath::fromString host decoding

Browse Source 
Previously FilePath::fromString did not decode %25 (%) and %2f (/),
so a round of ::fromString(::toString()) would not return the same host.

Change-Id: I99c7317fb149443c2e52c099f7da7c4ef6768aff
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Marcus Tillmanns
2022-10-20 08:36:43 +02:00
parent 5c313b706f
commit 3ac5051af9
2 changed files with 61 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/libs/utils/filepath.cpp
View File

@@ -180,6 +180,11 @@ QString FilePath::encodedHost() const
return result; return result;
} }
QString decodeHost(QString host)
{
return host.replace("%25", "%").replace("%2f", "/");
}
/// \returns a QString for passing on to QString based APIs /// \returns a QString for passing on to QString based APIs
QString FilePath::toString() const QString FilePath::toString() const
{ {
@@ -765,10 +770,10 @@ void FilePath::setFromString(const QString &unnormalizedFileName)
const int firstSlash = withoutQtcDeviceRoot.indexOf(slash); const int firstSlash = withoutQtcDeviceRoot.indexOf(slash);
if (firstSlash != -1) { if (firstSlash != -1) {
QString scheme = withoutQtcDeviceRoot.left(firstSlash).toString(); const QString scheme = withoutQtcDeviceRoot.left(firstSlash).toString();
const int secondSlash = withoutQtcDeviceRoot.indexOf(slash, firstSlash + 1); const int secondSlash = withoutQtcDeviceRoot.indexOf(slash, firstSlash + 1);
QString host = withoutQtcDeviceRoot.mid(firstSlash + 1, secondSlash - firstSlash - 1) const QString host = decodeHost(
.toString(); withoutQtcDeviceRoot.mid(firstSlash + 1, secondSlash - firstSlash - 1).toString());
if (secondSlash != -1) { if (secondSlash != -1) {
QStringView path = withoutQtcDeviceRoot.mid(secondSlash); QStringView path = withoutQtcDeviceRoot.mid(secondSlash);
setParts(scheme, host, path); setParts(scheme, host, path);
@@ -787,9 +792,9 @@ void FilePath::setFromString(const QString &unnormalizedFileName)
const int schemeEnd = fileName.indexOf(colonSlashSlash); const int schemeEnd = fileName.indexOf(colonSlashSlash);
if (schemeEnd != -1 && schemeEnd < firstSlash) { if (schemeEnd != -1 && schemeEnd < firstSlash) {
// This is a pseudo Url, we can't use QUrl here sadly. // This is a pseudo Url, we can't use QUrl here sadly.
QString scheme = fileName.left(schemeEnd); const QString scheme = fileName.left(schemeEnd);
const int hostEnd = fileName.indexOf(slash, schemeEnd + 3); const int hostEnd = fileName.indexOf(slash, schemeEnd + 3);
QString host = fileName.mid(schemeEnd + 3, hostEnd - schemeEnd - 3); const QString host = decodeHost(fileName.mid(schemeEnd + 3, hostEnd - schemeEnd - 3));
setParts(scheme, host, hostEnd != -1 ? QStringView(fileName).mid(hostEnd) : QStringView()); setParts(scheme, host, hostEnd != -1 ? QStringView(fileName).mid(hostEnd) : QStringView());
return; return;
} }

51
tests/auto/utils/fileutils/tst_fileutils.cpp
View File

@@ -104,6 +104,9 @@ private slots:
void isSameFile_data(); void isSameFile_data();
void isSameFile(); void isSameFile();
void hostSpecialChars_data();
void hostSpecialChars();
private: private:
QTemporaryDir tempDir; QTemporaryDir tempDir;
QString rootPath; QString rootPath;
@@ -1159,6 +1162,54 @@ void tst_fileutils::isSameFile()
QCOMPARE(left.isSameFile(right), shouldBeEqual); QCOMPARE(left.isSameFile(right), shouldBeEqual);
} }
void tst_fileutils::hostSpecialChars_data()
{
QTest::addColumn<QString>("scheme");
QTest::addColumn<QString>("host");
QTest::addColumn<QString>("path");
QTest::addColumn<FilePath>("expected");
QTest::addRow("slash-in-host") << "device" << "host/name" << "/" << FilePath::fromString("device://host%2fname/");
QTest::addRow("percent-in-host") << "device" << "host%name" << "/" << FilePath::fromString("device://host%25name/");
QTest::addRow("percent-and-slash-in-host") << "device" << "host/%name" << "/" << FilePath::fromString("device://host%2f%25name/");
QTest::addRow("qtc-dev-slash-in-host-linux") << "device" << "host/name" << "/" << FilePath::fromString("/__qtc_devices__/device/host%2fname/");
QTest::addRow("qtc-dev-slash-in-host-windows") << "device" << "host/name" << "/" << FilePath::fromString("c:/__qtc_devices__/device/host%2fname/");
}
void tst_fileutils::hostSpecialChars()
{
QFETCH(QString, scheme);
QFETCH(QString, host);
QFETCH(QString, path);
QFETCH(FilePath, expected);
FilePath fp;
fp.setParts(scheme, host, path);
// Check that setParts and fromString give the same result
QCOMPARE(fp, expected);
QCOMPARE(fp.host(), expected.host());
QCOMPARE(fp.host(), host);
QCOMPARE(expected.host(), host);
QString toStringExpected = expected.toString();
QString toStringActual = fp.toString();
// Check that toString gives the same result
QCOMPARE(toStringActual, toStringExpected);
// Check that fromString => toString => fromString gives the same result
FilePath toFromExpected = FilePath::fromString(expected.toString());
QCOMPARE(toFromExpected, expected);
QCOMPARE(toFromExpected, fp);
// Check that setParts => toString => fromString gives the same result
FilePath toFromActual = FilePath::fromString(fp.toString());
QCOMPARE(toFromActual, fp);
QCOMPARE(toFromExpected, expected);
}
QTEST_GUILESS_MAIN(tst_fileutils) QTEST_GUILESS_MAIN(tst_fileutils)
#include "tst_fileutils.moc" #include "tst_fileutils.moc"