mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-23 05:25:50 +03:00
Code Issues Projects Releases Packages Wiki Activity

[CSE] Bypass rename if it's e2e

Browse source 
The client tracks the files in server and locally, but the
names of the files differ in the server, but we do *not*
wanna rename the files to the server one, we wanna
keep it as is if it's an encrypted file.
This commit is contained in:
Tomaz Canabrava 2018-01-28 23:48:51 +01:00
parent 7b123650da
commit d38e5e1529
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/csync/csync_update.cpp
View file

@ -343,8 +343,21 @@ static int _csync_detect_update(CSYNC *ctx, std::unique_ptr<csync_file_stat_t> f
csync_rename_record(ctx, base._path, fs->path);
}
qCDebug(lcUpdate, "remote rename detected based on fileid %s --> %s", base._path.constData(), fs->path.constData());
fs->instruction = CSYNC_INSTRUCTION_EVAL_RENAME;
/* A remote rename can also mean Encryption Mangled Name.
* if we find one of those in the database, we ignore it.
*/
qCDebug(lcUpdate) << "Tryig to get the mangled name!";
QString remoteEncryptedName = ctx->statedb->getE2eMangledName(fs->path);
qCDebug(lcUpdate) << "Remote Encrypted Name stored for" << fs->path << "is"
<< (remoteEncryptedName.isEmpty() ? "Empty" : remoteEncryptedName);
qCDebug(lcUpdate) << "And for the last part" << ctx->statedb->getE2eMangledName(fs->path.split('/')[1]);
if (remoteEncryptedName.isEmpty()) {
qCDebug(lcUpdate, "remote rename detected based on fileid %s --> %s", base._path.constData(), fs->path.constData());
fs->instruction = CSYNC_INSTRUCTION_EVAL_RENAME;
} else {
qCDebug(lcUpdate) << "Should *not* rename the file.";
}
done = true;
};