Index: src/core/global.h =================================================================== --- src/core/global.h +++ src/core/global.h @@ -262,6 +262,15 @@ }; /** + * Specifies privilege file operation status. + */ +enum PrivilegeFileOpStatus { + OperationNotAllowed, + OperationAllowed, + OperationCancelled +}; + +/** * Parses the string representation of the cache control option. * * @param cacheControl the string representation Index: src/core/slavebase.h =================================================================== --- src/core/slavebase.h +++ src/core/slavebase.h @@ -935,6 +935,14 @@ */ int waitForHostInfo(QHostInfo &info); + /** + * Checks with job if privilege operation is allowed. + * @return an integer corresponding to one of the three status, OperationNotAllowed, OperationAllowed, OperationCanceled. + * @see PrivilegeFileOpStatus + * @since 5.38 + */ + int isPrivilegeOperationAllowed(); + protected: /** * Name of the protocol supported by this slave Index: src/core/slavebase.cpp =================================================================== --- src/core/slavebase.cpp +++ src/core/slavebase.cpp @@ -1457,3 +1457,11 @@ return result; } + +int SlaveBase::isPrivilegeOperationAllowed() +{ + QByteArray buffer = "0"; + send(MSG_PRIVILEGE_EXEC); + waitForAnswer(MSG_PRIVILEGE_EXEC, 0, buffer); + return buffer.toInt(); +} Index: src/core/slaveinterface.h =================================================================== --- src/core/slaveinterface.h +++ src/core/slaveinterface.h @@ -84,7 +84,8 @@ MSG_DEL_AUTH_KEY, ///< @deprecated MSG_OPENED, MSG_WRITTEN, - MSG_HOST_INFO_REQ + MSG_HOST_INFO_REQ, + MSG_PRIVILEGE_EXEC // add new ones here once a release is done, to avoid breaking binary compatibility }; @@ -144,6 +145,8 @@ void open(); void written(KIO::filesize_t); + void privilegeOperationRequested(); + /////////// // Info sent by the slave ////////// Index: src/core/slaveinterface.cpp =================================================================== --- src/core/slaveinterface.cpp +++ src/core/slaveinterface.cpp @@ -319,6 +319,9 @@ HostInfo::lookupHost(hostName, this, SLOT(slotHostInfo(QHostInfo))); break; } + case MSG_PRIVILEGE_EXEC: + emit privilegeOperationRequested(); + break; default: qCWarning(KIO_CORE) << "Slave sends unknown command (" << _cmd << "), dropping slave"; return false; Index: src/ioslaves/file/file.h =================================================================== --- src/ioslaves/file/file.h +++ src/ioslaves/file/file.h @@ -39,6 +39,8 @@ #include #endif +#include "file_p.h" + #include Q_DECLARE_LOGGING_CATEGORY(KIO_FILE) @@ -100,6 +102,9 @@ void fileSystemFreeSpace(const QUrl &url); // KF6 TODO: Turn into virtual method in SlaveBase + bool execWithElevatedPrivilege(ActionType action, const QVariant &arg1, + const QVariant &arg2 = QVariant(), + const QVariant &arg3 = QVariant()); private: mutable QHash mUsercache; mutable QHash mGroupcache; Index: src/ioslaves/file/file_p.h =================================================================== --- src/ioslaves/file/file_p.h +++ src/ioslaves/file/file_p.h @@ -21,6 +21,8 @@ #ifndef FILE_P_H #define FILE_P_H +#define EUSERCANCELLED 255 + enum ActionType { CHMOD = 1, CHOWN, Index: src/ioslaves/file/file_unix.cpp =================================================================== --- src/ioslaves/file/file_unix.cpp +++ src/ioslaves/file/file_unix.cpp @@ -39,6 +39,8 @@ #include #include +#include + //sendfile has different semantics in different platforms #if defined HAVE_SENDFILE && defined Q_OS_LINUX #define USE_SENDFILE 1 @@ -650,3 +652,47 @@ finished(); } + +bool FileProtocol::execWithElevatedPrivilege(ActionType action, const QVariant &arg1, + const QVariant &arg2, const QVariant &arg3) +{ + if (!(errno == EACCES || errno == EPERM)) { + return false; + } + + KIO::PrivilegeFileOpStatus fileOpStatus = static_cast(isPrivilegeOperationAllowed()); + if (fileOpStatus != KIO::OperationAllowed) { + if (fileOpStatus == KIO::OperationCancelled) { + errno = EUSERCANCELED; + } + return false; + } + + KAuth::Action execAction(QStringLiteral("org.kde.kio.file.exec")); + execAction.setHelperId(QStringLiteral("org.kde.kio.file")); + + // if we are unit testing let's pretend to execute the action. + if (metaData(QStringLiteral("UnitTesting")) == QLatin1String("true")) { + const QString metaData = execAction.name() + ',' + + (execAction.isValid() ? "true" : "false") + ',' + + execAction.helperId() + ',' + + (execAction.status() == KAuth::Action::AuthRequiredStatus ? "true" : "false"); + setMetaData(QStringLiteral("TestData"), metaData); + return true; + } + + QByteArray helperArgs; + QDataStream out(&helperArgs, QIODevice::WriteOnly); + out << action << arg1 << arg2 << arg3; + + QVariantMap argv; + argv.insert(QStringLiteral("arguments"), helperArgs); + execAction.setArguments(argv); + + auto reply = execAction.execute(); + if (reply->exec()) { + return true; + } + + return false; +} Index: src/ioslaves/file/file_win.cpp =================================================================== --- src/ioslaves/file/file_win.cpp +++ src/ioslaves/file/file_win.cpp @@ -374,3 +374,9 @@ finished(); } + +bool FileProtocol::execWithElevatedPrivilege(int, ActionType, const QVariant &, + const QVariant &, const QVariant &) +{ + return false; +}