mirror of
https://github.com/nextcloud/desktop.git
synced 2024-11-26 15:06:08 +03:00
Merge pull request #1986 from nextcloud/properly_handle_denormalized_href_path
Properly handle denormalized href
This commit is contained in:
Michael Schuster
GitHub
commit
0c040c9686
2 changed files with 143 additions and 1 deletions
|
|
@ -209,7 +209,9 @@ bool LsColXMLParser::parse(const QByteArray &xml, QHash<QString, ExtraFolderInfo
|
||||||
if (name == QLatin1String("href")) {
|
if (name == QLatin1String("href")) {
|
||||||
// We don't use URL encoding in our request URL (which is the expected path) (QNAM will do it for us)
|
// We don't use URL encoding in our request URL (which is the expected path) (QNAM will do it for us)
|
||||||
// but the result will have URL encoding..
|
// but the result will have URL encoding..
|
||||||
QString hrefString = QString::fromUtf8(QByteArray::fromPercentEncoding(reader.readElementText().toUtf8()));
|
QString hrefString = QUrl::fromLocalFile(QUrl::fromPercentEncoding(reader.readElementText().toUtf8()))
|
||||||
|
.adjusted(QUrl::NormalizePathSegments)
|
||||||
|
.path();
|
||||||
if (!hrefString.startsWith(expectedPath)) {
|
if (!hrefString.startsWith(expectedPath)) {
|
||||||
qCWarning(lcLsColJob) << "Invalid href" << hrefString << "expected starting with" << expectedPath;
|
qCWarning(lcLsColJob) << "Invalid href" << hrefString << "expected starting with" << expectedPath;
|
||||||
return false;
|
return false;
|
||||||
|
|
|
||||||
|
|
@ -402,6 +402,146 @@ private slots:
|
||||||
QVERIFY(!_success);
|
QVERIFY(!_success);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void testParserDenormalizedPath() {
|
||||||
|
const QByteArray testXml = "<?xml version='1.0' encoding='utf-8'?>"
|
||||||
|
"<d:multistatus xmlns:d=\"DAV:\" xmlns:s=\"http://sabredav.org/ns\" xmlns:oc=\"http://owncloud.org/ns\">"
|
||||||
|
"<d:response>"
|
||||||
|
"<d:href>/oc/remote.php/webdav/sharefolder/</d:href>"
|
||||||
|
"<d:propstat>"
|
||||||
|
"<d:prop>"
|
||||||
|
"<oc:id>00004213ocobzus5kn6s</oc:id>"
|
||||||
|
"<oc:permissions>RDNVCK</oc:permissions>"
|
||||||
|
"<oc:size>121780</oc:size>"
|
||||||
|
"<d:getetag>\"5527beb0400b0\"</d:getetag>"
|
||||||
|
"<d:resourcetype>"
|
||||||
|
"<d:collection/>"
|
||||||
|
"</d:resourcetype>"
|
||||||
|
"<d:getlastmodified>Fri, 06 Feb 2015 13:49:55 GMT</d:getlastmodified>"
|
||||||
|
"</d:prop>"
|
||||||
|
"<d:status>HTTP/1.1 200 OK</d:status>"
|
||||||
|
"</d:propstat>"
|
||||||
|
"<d:propstat>"
|
||||||
|
"<d:prop>"
|
||||||
|
"<d:getcontentlength/>"
|
||||||
|
"<oc:downloadURL/>"
|
||||||
|
"<oc:dDC/>"
|
||||||
|
"</d:prop>"
|
||||||
|
"<d:status>HTTP/1.1 404 Not Found</d:status>"
|
||||||
|
"</d:propstat>"
|
||||||
|
"</d:response>"
|
||||||
|
"<d:response>"
|
||||||
|
"<d:href>/oc/remote.php/webdav/sharefolder/../sharefolder/quitte.pdf</d:href>"
|
||||||
|
"<d:propstat>"
|
||||||
|
"<d:prop>"
|
||||||
|
"<oc:id>00004215ocobzus5kn6s</oc:id>"
|
||||||
|
"<oc:permissions>RDNVW</oc:permissions>"
|
||||||
|
"<d:getetag>\"2fa2f0d9ed49ea0c3e409d49e652dea0\"</d:getetag>"
|
||||||
|
"<d:resourcetype/>"
|
||||||
|
"<d:getlastmodified>Fri, 06 Feb 2015 13:49:55 GMT</d:getlastmodified>"
|
||||||
|
"<d:getcontentlength>121780</d:getcontentlength>"
|
||||||
|
"</d:prop>"
|
||||||
|
"<d:status>HTTP/1.1 200 OK</d:status>"
|
||||||
|
"</d:propstat>"
|
||||||
|
"<d:propstat>"
|
||||||
|
"<d:prop>"
|
||||||
|
"<oc:downloadURL/>"
|
||||||
|
"<oc:dDC/>"
|
||||||
|
"</d:prop>"
|
||||||
|
"<d:status>HTTP/1.1 404 Not Found</d:status>"
|
||||||
|
"</d:propstat>"
|
||||||
|
"</d:response>"
|
||||||
|
"</d:multistatus>";
|
||||||
|
|
||||||
|
|
||||||
|
LsColXMLParser parser;
|
||||||
|
|
||||||
|
connect( &parser, SIGNAL(directoryListingSubfolders(const QStringList&)),
|
||||||
|
this, SLOT(slotDirectoryListingSubFolders(const QStringList&)) );
|
||||||
|
connect( &parser, SIGNAL(directoryListingIterated(const QString&, const QMap<QString,QString>&)),
|
||||||
|
this, SLOT(slotDirectoryListingIterated(const QString&, const QMap<QString,QString>&)) );
|
||||||
|
connect( &parser, SIGNAL(finishedWithoutError()),
|
||||||
|
this, SLOT(slotFinishedSuccessfully()) );
|
||||||
|
|
||||||
|
QHash <QString, ExtraFolderInfo> sizes;
|
||||||
|
QVERIFY(parser.parse( testXml, &sizes, "/oc/remote.php/webdav/sharefolder" ));
|
||||||
|
|
||||||
|
QVERIFY(_success);
|
||||||
|
QCOMPARE(sizes.size(), 1 ); // Quota info in the XML
|
||||||
|
|
||||||
|
QVERIFY(_items.contains("/oc/remote.php/webdav/sharefolder/quitte.pdf"));
|
||||||
|
QVERIFY(_items.contains("/oc/remote.php/webdav/sharefolder"));
|
||||||
|
QVERIFY(_items.size() == 2 );
|
||||||
|
|
||||||
|
QVERIFY(_subdirs.contains("/oc/remote.php/webdav/sharefolder/"));
|
||||||
|
QVERIFY(_subdirs.size() == 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
void testParserDenormalizedPathOutsideNamespace() {
|
||||||
|
const QByteArray testXml = "<?xml version='1.0' encoding='utf-8'?>"
|
||||||
|
"<d:multistatus xmlns:d=\"DAV:\" xmlns:s=\"http://sabredav.org/ns\" xmlns:oc=\"http://owncloud.org/ns\">"
|
||||||
|
"<d:response>"
|
||||||
|
"<d:href>/oc/remote.php/webdav/sharefolder/</d:href>"
|
||||||
|
"<d:propstat>"
|
||||||
|
"<d:prop>"
|
||||||
|
"<oc:id>00004213ocobzus5kn6s</oc:id>"
|
||||||
|
"<oc:permissions>RDNVCK</oc:permissions>"
|
||||||
|
"<oc:size>121780</oc:size>"
|
||||||
|
"<d:getetag>\"5527beb0400b0\"</d:getetag>"
|
||||||
|
"<d:resourcetype>"
|
||||||
|
"<d:collection/>"
|
||||||
|
"</d:resourcetype>"
|
||||||
|
"<d:getlastmodified>Fri, 06 Feb 2015 13:49:55 GMT</d:getlastmodified>"
|
||||||
|
"</d:prop>"
|
||||||
|
"<d:status>HTTP/1.1 200 OK</d:status>"
|
||||||
|
"</d:propstat>"
|
||||||
|
"<d:propstat>"
|
||||||
|
"<d:prop>"
|
||||||
|
"<d:getcontentlength/>"
|
||||||
|
"<oc:downloadURL/>"
|
||||||
|
"<oc:dDC/>"
|
||||||
|
"</d:prop>"
|
||||||
|
"<d:status>HTTP/1.1 404 Not Found</d:status>"
|
||||||
|
"</d:propstat>"
|
||||||
|
"</d:response>"
|
||||||
|
"<d:response>"
|
||||||
|
"<d:href>/oc/remote.php/webdav/sharefolder/../quitte.pdf</d:href>"
|
||||||
|
"<d:propstat>"
|
||||||
|
"<d:prop>"
|
||||||
|
"<oc:id>00004215ocobzus5kn6s</oc:id>"
|
||||||
|
"<oc:permissions>RDNVW</oc:permissions>"
|
||||||
|
"<d:getetag>\"2fa2f0d9ed49ea0c3e409d49e652dea0\"</d:getetag>"
|
||||||
|
"<d:resourcetype/>"
|
||||||
|
"<d:getlastmodified>Fri, 06 Feb 2015 13:49:55 GMT</d:getlastmodified>"
|
||||||
|
"<d:getcontentlength>121780</d:getcontentlength>"
|
||||||
|
"</d:prop>"
|
||||||
|
"<d:status>HTTP/1.1 200 OK</d:status>"
|
||||||
|
"</d:propstat>"
|
||||||
|
"<d:propstat>"
|
||||||
|
"<d:prop>"
|
||||||
|
"<oc:downloadURL/>"
|
||||||
|
"<oc:dDC/>"
|
||||||
|
"</d:prop>"
|
||||||
|
"<d:status>HTTP/1.1 404 Not Found</d:status>"
|
||||||
|
"</d:propstat>"
|
||||||
|
"</d:response>"
|
||||||
|
"</d:multistatus>";
|
||||||
|
|
||||||
|
|
||||||
|
LsColXMLParser parser;
|
||||||
|
|
||||||
|
connect( &parser, SIGNAL(directoryListingSubfolders(const QStringList&)),
|
||||||
|
this, SLOT(slotDirectoryListingSubFolders(const QStringList&)) );
|
||||||
|
connect( &parser, SIGNAL(directoryListingIterated(const QString&, const QMap<QString,QString>&)),
|
||||||
|
this, SLOT(slotDirectoryListingIterated(const QString&, const QMap<QString,QString>&)) );
|
||||||
|
connect( &parser, SIGNAL(finishedWithoutError()),
|
||||||
|
this, SLOT(slotFinishedSuccessfully()) );
|
||||||
|
|
||||||
|
QHash <QString, ExtraFolderInfo> sizes;
|
||||||
|
QVERIFY(!parser.parse( testXml, &sizes, "/oc/remote.php/webdav/sharefolder" ));
|
||||||
|
|
||||||
|
QVERIFY(!_success);
|
||||||
|
}
|
||||||
|
|
||||||
void testHrefUrlEncoding() {
|
void testHrefUrlEncoding() {
|
||||||
const QByteArray testXml = "<?xml version='1.0' encoding='utf-8'?>"
|
const QByteArray testXml = "<?xml version='1.0' encoding='utf-8'?>"
|
||||||
"<d:multistatus xmlns:d=\"DAV:\" xmlns:s=\"http://sabredav.org/ns\" xmlns:oc=\"http://owncloud.org/ns\">"
|
"<d:multistatus xmlns:d=\"DAV:\" xmlns:s=\"http://sabredav.org/ns\" xmlns:oc=\"http://owncloud.org/ns\">"
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue