Differential D22889 Diff 64348 src/util/externalcommand.cpp

Changeset View

Standalone View

View Options

src/util/externalcommand.cpp

1/************************************************************************* 1​/*************************************************************************
2 * Copyright (C) 2008 by Volker Lanz <vl@fidra.de> * 2​ * Copyright (C) 2008 by Volker Lanz <vl@fidra.de> *
3 * Copyright (C) 2016-2018 by Andrius Štikonas <andrius@stikonas.eu> * 3​ * Copyright (C) 2016-2018 by Andrius Štikonas <andrius@stikonas.eu> *
4​ * Copyright (C) 2019 by Shubham <aryan100jangid@gmail.com> *
4 * * 5​ * *
5 * This program is free software; you can redistribute it and/or * 6​ * This program is free software; you can redistribute it and/or *
6 * modify it under the terms of the GNU General Public License as * 7​ * modify it under the terms of the GNU General Public License as *
7 * published by the Free Software Foundation; either version 3 of * 8​ * published by the Free Software Foundation; either version 3 of *
8 * the License, or (at your option) any later version. * 9​ * the License, or (at your option) any later version. *
9 * * 10​ * *
10 * This program is distributed in the hope that it will be useful, * 11​ * This program is distributed in the hope that it will be useful, *
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of * 12​ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * 13​ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
13 * GNU General Public License for more details. * 14​ * GNU General Public License for more details. *
14 * * 15​ * *
15 * You should have received a copy of the GNU General Public License * 16​ * You should have received a copy of the GNU General Public License *
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.* 17​ * along with this program. If not, see <http://www.gnu.org/licenses/>.*
17 *************************************************************************/ 18​ *************************************************************************/
18 19​
19#include "backend/corebackendmanager.h" 20​#include "backend/corebackendmanager.h"
20#include "core/device.h" 21​#include "core/device.h"
21#include "core/copysource.h" 22​#include "core/copysource.h"
22#include "core/copytarget.h" 23​#include "core/copytarget.h"
23#include "core/copytargetbytearray.h" 24​#include "core/copytargetbytearray.h"
24#include "core/copysourcedevice.h" 25​#include "core/copysourcedevice.h"
25#include "core/copytargetdevice.h" 26​#include "core/copytargetdevice.h"
26#include "util/globallog.h" 27​#include "util/globallog.h"
27#include "util/externalcommand.h" 28​#include "util/externalcommand.h"
29​#include "util/externalcommand_polkitbackend.h"
28#include "util/report.h" 30​#include "util/report.h"
29 31​
30#include "externalcommandhelper_interface.h" 32​#include "externalcommandhelper_interface.h"
31 33​
32#include <QCryptographicHash> 34​#include <QtDBus>
33#include <QDBusConnection> ​
34#include <QDBusInterface> ​
35#include <QDBusReply> ​
36#include <QEventLoop> 35​#include <QEventLoop>
37#include <QtGlobal> ​
38#include <QStandardPaths> 36​#include <QStandardPaths>
39#include <QString> 37​#include <QString>
40#include <QStringList> 38​#include <QStringList>
41#include <QTimer> ​
42#include <QThread> 39​#include <QThread>
40​#include <QTimer>
43#include <QVariant> 41​#include <QVariant>
44 42​
45#include <KAuth> ​
46#include <KJob> 43​#include <KJob>
47#include <KLocalizedString> 44​#include <KLocalizedString>
48 45​
46​#include <PolkitQt1/Authority>
47​
49struct ExternalCommandPrivate 48​struct ExternalCommandPrivate
50{ 49​{
51 Report *m_Report; 50​ Report *m_Report;
52 QString m_Command; 51​ QString m_Command;
53 QStringList m_Args; 52​ QStringList m_Args;
54 int m_ExitCode; 53​ int m_ExitCode;
55 QByteArray m_Output; 54​ QByteArray m_Output;
56 QByteArray m_Input; 55​ QByteArray m_Input;
57 DBusThread *m_thread; ​
58 QProcess::ProcessChannelMode processChannelMode; 56​ QProcess::ProcessChannelMode processChannelMode;
59}; 57​};
60 58​
61KAuth::ExecuteJob* ExternalCommand::m_job; 59​Auth::PolkitQt1Backend* ExternalCommand::m_authJob;
62bool ExternalCommand::helperStarted = false; 60​bool ExternalCommand::helperStarted = false;
63QWidget* ExternalCommand::parent; 61​QWidget* ExternalCommand::parent;
64 62​
65 ​
66/** Creates a new ExternalCommand instance without Report. 63​/** Creates a new ExternalCommand instance without Report.
67 @param cmd the command to run 64​ @param cmd the command to run
68 @param args the arguments to pass to the command 65​ @param args the arguments to pass to the command
69*/ 66​*/
70ExternalCommand::ExternalCommand(const QString& cmd, const QStringList& args, const QProcess::ProcessChannelMode processChannelMode) : 67​ExternalCommand::ExternalCommand(const QString& cmd, const QStringList& args, const QProcess::ProcessChannelMode processChannelMode) :
71 d(std::make_unique<ExternalCommandPrivate>()) 68​ d(std::make_unique<ExternalCommandPrivate>())
72{ 69​{
73 d->m_Report = nullptr; 70​ d->m_Report = nullptr;
74 d->m_Command = cmd; 71​ d->m_Command = cmd;
75 d->m_Args = args; 72​ d->m_Args = args;
76 d->m_ExitCode = -1; 73​ d->m_ExitCode = -1;
77 d->m_Output = QByteArray(); 74​ d->m_Output = QByteArray();
78 75​
76​ m_authJob = new Auth::PolkitQt1Backend;
77​
79 if (!helperStarted) 78​ if (!helperStarted)
80 if(!startHelper()) 79​ if(!startHelper())
81 Log(Log::Level::error) << xi18nc("@info:status", "Could not obtain administrator privileges."); 80​ Log(Log::Level::error) << xi18nc("@info:status", "Could not obtain administrator privileges.");
82 81​
83 d->processChannelMode = processChannelMode; 82​ d->processChannelMode = processChannelMode;
84} 83​}
85 84​
86/** Creates a new ExternalCommand instance with Report. 85​/** Creates a new ExternalCommand instance with Report.
87 @param report the Report to write output to. 86​ @param report the Report to write output to.
88 @param cmd the command to run 87​ @param cmd the command to run
89 @param args the arguments to pass to the command 88​ @param args the arguments to pass to the command
90 */ 89​ */
91ExternalCommand::ExternalCommand(Report& report, const QString& cmd, const QStringList& args, const QProcess::ProcessChannelMode processChannelMode) : 90​ExternalCommand::ExternalCommand(Report& report, const QString& cmd, const QStringList& args, const QProcess::ProcessChannelMode processChannelMode) :
92 d(std::make_unique<ExternalCommandPrivate>()) 91​ d(std::make_unique<ExternalCommandPrivate>())
93{ 92​{
94 d->m_Report = report.newChild(); 93​ d->m_Report = report.newChild();
95 d->m_Command = cmd; 94​ d->m_Command = cmd;
96 d->m_Args = args; 95​ d->m_Args = args;
97 d->m_ExitCode = -1; 96​ d->m_ExitCode = -1;
98 d->m_Output = QByteArray(); 97​ d->m_Output = QByteArray();
99 ​
100 d->processChannelMode = processChannelMode; 98​ d->processChannelMode = processChannelMode;
101} 99​}
102 100​
103ExternalCommand::~ExternalCommand() 101​ExternalCommand::~ExternalCommand()
104{ 102​{
105 103​
106} 104​}
107 105​
Show All 25 Lines119{
133 131​
134 if ( qEnvironmentVariableIsSet( "KPMCORE_DEBUG" )) 132​ if ( qEnvironmentVariableIsSet( "KPMCORE_DEBUG" ))
135 qDebug() << xi18nc("@info:status", "Command: %1 %2", command(), args().join(QStringLiteral(" "))); 133​ qDebug() << xi18nc("@info:status", "Command: %1 %2", command(), args().join(QStringLiteral(" ")));
136 134​
137 QString cmd = QStandardPaths::findExecutable(command()); 135​ QString cmd = QStandardPaths::findExecutable(command());
138 if (cmd.isEmpty()) 136​ if (cmd.isEmpty())
139 cmd = QStandardPaths::findExecutable(command(), { QStringLiteral("/sbin/"), QStringLiteral("/usr/sbin/"), QStringLiteral("/usr/local/sbin/") }); 137​ cmd = QStandardPaths::findExecutable(command(), { QStringLiteral("/sbin/"), QStringLiteral("/usr/sbin/"), QStringLiteral("/usr/local/sbin/") });
140 138​
141 auto *interface = new org::kde::kpmcore::externalcommand(QStringLiteral("org.kde.kpmcore.externalcommand"), 139​ auto interface = new org::kde::kpmcore::externalcommand(QStringLiteral("org.kde.kpmcore.externalcommand"),
142 QStringLiteral("/Helper"), QDBusConnection::systemBus(), this); 140​ QStringLiteral("/Helper"), QDBusConnection::systemBus(), this);
143 141​
144 interface->setTimeout(10 * 24 * 3600 * 1000); // 10 days 142​ interface->setTimeout(10 * 24 * 3600 * 1000); // 10 days
145 143​
146 bool rval = false; 144​ bool rval = false;
147 145​
148 QDBusPendingCall pcall = interface->start(cmd, args(), d->m_Input, d->processChannelMode); 146​ QDBusPendingCall pcall = interface->start(cmd, args(), d->m_Input, d->processChannelMode);
149 147​
Show All 27 Lines174{
177 bool rval = true; 175​ bool rval = true;
178 const qint64 blockSize = 10 * 1024 * 1024; // number of bytes per block to copy 176​ const qint64 blockSize = 10 * 1024 * 1024; // number of bytes per block to copy
179 177​
180 if (!QDBusConnection::systemBus().isConnected()) { 178​ if (!QDBusConnection::systemBus().isConnected()) {
181 qWarning() << QDBusConnection::systemBus().lastError().message(); 179​ qWarning() << QDBusConnection::systemBus().lastError().message();
182 return false; 180​ return false;
183 } 181​ }
184 182​
185 // TODO KF6:Use new signal-slot syntax 183​ auto interface = new org::kde::kpmcore::externalcommand(QStringLiteral("org.kde.kpmcore.externalcommand"),
186 connect(m_job, SIGNAL(percent(KJob*, unsigned long)), this, SLOT(emitProgress(KJob*, unsigned long))); ​
187 connect(m_job, &KAuth::ExecuteJob::newData, this, &ExternalCommand::emitReport); ​
188 ​
189 auto *interface = new org::kde::kpmcore::externalcommand(QStringLiteral("org.kde.kpmcore.externalcommand"), ​
190 QStringLiteral("/Helper"), QDBusConnection::systemBus(), this); 184​ QStringLiteral("/Helper"), QDBusConnection::systemBus(), this);
191 interface->setTimeout(10 * 24 * 3600 * 1000); // 10 days 185​ interface->setTimeout(10 * 24 * 3600 * 1000); // 10 days
192 186​
193 QDBusPendingCall pcall = interface->copyblocks(source.path(), source.firstByte(), source.length(), 187​ QDBusPendingCall pcall = interface->copyblocks(source.path(), source.firstByte(), source.length(),
194 target.path(), target.firstByte(), blockSize); 188​ target.path(), target.firstByte(), blockSize);
195 189​
196 QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pcall, this); 190​ QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pcall, this);
197 QEventLoop loop; 191​ QEventLoop loop;
Show All 27 Lines215{
225 219​
226 bool rval = true; 220​ bool rval = true;
227 221​
228 if (!QDBusConnection::systemBus().isConnected()) { 222​ if (!QDBusConnection::systemBus().isConnected()) {
229 qWarning() << QDBusConnection::systemBus().lastError().message(); 223​ qWarning() << QDBusConnection::systemBus().lastError().message();
230 return false; 224​ return false;
231 } 225​ }
232 226​
233 auto *interface = new org::kde::kpmcore::externalcommand(QStringLiteral("org.kde.kpmcore.externalcommand"), 227​ auto interface = new org::kde::kpmcore::externalcommand(QStringLiteral("org.kde.kpmcore.externalcommand"),
234 QStringLiteral("/Helper"), QDBusConnection::systemBus(), this); 228​ QStringLiteral("/Helper"), QDBusConnection::systemBus(), this);
235 interface->setTimeout(10 * 24 * 3600 * 1000); // 10 days 229​ interface->setTimeout(10 * 24 * 3600 * 1000); // 10 days
236 230​
237 QDBusPendingCall pcall = interface->writeData(buffer, deviceNode, firstByte); 231​ QDBusPendingCall pcall = interface->writeData(buffer, deviceNode, firstByte);
238 232​
239 QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pcall, this); 233​ QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pcall, this);
240 QEventLoop loop; 234​ QEventLoop loop;
241 235​
Show All 14 Lines
256 return rval; 250​ return rval;
257} 251​}
258 252​
259 253​
260bool ExternalCommand::write(const QByteArray& input) 254​bool ExternalCommand::write(const QByteArray& input)
261{ 255​{
262 if ( qEnvironmentVariableIsSet( "KPMCORE_DEBUG" )) 256​ if ( qEnvironmentVariableIsSet( "KPMCORE_DEBUG" ))
263 qDebug() << "Command input:" << QString::fromLocal8Bit(input); 257​ qDebug() << "Command input:" << QString::fromLocal8Bit(input);
258​
264 d->m_Input = input; 259​ d->m_Input = input;
260​
265 return true; 261​ return true;
266} 262​}
267 263​
268/** Runs the command. 264​/** Runs the command.
269 @param timeout timeout to use for waiting when starting and when waiting for the process to finish 265​ @param timeout timeout to use for waiting when starting and when waiting for the process to finish
270 @return true on success 266​ @return true on success
271*/ 267​*/
272bool ExternalCommand::run(int timeout) 268​bool ExternalCommand::run(int timeout)
273{ 269​{
274 return start(timeout) /* && exitStatus() == 0*/; 270​ return start(timeout) /* && exitStatus() == 0*/;
275} 271​}
276 272​
277void ExternalCommand::onReadOutput() 273​//void ExternalCommand::onReadOutput()
278{ 274​//{
279// const QByteArray s = readAllStandardOutput(); 275​// const QByteArray s = readAllStandardOutput();
280// 276​//
281// if(m_Output.length() > 10*1024*1024) { // prevent memory overflow for badly corrupted file systems 277​// if(m_Output.length() > 10*1024*1024) { // prevent memory overflow for badly corrupted file systems
282// if (report()) 278​// if (report())
283// report()->line() << xi18nc("@info:status", "(Command is printing too much output)"); 279​// report()->line() << xi18nc("@info:status", "(Command is printing too much output)");
284// return; 280​// return;
285// } 281​// }
286// 282​//
287// m_Output += s; 283​// m_Output += s;
288// 284​//
289// if (report()) 285​// if (report())
290// *report() << QString::fromLocal8Bit(s); 286​// *report() << QString::fromLocal8Bit(s);
291} 287​//}
292 288​
293void ExternalCommand::setCommand(const QString& cmd) 289​void ExternalCommand::setCommand(const QString& cmd)
294{ 290​{
295 d->m_Command = cmd; 291​ d->m_Command = cmd;
296} 292​}
297 293​
298const QString& ExternalCommand::command() const 294​const QString& ExternalCommand::command() const
299{ 295​{
Show All 35 Lines330{
335 return d->m_Report; 331​ return d->m_Report;
336} 332​}
337 333​
338void ExternalCommand::setExitCode(int i) 334​void ExternalCommand::setExitCode(int i)
339{ 335​{
340 d->m_ExitCode = i; 336​ d->m_ExitCode = i;
341} 337​}
342 338​
343/**< Dummy function for QTimer when needed. */ 339​/**< Dummy function for QTimer */
344void ExternalCommand::quit() 340​void ExternalCommand::quit()
345{ 341​{
346 342​
347} 343​}
348 344​
349bool ExternalCommand::startHelper() 345​bool ExternalCommand::startHelper()
350{ 346​{
351 if (!QDBusConnection::systemBus().isConnected()) { 347​ if (!QDBusConnection::systemBus().isConnected()) {
348​ qWarning() << "Error starting the helper application!!";
352 qWarning() << QDBusConnection::systemBus().lastError().message(); 349​ qWarning() << QDBusConnection::systemBus().lastError().message();
353 return false; 350​ return false;
354 } 351​ }
355 352​
356 QDBusInterface iface(QStringLiteral("org.kde.kpmcore.helperinterface"), QStringLiteral("/Helper"), QStringLiteral("org.kde.kpmcore.externalcommand"), QDBusConnection::systemBus()); 353​ QDBusInterface iface(QStringLiteral("org.kde.kpmcore.helperinterface"), QStringLiteral("/Helper"), QStringLiteral("org.kde.kpmcore.externalcommand"), QDBusConnection::systemBus());
354​
357 if (iface.isValid()) { 355​ if (iface.isValid()) {
358 exit(0); 356​ exit(0);
359 } 357​ }
360 358​
361 d->m_thread = new DBusThread; 359​ /*KAuth::Action action = KAuth::Action(QStringLiteral("org.kde.kpmcore.externalcommand.init"));
362 d->m_thread->start(); ​
363 ​
364 KAuth::Action action = KAuth::Action(QStringLiteral("org.kde.kpmcore.externalcommand.init")); ​
365 action.setHelperId(QStringLiteral("org.kde.kpmcore.externalcommand")); 360​ action.setHelperId(QStringLiteral("org.kde.kpmcore.externalcommand"));
366 action.setTimeout(10 * 24 * 3600 * 1000); // 10 days 361​ action.setTimeout(10 * 24 * 3600 * 1000); // 10 days
367 action.setParentWidget(parent); 362​ action.setParentWidget(parent);
368 QVariantMap arguments; 363​ QVariantMap arguments;
369 action.setArguments(arguments); 364​ action.setArguments(arguments);
370 m_job = action.execute(); 365​ m_job = action.execute();
371 m_job->start(); 366​ m_job->start();
372 367​
373 // Wait until ExternalCommand Helper is ready (helper sends newData signal just before it enters event loop) 368​ // Wait until ExternalCommand Helper is ready (helper sends newData signal just before it enters event loop)
374 QEventLoop loop; 369​ QEventLoop loop;
375 auto exitLoop = [&] () { loop.exit(); }; 370​ auto exitLoop = [&] () { loop.exit(); };
376 auto conn = QObject::connect(m_job, &KAuth::ExecuteJob::newData, exitLoop); 371​ auto conn = QObject::connect(m_job, &KAuth::ExecuteJob::newData, exitLoop);
377 QObject::connect(m_job, &KJob::finished, [=] () { if(m_job->error()) exitLoop(); } ); 372​ QObject::connect(m_job, &KJob::finished, [=] () { if(m_job->error()) exitLoop(); } );
378 loop.exec(); 373​ loop.exec();
374​ QObject::disconnect(conn);*/
stikonasUnsubmitted
Done

Fix this, this will give you infinite recursion.

stikonas: Fix this, this will give you infinite recursion.
375​
376​
377​
378​ /** Authorize using Polkit backend **/
379​
380​ // initialize KDE Polkit daemon
381​ m_authJob->initPolkitAgent(QStringLiteral("org.kde.kpmcore.externalcommand.init"), parent);
382​
383​ // Kick start the helper application
384​ m_authJob->startHelper(QStringLiteral("org.kde.kpmcore.externalcommand.init"), QStringLiteral("org.kde.kpmcore.externalcommand"));
385​
386​ bool isActionAuthorized = m_authJob->authorizeAction(QStringLiteral("org.kde.kpmcore.externalcommand.init"), m_authJob->callerID());
387​
388​ // Wait until ExternalCommand Helper is ready and sends signal(Connect to newData signal)
389​ QEventLoop loop;
390​ auto exitLoop = [&] () { loop.exit(); };
391​
392​ auto conn = QObject::connect(this, &ExternalCommand::newData, exitLoop);
393​
394​ loop.exec();
395​
379 QObject::disconnect(conn); 396​ QObject::disconnect(conn);
380 397​
398​ if (!isActionAuthorized) {
399​ qDebug() << "Unable to obtain Administrative privileges, the action can not be executed!!";
400​ }
401​
381 helperStarted = true; 402​ helperStarted = true;
382 return true; 403​ return true;
383} 404​}
384 405​
385void ExternalCommand::stopHelper() 406​void ExternalCommand::stopHelper()
386{ 407​{
387 auto *interface = new org::kde::kpmcore::externalcommand(QStringLiteral("org.kde.kpmcore.externalcommand"), 408​ auto interface = new org::kde::kpmcore::externalcommand(QStringLiteral("org.kde.kpmcore.externalcommand"),
388 QStringLiteral("/Helper"), QDBusConnection::systemBus()); 409​ QStringLiteral("/Helper"), QDBusConnection::systemBus());
389 interface->exit(); 410​ interface->exit();
390 411​
391} 412​}
392 413​
393void DBusThread::run() 414​void ExternalCommand::emitNewData(int percent)
394{ 415​{
395 if (!QDBusConnection::systemBus().registerService(QStringLiteral("org.kde.kpmcore.applicationinterface")) || 416​ Q_UNUSED(percent)
396 !QDBusConnection::systemBus().registerObject(QStringLiteral("/Application"), this, QDBusConnection::ExportAllSlots)) { 417​ emit newData();
397 qWarning() << QDBusConnection::systemBus().lastError().message(); ​
398 return; ​
399 } 418​}
400 419​
401 QEventLoop loop; 420​void ExternalCommand::emitNewData(QString message)
402 loop.exec(); 421​{
422​ Q_UNUSED(message)
423​ emit newData();
403} 424​}