Differential D6197 Diff 15515 src/ioslaves/file/file.cpp

Changeset View

Standalone View

View Options

src/ioslaves/file/file.cpp

Context not available.
68#include <QMimeDatabase> 68​#include <QMimeDatabase>
69#include <QStandardPaths> 69​#include <QStandardPaths>
70#include <QDataStream> 70​#include <QDataStream>
71​#include <KAuth>
71 72​
72#if HAVE_VOLMGT 73​#if HAVE_VOLMGT
73#include <volmgt.h> 74​#include <volmgt.h>
Context not available.
154} 155​}
155 156​
156FileProtocol::FileProtocol(const QByteArray &pool, const QByteArray &app) 157​FileProtocol::FileProtocol(const QByteArray &pool, const QByteArray &app)
157 : SlaveBase(QByteArrayLiteral("file"), pool, app), mFile(nullptr) 158​ : SlaveBase(QByteArrayLiteral("file"), pool, app), mFile(nullptr), mPriviledgeOpStarted(false)
158{ 159​{
159} 160​}
160 161​
Context not available.
1376 } 1377​ }
1377} 1378​}
1378 1379​
1380​bool FileProtocol::execWithRoot(const QString &action, const QString &subAction, const QVariant &args, PriviledgeWarning warning)
1381​{
1382​#ifdef Q_OS_UNIX
elvisangelaccioUnsubmitted
Done

Can't this go in file_unix.cpp, without ifdefs?

elvisangelaccio: Can't this go in file_unix.cpp, without ifdefs?
aacidUnsubmitted
Done

Why is there an ifdef anyway? KAuth has at least a mac backend (no idea how much it works) but adding an ifdef at this level seems the wrong thing to do.

aacid: Why is there an ifdef anyway? KAuth has at least a mac backend (no idea how much it works) but…
chinmoyrAuthorUnsubmitted
Done

This method will be used by FileProtocol::mkdir and FileProtocol::chmod which are not virtual method. So when called in windows this must return false for the time being. So IMO ifdef or something similar is necessary. What do you suggest?

chinmoyr: This method will be used by FileProtocol::mkdir and FileProtocol::chmod which are not virtual…
aacidUnsubmitted
Done

Well, just use KAuth, since there's no backend in windows it will return false, why do you need an ifdef?

aacid: Well, just use KAuth, since there's no backend in windows it will return false, why do you need…
1383​ QVariantMap argv;
1384​ argv.insert(QStringLiteral("arguments"), args);
1385​ argv.insert(QStringLiteral("subaction"), subAction);
1386​
1387​ KAuth::Action execAction(QStringLiteral("org.kde.kio.file.") + action);
elvisangelaccioUnsubmitted
Done

Prefer QLatin1String if you want to concatenate. Or you could use QStringLiteral("org.kde.kio.file.%1").arg(action).

elvisangelaccio: Prefer `QLatin1String` if you want to concatenate. Or you could use `QStringLiteral("org.kde.
1388​ execAction.setHelperId(QStringLiteral("org.kde.kio.file"));
1389​ execAction.setArguments(argv);
1390​
1391​ int kauthStatus = execAction.status();
1392​ if (kauthStatus == KAuth::Action::AuthRequiredStatus) {
1393​ mPriviledgeOpStarted = true;
1394​ }
1395​
1396​ bool proceed = true;
1397​ if (kauthStatus == KAuth::Action::AuthorizedStatus
1398​ && !mPriviledgeOpStarted
1399​ && metaData(QStringLiteral("ShowInternalWarning")) == QStringLiteral("true")) {
1400​ mPriviledgeOpStarted = true;
1401​ proceed = showWarning(warning);
1402​ }
1403​
1404​ if (proceed) {
1405​ auto reply = execAction.execute();
1406​ if (!reply->exec()) {
1407​ endPriviledgeOp();
1408​ return false;
elvisangelaccioUnsubmitted
Done

Missing i18n() here

elvisangelaccio: Missing i18n() here
1409​ }
elvisangelaccioUnsubmitted
Done

Use ButtonCode::Cancel rather than hardcoding 2

elvisangelaccio: Use `ButtonCode::Cancel` rather than hardcoding 2
1410​ return true;
1411​ }
1412​ endPriviledgeOp();
1413​#endif
1414​ return false;
1415​}
1416​
1417​void FileProtocol::endPriviledgeOp()
1418​{
1419​ mPriviledgeOpStarted = false;
1420​}
1421​
1422​QString FileProtocol::warningMessage(PriviledgeWarning warnId) const
1423​{
1424​ QString message;
1425​ switch(warnId) {
1426​
1427​ case WARN_PRIVILEDGE_DEL: {
1428​ message = i18n("You are attempting to delete a file from a write protected location. "
1429​ "Doing so may cause irreversible damage to your system. Do you want to proceed?");
1430​ break;
1431​ }
1432​ case WARN_PRIVILEDGE_RMDIR: {
1433​ message = i18n("You are attempting to delete a directory from a write protected location. "
1434​ "Doing so may cause irreversible damage to your system. Do you want to proceed?");
1435​ break;
1436​ }
1437​
1438​ }
1439​
1440​ return message;
1441​}
1442​
1443​bool FileProtocol::showWarning(PriviledgeWarning warnId)
elvisangelaccioUnsubmitted
Done

I didn't get this messagebox after deleting something when I was already authenticated. What did I do wrong?

elvisangelaccio: I didn't get this messagebox after deleting something when I was already authenticated. What…
1444​{
1445​ int status = messageBox(WarningContinueCancel, warningMessage(warnId), QStringLiteral("Warning!"), QStringLiteral("Continue"), QStringLiteral("Cancel"));
1446​ return status != 2;
1447​}
1448​
1379// needed for JSON file embedding 1449​// needed for JSON file embedding
1380#include "file.moc" 1450​#include "file.moc"
Context not available.