X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fexecwrapper.cpp;h=7eac35211e62ba3e2136eb290f74ce52fe66a7c9;hp=8ef819436b9d5d88a794ede8c58eb9c54afd03d1;hb=6c561d2b7b1bb303cfcd8a013179b1838d315910;hpb=dd381ac71adfcd9bcad028b277fe65e13fecaf15 diff --git a/src/client/execwrapper.cpp b/src/client/execwrapper.cpp index 8ef81943..7eac3521 100644 --- a/src/client/execwrapper.cpp +++ b/src/client/execwrapper.cpp @@ -1,93 +1,147 @@ /*************************************************************************** -* Copyright (C) 2005-09 by the Quassel Project * -* devel@quassel-irc.org * -* * -* This program is free software; you can redistribute it and/or modify * -* it under the terms of the GNU General Public License as published by * -* the Free Software Foundation; either version 2 of the License, or * -* (at your option) version 3. * -* * -* This program is distributed in the hope that it will be useful, * -* but WITHOUT ANY WARRANTY; without even the implied warranty of * -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * -* GNU General Public License for more details. * -* * -* You should have received a copy of the GNU General Public License * -* along with this program; if not, write to the * -* Free Software Foundation, Inc., * -* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * -***************************************************************************/ - -#include + * Copyright (C) 2005-2020 by the Quassel Project * + * devel@quassel-irc.org * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) version 3. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * + ***************************************************************************/ #include "execwrapper.h" +#include +#include +#include + #include "client.h" #include "messagemodel.h" #include "quassel.h" +#include "util.h" -ExecWrapper::ExecWrapper(QObject* parent) : QObject(parent) { - connect(&_process, SIGNAL(readyReadStandardOutput()), SLOT(processReadStdout())); - connect(&_process, SIGNAL(readyReadStandardError()), SLOT(processReadStderr())); - connect(&_process, SIGNAL(finished(int, QProcess::ExitStatus)), SLOT(processFinished(int, QProcess::ExitStatus))); - connect(&_process, SIGNAL(error(QProcess::ProcessError)), SLOT(processError(QProcess::ProcessError))); +ExecWrapper::ExecWrapper(QObject* parent) + : QObject(parent) +{ + connect(&_process, &QProcess::readyReadStandardOutput, this, &ExecWrapper::processReadStdout); + connect(&_process, &QProcess::readyReadStandardError, this, &ExecWrapper::processReadStderr); + connect(&_process, selectOverload(&QProcess::finished), this, &ExecWrapper::processFinished); +#if QT_VERSION < QT_VERSION_CHECK(5, 6, 0) + connect(&_process, selectOverload(&QProcess::error), this, &ExecWrapper::processError); +#else + connect(&_process, &QProcess::errorOccurred, this, &ExecWrapper::processError); +#endif - connect(this, SIGNAL(stdout(QString)), SLOT(postStdout(QString))); - connect(this, SIGNAL(stderr(QString)), SLOT(postStderr(QString))); + connect(this, &ExecWrapper::output, this, &ExecWrapper::postStdout); + connect(this, &ExecWrapper::error, this, &ExecWrapper::postStderr); } -void ExecWrapper::start(const BufferInfo &info, const QString &scriptName, const QStringList& params) { - _bufferInfo = info; - _scriptName = scriptName; - foreach(QString scriptDir, Quassel::scriptDirPaths()) { - QString fileName = scriptDir + '/' + scriptName; - if(!QFile::exists(fileName)) - continue; - _process.start(fileName, params); - return; - } - emit stderr(tr("Could not find script \"%1\"").arg(scriptName)); - deleteLater(); +void ExecWrapper::start(const BufferInfo& info, const QString& command) +{ + _bufferInfo = info; + _scriptName.clear(); + + QStringList params; + + static const QRegularExpression rx{R"(^\s*(\S+)(\s+(.*))?$)"}; + auto match = rx.match(command); + if (!match.hasMatch()) { + emit error(tr("Invalid command string for /exec: %1").arg(command)); + } + else { + _scriptName = match.captured(1); + static const QRegularExpression splitRx{"\\s+"}; + params = match.captured(3).split(splitRx, QString::SkipEmptyParts); + } + + // Make sure we don't execute something outside a script dir + if (_scriptName.contains("../") || _scriptName.contains("..\\")) { + emit error(tr(R"(Name "%1" is invalid: ../ or ..\ are not allowed!)").arg(_scriptName)); + } + else if (!_scriptName.isEmpty()) { + foreach (QString scriptDir, Quassel::scriptDirPaths()) { + QString fileName = scriptDir + _scriptName; + if (!QFile::exists(fileName)) + continue; + _process.setWorkingDirectory(scriptDir); + _process.start(_scriptName, params); + return; + } + emit error(tr("Could not find script \"%1\"").arg(_scriptName)); + } + + deleteLater(); // self-destruct } -void ExecWrapper::postStdout(const QString &msg) { - if(_bufferInfo.isValid()) - Client::userInput(_bufferInfo, msg); +void ExecWrapper::postStdout(const QString& msg) +{ + if (_bufferInfo.isValid()) + Client::userInput(_bufferInfo, msg); } -void ExecWrapper::postStderr(const QString &msg) { - if(_bufferInfo.isValid()) - Client::messageModel()->insertErrorMessage(_bufferInfo, msg); +void ExecWrapper::postStderr(const QString& msg) +{ + if (_bufferInfo.isValid()) + Client::messageModel()->insertErrorMessage(_bufferInfo, msg); } -void ExecWrapper::processFinished(int exitCode, QProcess::ExitStatus status) { - if(status == QProcess::CrashExit) { - emit stderr(tr("Script \"%1\" crashed with exit code %2.").arg(_scriptName).arg(exitCode)); - } +void ExecWrapper::processFinished(int exitCode, QProcess::ExitStatus status) +{ + if (status == QProcess::CrashExit) { + emit error(tr("Script \"%1\" crashed with exit code %2.").arg(_scriptName).arg(exitCode)); + } - // TODO empty buffers + // empty buffers + if (!_stdoutBuffer.isEmpty()) + foreach (QString msg, _stdoutBuffer.split('\n')) + emit output(msg); + if (!_stderrBuffer.isEmpty()) + foreach (QString msg, _stderrBuffer.split('\n')) + emit error(msg); - deleteLater(); + deleteLater(); } -void ExecWrapper::processError(QProcess::ProcessError error) { - emit stderr(tr("Script \"%1\" caused error %2.").arg(_scriptName).arg(error)); +void ExecWrapper::processError(QProcess::ProcessError err) +{ + if (err == QProcess::FailedToStart) + emit error(tr("Script \"%1\" could not start.").arg(_scriptName)); + else + emit error(tr("Script \"%1\" caused error %2.").arg(_scriptName).arg(err)); + + if (_process.state() != QProcess::Running) + deleteLater(); } -void ExecWrapper::processReadStdout() { - _stdoutBuffer.append(_process.readAllStandardOutput()); - int idx; - while((idx = _stdoutBuffer.indexOf('\n')) >= 0) { - emit stdout(_stdoutBuffer.left(idx)); - _stdoutBuffer = _stdoutBuffer.mid(idx + 1); - } +void ExecWrapper::processReadStdout() +{ + QString str = QTextCodec::codecForLocale()->toUnicode(_process.readAllStandardOutput()); + str.replace(QRegExp("\r\n?"), "\n"); + _stdoutBuffer.append(str); + int idx; + while ((idx = _stdoutBuffer.indexOf('\n')) >= 0) { + emit output(_stdoutBuffer.left(idx)); + _stdoutBuffer = _stdoutBuffer.mid(idx + 1); + } } -void ExecWrapper::processReadStderr() { - _stderrBuffer.append(_process.readAllStandardError()); - int idx; - while((idx = _stderrBuffer.indexOf('\n')) >= 0) { - emit stdout(_stderrBuffer.left(idx)); - _stderrBuffer = _stderrBuffer.mid(idx + 1); - } +void ExecWrapper::processReadStderr() +{ + QString str = QTextCodec::codecForLocale()->toUnicode(_process.readAllStandardError()); + str.replace(QRegExp("\r\n?"), "\n"); + _stderrBuffer.append(str); + int idx; + while ((idx = _stderrBuffer.indexOf('\n')) >= 0) { + emit error(_stderrBuffer.left(idx)); + _stderrBuffer = _stderrBuffer.mid(idx + 1); + } }