mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-24 22:15:57 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #315 from nextcloud/upstream/pr/6379

Browse source 
Discovery: Error if properties are missing #6317
This commit is contained in:
Roeland Jago Douma 2018-06-03 19:58:21 +02:00 committed by GitHub
commit f96206705a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/libsync/discoveryphase.cpp
View file

@ -300,10 +300,8 @@ void DiscoverySingleDirectoryJob::abort()
} }
} }
static std::unique_ptr<csync_file_stat_t> propertyMapToFileStat(const QMap<QString, QString> &map) static void propertyMapToFileStat(const QMap<QString, QString> &map, csync_file_stat_t *file_stat)
{ {
std::unique_ptr<csync_file_stat_t> file_stat(new csync_file_stat_t);
for (auto it = map.constBegin(); it != map.constEnd(); ++it) { for (auto it = map.constBegin(); it != map.constEnd(); ++it) {
QString property = it.key(); QString property = it.key();
QString value = it.value(); QString value = it.value();
@ -316,10 +314,13 @@ static std::unique_ptr<csync_file_stat_t> propertyMapToFileStat(const QMap<QStri
} else if (property == "getlastmodified") { } else if (property == "getlastmodified") {
file_stat->modtime = oc_httpdate_parse(value.toUtf8()); file_stat->modtime = oc_httpdate_parse(value.toUtf8());
} else if (property == "getcontentlength") { } else if (property == "getcontentlength") {
// See #4573, sometimes negative size values are returned
bool ok = false; bool ok = false;
qlonglong ll = value.toLongLong(&ok); qlonglong ll = value.toLongLong(&ok);
if (ok && ll >= 0) { if (ok && ll >= 0) {
file_stat->size = ll; file_stat->size = ll;
} else {
file_stat->size = 0;
} }
} else if (property == "getetag") { } else if (property == "getetag") {
file_stat->etag = Utility::normalizeEtag(value.toUtf8()); file_stat->etag = Utility::normalizeEtag(value.toUtf8());
@ -346,7 +347,6 @@ static std::unique_ptr<csync_file_stat_t> propertyMapToFileStat(const QMap<QStri
} }
} }
} }
return file_stat;
} }
void DiscoverySingleDirectoryJob::directoryListingIteratedSlot(QString file, const QMap<QString, QString> &map) void DiscoverySingleDirectoryJob::directoryListingIteratedSlot(QString file, const QMap<QString, QString> &map)
@ -374,12 +374,26 @@ void DiscoverySingleDirectoryJob::directoryListingIteratedSlot(QString file, con
file = file.remove(0, 1); file = file.remove(0, 1);
} }
std::unique_ptr<csync_file_stat_t> file_stat(new csync_file_stat_t);
std::unique_ptr<csync_file_stat_t> file_stat(propertyMapToFileStat(map));
file_stat->path = file.toUtf8(); file_stat->path = file.toUtf8();
if (file_stat->etag.isEmpty()) { file_stat->size = -1;
qCCritical(lcDiscovery) << "etag of" << file_stat->path << "is" << file_stat->etag << "This must not happen."; file_stat->modtime = -1;
propertyMapToFileStat(map, file_stat.get());
if (file_stat->type == ItemTypeDirectory)
file_stat->size = 0;
if (file_stat->type == ItemTypeSkip
|| file_stat->size == -1
|| file_stat->modtime == -1
|| file_stat->remotePerm.isNull()
|| file_stat->etag.isEmpty()
|| file_stat->file_id.isEmpty()) {
_error = tr("The server file discovery reply is missing data.");
qCWarning(lcDiscovery)
<< "Missing properties:" << file << file_stat->type << file_stat->size
<< file_stat->modtime << file_stat->remotePerm.toString()
<< file_stat->etag << file_stat->file_id;
} }
if (_isExternalStorage && file_stat->remotePerm.hasPermission(RemotePermissions::IsMounted)) { if (_isExternalStorage && file_stat->remotePerm.hasPermission(RemotePermissions::IsMounted)) {
/* All the entries in a external storage have 'M' in their permission. However, for all /* All the entries in a external storage have 'M' in their permission. However, for all
purposes in the desktop client, we only need to know about the mount points. purposes in the desktop client, we only need to know about the mount points.
@ -414,6 +428,10 @@ void DiscoverySingleDirectoryJob::lsJobFinishedWithoutErrorSlot()
emit finishedWithError(ERRNO_WRONG_CONTENT, QLatin1String("Server error: PROPFIND reply is not XML formatted!")); emit finishedWithError(ERRNO_WRONG_CONTENT, QLatin1String("Server error: PROPFIND reply is not XML formatted!"));
deleteLater(); deleteLater();
return; return;
} else if (!_error.isEmpty()) {
emit finishedWithError(ERRNO_ERROR_STRING, _error);
deleteLater();
return;
} }
emit etag(_firstEtag); emit etag(_firstEtag);
emit etagConcatenation(_etagConcatenation); emit etagConcatenation(_etagConcatenation);

2
src/libsync/discoveryphase.h
View file

@ -91,6 +91,8 @@ private:
bool _isRootPath; bool _isRootPath;
// If this directory is an external storage (The first item has 'M' in its permission) // If this directory is an external storage (The first item has 'M' in its permission)
bool _isExternalStorage; bool _isExternalStorage;
// If set, the discovery will finish with an error
QString _error;
QPointer<LsColJob> _lsColJob; QPointer<LsColJob> _lsColJob;
public: public: