Switched to experimental because of LXQt namespace changeubuntu/cosmic debian/0.9.0+20150908-1
Alf Gaida
9 years ago
parent
de2a9821ec
commit
2191e2bfb2
@ -1,13 +1,14 @@
|
||||
lxqt-sudo (0.9.0+20150831-1) unstable; urgency=medium
|
||||
lxqt-sudo (0.9.0+20150908-1) experimental; urgency=medium
|
||||
|
||||
[ Alf Gaida ]
|
||||
* Cherry-picked upstream version 0.9.0+21050831.
|
||||
* Cherry-picked upstream version 0.9.0+20150908.
|
||||
* Fixed .gitignore
|
||||
* Added upstream signing key and use it in watch file
|
||||
* Added docs
|
||||
* Fixed control with cme fix dpkg-control
|
||||
* Fixed control with cme fix dpkg-control
|
||||
* Switched to experimental because of LXQt namespace change
|
||||
|
||||
[ ChangZhuo Chen (陳昌倬) ]
|
||||
* Initial release (Closes:#795801)
|
||||
|
||||
-- ChangZhuo Chen (陳昌倬) <czchen@debian.org> Sat, 22 Aug 2015 10:32:52 +0800
|
||||
-- Alf Gaida <agaida@siduction.org> Wed, 23 Sep 2015 00:06:05 +0200
|
||||
|
||||
@ -0,0 +1,193 @@
|
||||
/* BEGIN_COMMON_COPYRIGHT_HEADER
|
||||
* (c)LGPL2+
|
||||
*
|
||||
* LXQt - a lightweight, Qt based, desktop toolset
|
||||
* http://lxqt.org
|
||||
*
|
||||
* Copyright: 2015 LXQt team
|
||||
* Authors:
|
||||
* Palo Kisa <palo.kisa@gmail.com>
|
||||
*
|
||||
* This program or library is free software; you can redistribute it
|
||||
* and/or modify it under the terms of the GNU Lesser General Public
|
||||
* License as published by the Free Software Foundation; either
|
||||
* version 2.1 of the License, or (at your option) any later version.
|
||||
*
|
||||
* This library 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
|
||||
* Lesser General Public License for more details.
|
||||
|
||||
* You should have received a copy of the GNU Lesser General
|
||||
* Public License along with this library; if not, write to the
|
||||
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
||||
* Boston, MA 02110-1301 USA
|
||||
*
|
||||
* END_COMMON_COPYRIGHT_HEADER */
|
||||
|
||||
#include <LXQt/Application>
|
||||
#include "passworddialog.h"
|
||||
#include <QMessageBox>
|
||||
#include <QSocketNotifier>
|
||||
#include <QDebug>
|
||||
#include <QThread>
|
||||
#include <pty.h>
|
||||
#include <unistd.h>
|
||||
#include <memory>
|
||||
#include <csignal>
|
||||
#include <sys/wait.h>
|
||||
#include <fcntl.h>
|
||||
|
||||
extern const QString app_master;
|
||||
extern const QString su_prog;
|
||||
const QString su_prog{QStringLiteral(LXQTSUDO_SU)};
|
||||
static const QString su_pwd_prompt_end{QStringLiteral(": ")};
|
||||
static const QChar nl{QLatin1Char('\n')};
|
||||
|
||||
static void child(QString const & arg, PasswordDialog & dlg)
|
||||
{
|
||||
std::string s_prog = su_prog.toStdString()
|
||||
, s_arg = arg.toStdString();
|
||||
|
||||
char const * params[] = {
|
||||
s_prog.c_str()
|
||||
, "-c"
|
||||
, s_arg.c_str()
|
||||
, nullptr
|
||||
};
|
||||
|
||||
setsid(); //session leader
|
||||
execvp(params[0], const_cast<char **>(params));
|
||||
|
||||
//exec never returns in case of success
|
||||
QTextStream{stderr, QIODevice::WriteOnly} << QObject::tr("%1: Failed to exec '%2': %3\n").arg(app_master).arg(su_prog).arg(strerror(errno));
|
||||
exit(1);
|
||||
}
|
||||
|
||||
static void stopChild(int & childPid
|
||||
, int & pwdFd
|
||||
, int & ret)
|
||||
{
|
||||
close(pwdFd);
|
||||
kill(childPid, SIGINT);
|
||||
int res, status;
|
||||
for (int cnt = 10; 0 == (res = waitpid(childPid, &status, WNOHANG)) && 0 < cnt; --cnt)
|
||||
QThread::msleep(100);
|
||||
|
||||
if (0 == res)
|
||||
{
|
||||
kill(childPid, SIGKILL);
|
||||
ret = 1;
|
||||
} else
|
||||
{
|
||||
ret = WIFEXITED(status) ? WEXITSTATUS(status) : 1;
|
||||
}
|
||||
childPid = -1;
|
||||
}
|
||||
|
||||
static int parent(int childPid, int pwdFd, PasswordDialog & dlg)
|
||||
{
|
||||
//set the FD as non-blocking
|
||||
if (0 != fcntl(pwdFd, F_SETFL, O_NONBLOCK))
|
||||
{
|
||||
QMessageBox(QMessageBox::Critical, dlg.windowTitle()
|
||||
, QObject::tr("Failed to set non-block: %1").arg(strerror(errno)), QMessageBox::Ok).exec();
|
||||
return 1;
|
||||
}
|
||||
|
||||
FILE * pwd_f = fdopen(pwdFd, "r+");
|
||||
if (nullptr == pwd_f)
|
||||
{
|
||||
QMessageBox(QMessageBox::Critical, dlg.windowTitle()
|
||||
, QObject::tr("Failed to fdopen: %1").arg(strerror(errno)), QMessageBox::Ok).exec();
|
||||
return 1;
|
||||
}
|
||||
|
||||
QTextStream child_str{pwd_f};
|
||||
|
||||
int ret;
|
||||
QObject::connect(&dlg, &QDialog::finished, [&] (int result)
|
||||
{
|
||||
if (QDialog::Accepted == result)
|
||||
{
|
||||
child_str << dlg.password().append(nl);
|
||||
child_str.flush();
|
||||
} else
|
||||
{
|
||||
stopChild(childPid, pwdFd, ret);
|
||||
lxqtApp->quit();
|
||||
}
|
||||
});
|
||||
|
||||
bool check_pwd = true;
|
||||
QString last_line;
|
||||
QScopedPointer<QSocketNotifier> pwd_watcher{new QSocketNotifier{pwdFd, QSocketNotifier::Read}};
|
||||
QObject::connect(pwd_watcher.data(), &QSocketNotifier::activated, [&]
|
||||
{
|
||||
QString line = child_str.readAll();
|
||||
if (line.isEmpty())
|
||||
{
|
||||
pwd_watcher.reset(nullptr);
|
||||
if (last_line.startsWith(QStringLiteral("%1:").arg(su_prog)))
|
||||
{
|
||||
pwd_watcher.reset(nullptr); //stop the notifications events
|
||||
stopChild(childPid, pwdFd, ret);
|
||||
QMessageBox(QMessageBox::Critical, dlg.windowTitle()
|
||||
, QObject::tr("Child '%1' process failed!\n%2").arg(su_prog).arg(last_line), QMessageBox::Ok).exec();
|
||||
}
|
||||
lxqtApp->quit();
|
||||
} else
|
||||
{
|
||||
if (check_pwd)
|
||||
{
|
||||
//check only first output of child(su)
|
||||
check_pwd = false;
|
||||
if (!line.contains(nl) && line.endsWith(su_pwd_prompt_end))
|
||||
{
|
||||
//if now echo is turned off, su requests password struct termios tios;
|
||||
struct termios tios;
|
||||
Q_ASSERT(0 == tcgetattr(pwdFd, &tios));
|
||||
if (!(ECHO & tios.c_lflag))
|
||||
{
|
||||
dlg.show();
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
QTextStream{stderr, QIODevice::WriteOnly} << line;
|
||||
//assuming text oriented output
|
||||
QStringList lines = line.split(nl, QString::SkipEmptyParts);
|
||||
last_line = lines.isEmpty() ? QString() : lines.back();
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
lxqtApp->exec();
|
||||
|
||||
if (0 < childPid)
|
||||
{
|
||||
int res, status;
|
||||
res = waitpid(childPid, &status, 0);
|
||||
ret = (childPid == res && WIFEXITED(status)) ? WEXITSTATUS(status) : 1;
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
int su(QStringList const & args, PasswordDialog & dlg)
|
||||
{
|
||||
int pid, fd;
|
||||
if (1 != args.size())
|
||||
QMessageBox(QMessageBox::Critical, dlg.windowTitle()
|
||||
, QObject::tr("With %1 backend only one argument/command is supported!").arg(su_prog), QMessageBox::Ok).exec();
|
||||
else if (0 == (pid = forkpty(&fd, nullptr, nullptr, nullptr)))
|
||||
child(args[0], dlg); //never returns
|
||||
else if (-1 == pid)
|
||||
QMessageBox(QMessageBox::Critical, dlg.windowTitle()
|
||||
, QObject::tr("Failed to fork: %1").arg(strerror(errno)), QMessageBox::Ok).exec();
|
||||
else
|
||||
return parent(pid, fd, dlg);
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
@ -0,0 +1,116 @@
|
||||
/* BEGIN_COMMON_COPYRIGHT_HEADER
|
||||
* (c)LGPL2+
|
||||
*
|
||||
* LXQt - a lightweight, Qt based, desktop toolset
|
||||
* http://lxqt.org
|
||||
*
|
||||
* Copyright: 2015 LXQt team
|
||||
* Authors:
|
||||
* Palo Kisa <palo.kisa@gmail.com>
|
||||
*
|
||||
* This program or library is free software; you can redistribute it
|
||||
* and/or modify it under the terms of the GNU Lesser General Public
|
||||
* License as published by the Free Software Foundation; either
|
||||
* version 2.1 of the License, or (at your option) any later version.
|
||||
*
|
||||
* This library 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
|
||||
* Lesser General Public License for more details.
|
||||
|
||||
* You should have received a copy of the GNU Lesser General
|
||||
* Public License along with this library; if not, write to the
|
||||
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
||||
* Boston, MA 02110-1301 USA
|
||||
*
|
||||
* END_COMMON_COPYRIGHT_HEADER */
|
||||
|
||||
#include <LXQt/Application>
|
||||
#include "passworddialog.h"
|
||||
#include <QProcess>
|
||||
#include <QMessageBox>
|
||||
#include <QSocketNotifier>
|
||||
#include <QDebug>
|
||||
|
||||
extern const QString sudo_prog;
|
||||
const QString sudo_prog{QStringLiteral(LXQTSUDO_SUDO)};
|
||||
const QString sudo_pwd_prompt{QStringLiteral("Password:\n")};
|
||||
|
||||
int sudo(QStringList const & args, PasswordDialog & dlg)
|
||||
{
|
||||
QScopedPointer<QProcess> sudo{new QProcess};
|
||||
QObject::connect(&dlg, &QDialog::finished, [&sudo, &dlg] (int result)
|
||||
{
|
||||
if (QDialog::Accepted == result)
|
||||
{
|
||||
sudo->write(QByteArray{}.append(dlg.password().append('\n')));
|
||||
} else
|
||||
{
|
||||
sudo->terminate();
|
||||
if (!sudo->waitForFinished(1000))
|
||||
sudo->kill();
|
||||
}
|
||||
});
|
||||
|
||||
//start background process -> sudo
|
||||
sudo->setProcessChannelMode(QProcess::ForwardedOutputChannel);
|
||||
sudo->setReadChannel(QProcess::StandardError);
|
||||
|
||||
QString last_line;
|
||||
int ret;
|
||||
QObject::connect(sudo.data(), static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished)
|
||||
, [&ret, &last_line, &dlg] (int exitCode, QProcess::ExitStatus exitStatus)
|
||||
{
|
||||
ret = QProcess::NormalExit == exitStatus ? exitCode : 255;
|
||||
if (0 != ret && last_line.startsWith(QStringLiteral("%1:").arg(sudo_prog)))
|
||||
QMessageBox(QMessageBox::Critical, dlg.windowTitle()
|
||||
, QObject::tr("Child '%1' process failed!\n%2").arg(sudo_prog).arg(last_line), QMessageBox::Ok).exec();
|
||||
lxqtApp->quit();
|
||||
});
|
||||
|
||||
QObject::connect(sudo.data(), &QProcess::readyReadStandardError, [&sudo, &dlg, &last_line]
|
||||
{
|
||||
QByteArray err = sudo->readAllStandardError();
|
||||
if (sudo_pwd_prompt == err.constData())
|
||||
{
|
||||
dlg.show();
|
||||
return;
|
||||
}
|
||||
|
||||
QTextStream{stderr, QIODevice::WriteOnly} << err;
|
||||
int nl_pos = err.lastIndexOf('\n');
|
||||
if (-1 == nl_pos)
|
||||
last_line += err;
|
||||
else
|
||||
{
|
||||
if (err.endsWith('\n'))
|
||||
err.remove(err.size() - 1, 1);
|
||||
nl_pos = err.lastIndexOf('\n');
|
||||
if (-1 != nl_pos)
|
||||
err.remove(0, nl_pos + 1);
|
||||
last_line = err;
|
||||
}
|
||||
});
|
||||
|
||||
//forward all stdin to child
|
||||
QTextStream std_in{stdin, QIODevice::ReadOnly};
|
||||
QSocketNotifier stdin_watcher{0/*stdin*/, QSocketNotifier::Read};
|
||||
QObject::connect(&stdin_watcher, &QSocketNotifier::activated, [&std_in, &sudo]
|
||||
{
|
||||
QString line{std_in.readLine()};
|
||||
if (!std_in.atEnd())
|
||||
line += QLatin1Char('\n');
|
||||
sudo->write(line.toStdString().c_str());
|
||||
if (std_in.atEnd())
|
||||
sudo->closeWriteChannel();
|
||||
});
|
||||
|
||||
sudo->start(sudo_prog, QStringList() << QStringLiteral("-S")
|
||||
<< QStringLiteral("-p") << sudo_pwd_prompt
|
||||
<< args);
|
||||
lxqtApp->exec();
|
||||
|
||||
sudo->waitForFinished(-1);
|
||||
return ret;
|
||||
}
|
||||
|
||||
Loading…
Reference in new issue