mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-28 19:58:56 +03:00
Code Issues Projects Releases Packages Wiki Activity

SocketAPI: Before reporting something new check for parent permissions.

Browse source 
In case it is not allowed to create files or dirs because of missing
permissions in shares, the socket API has to report an error state
rather than the NEW state.

As discussed in mirall issue #1931
This commit is contained in:
Klaas Freitag 2014-09-25 21:49:38 +02:00
parent 172295289e
commit 98d9f7924d
1 changed files with 36 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/mirall/socketapi.cpp
View file

@ -110,6 +110,18 @@ SyncFileStatus recursiveFolderStatus(Folder *folder, const QString& fileName, c_
return result; return result;
} }
SyncJournalFileRecord dbFileRecord( Folder *folder, QString fileName )
{
QFileInfo fi(fileName);
if( !folder ) {
return SyncJournalFileRecord();
}
if( fi.isAbsolute() ) {
fileName.remove(0, folder->path().length());
}
return( folder->journalDb()->getFileRecord(fileName) );
}
/** /**
* Get status about a single file. * Get status about a single file.
*/ */
@ -157,8 +169,30 @@ SyncFileStatus fileStatus(Folder *folder, const QString& systemFileName, c_strli
// Problem: for the sync dir itself we do not have a record in the sync journal // Problem: for the sync dir itself we do not have a record in the sync journal
// so the next check must not be used for the sync root folder. // so the next check must not be used for the sync root folder.
SyncJournalFileRecord rec = folder->journalDb()->getFileRecord(unixFileName); SyncJournalFileRecord rec = dbFileRecord(folder, unixFileName );
if( !isSyncRootFolder && !rec.isValid() ) { if( !isSyncRootFolder && !rec.isValid() ) {
// check the parent folder if it is shared and if it is allowed to create a file/dir within
QDir d( fi.path() );
QString parentPath = d.path();
SyncJournalFileRecord dirRec = dbFileRecord(folder, parentPath);
while( !d.isRoot() && !(d.exists() && dirRec.isValid()) ) {
d.cdUp(); // returns true if the dir exists.
parentPath = d.path();
// cut the folder path
dirRec = dbFileRecord(folder, parentPath);
}
if( dirRec.isValid() ) {
if( dirRec._type == CSYNC_FTW_TYPE_DIR ) {
if( !dirRec._remotePerm.contains("K") ) {
return SyncFileStatus::STATUS_ERROR;
}
} else {
if( !dirRec._remotePerm.contains("C") ) {
return SyncFileStatus::STATUS_ERROR;
}
}
}
return SyncFileStatus(SyncFileStatus::STATUS_NEW); return SyncFileStatus(SyncFileStatus::STATUS_NEW);
} }
@ -443,3 +477,4 @@ void SocketApi::command_VERSION(const QString&, QTcpSocket* socket)
} // namespace Mirall } // namespace Mirall