Advance Wayland and KDE package bring-up
Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent) Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
This commit is contained in:
@@ -0,0 +1,158 @@
|
||||
/*
|
||||
SPDX-FileCopyrightText: 2020 Kai Uwe Broulik <kde@broulik.de>
|
||||
SPDX-FileCopyrightText: 2021 David Edmundson <davidedmundson@kde.org>
|
||||
|
||||
SPDX-License-Identifier: LGPL-2.0-or-later
|
||||
*/
|
||||
|
||||
#include "kupdatelaunchenvironmentjob.h"
|
||||
|
||||
#include <QDBusArgument>
|
||||
#include <QDBusConnection>
|
||||
#include <QDBusMetaType>
|
||||
#include <QDBusPendingReply>
|
||||
|
||||
#include <QTimer>
|
||||
|
||||
#include "kdbusaddons_debug.h"
|
||||
|
||||
class KUpdateLaunchEnvironmentJobPrivate
|
||||
{
|
||||
public:
|
||||
explicit KUpdateLaunchEnvironmentJobPrivate(KUpdateLaunchEnvironmentJob *q);
|
||||
void monitorReply(const QDBusPendingReply<> &reply);
|
||||
|
||||
static bool isPosixName(const QString &name);
|
||||
static bool isSystemdApprovedValue(const QString &value);
|
||||
|
||||
KUpdateLaunchEnvironmentJob *q;
|
||||
QProcessEnvironment environment;
|
||||
int pendingReplies = 0;
|
||||
};
|
||||
|
||||
KUpdateLaunchEnvironmentJobPrivate::KUpdateLaunchEnvironmentJobPrivate(KUpdateLaunchEnvironmentJob *q)
|
||||
: q(q)
|
||||
{
|
||||
}
|
||||
|
||||
void KUpdateLaunchEnvironmentJobPrivate::monitorReply(const QDBusPendingReply<> &reply)
|
||||
{
|
||||
++pendingReplies;
|
||||
|
||||
auto *watcher = new QDBusPendingCallWatcher(reply, q);
|
||||
QObject::connect(watcher, &QDBusPendingCallWatcher::finished, q, [this](QDBusPendingCallWatcher *watcher) {
|
||||
watcher->deleteLater();
|
||||
--pendingReplies;
|
||||
|
||||
if (pendingReplies == 0) {
|
||||
Q_EMIT q->finished();
|
||||
q->deleteLater();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
KUpdateLaunchEnvironmentJob::KUpdateLaunchEnvironmentJob(const QProcessEnvironment &environment)
|
||||
: d(new KUpdateLaunchEnvironmentJobPrivate(this))
|
||||
{
|
||||
d->environment = environment;
|
||||
QTimer::singleShot(0, this, &KUpdateLaunchEnvironmentJob::start);
|
||||
}
|
||||
|
||||
KUpdateLaunchEnvironmentJob::~KUpdateLaunchEnvironmentJob() = default;
|
||||
|
||||
void KUpdateLaunchEnvironmentJob::start()
|
||||
{
|
||||
qDBusRegisterMetaType<QMap<QString, QString>>();
|
||||
QMap<QString, QString> dbusActivationEnv;
|
||||
QStringList systemdUpdates;
|
||||
|
||||
for (const auto &varName : d->environment.keys()) {
|
||||
if (!KUpdateLaunchEnvironmentJobPrivate::isPosixName(varName)) {
|
||||
qCWarning(KDBUSADDONS_LOG) << "Skipping syncing of environment variable " << varName << "as name contains unsupported characters";
|
||||
continue;
|
||||
}
|
||||
const QString value = d->environment.value(varName);
|
||||
|
||||
// plasma-session
|
||||
QDBusMessage plasmaSessionMsg = QDBusMessage::createMethodCall(QStringLiteral("org.kde.Startup"),
|
||||
QStringLiteral("/Startup"),
|
||||
QStringLiteral("org.kde.Startup"),
|
||||
QStringLiteral("updateLaunchEnv"));
|
||||
plasmaSessionMsg.setArguments({QVariant::fromValue(varName), QVariant::fromValue(value)});
|
||||
auto plasmaSessionReply = QDBusConnection::sessionBus().asyncCall(plasmaSessionMsg);
|
||||
d->monitorReply(plasmaSessionReply);
|
||||
|
||||
// DBus-activation environment
|
||||
dbusActivationEnv.insert(varName, value);
|
||||
|
||||
// _user_ systemd env
|
||||
// Systemd has stricter parsing of valid environment variables
|
||||
// https://github.com/systemd/systemd/issues/16704
|
||||
// validate here
|
||||
if (!KUpdateLaunchEnvironmentJobPrivate::isSystemdApprovedValue(value)) {
|
||||
qCWarning(KDBUSADDONS_LOG) << "Skipping syncing of environment variable " << varName << "as value contains unsupported characters";
|
||||
continue;
|
||||
}
|
||||
const QString updateString = varName + QStringLiteral("=") + value;
|
||||
systemdUpdates.append(updateString);
|
||||
}
|
||||
|
||||
// DBus-activation environment
|
||||
QDBusMessage dbusActivationMsg = QDBusMessage::createMethodCall(QStringLiteral("org.freedesktop.DBus"),
|
||||
QStringLiteral("/org/freedesktop/DBus"),
|
||||
QStringLiteral("org.freedesktop.DBus"),
|
||||
QStringLiteral("UpdateActivationEnvironment"));
|
||||
dbusActivationMsg.setArguments({QVariant::fromValue(dbusActivationEnv)});
|
||||
|
||||
auto dbusActivationReply = QDBusConnection::sessionBus().asyncCall(dbusActivationMsg);
|
||||
d->monitorReply(dbusActivationReply);
|
||||
|
||||
// _user_ systemd env
|
||||
QDBusMessage systemdActivationMsg = QDBusMessage::createMethodCall(QStringLiteral("org.freedesktop.systemd1"),
|
||||
QStringLiteral("/org/freedesktop/systemd1"),
|
||||
QStringLiteral("org.freedesktop.systemd1.Manager"),
|
||||
QStringLiteral("SetEnvironment"));
|
||||
systemdActivationMsg.setArguments({systemdUpdates});
|
||||
|
||||
auto systemdActivationReply = QDBusConnection::sessionBus().asyncCall(systemdActivationMsg);
|
||||
d->monitorReply(systemdActivationReply);
|
||||
}
|
||||
|
||||
bool KUpdateLaunchEnvironmentJobPrivate::isPosixName(const QString &name)
|
||||
{
|
||||
// Posix says characters like % should be 'tolerated', but it gives issues in practice.
|
||||
// https://bugzilla.redhat.com/show_bug.cgi?id=1754395
|
||||
// https://bugzilla.redhat.com/show_bug.cgi?id=1879216
|
||||
// Ensure systemd compat by only allowing alphanumerics and _ in names.
|
||||
bool first = true;
|
||||
for (const QChar c : name) {
|
||||
if (first && !c.isLetter() && c != QLatin1Char('_')) {
|
||||
return false;
|
||||
} else if (first) {
|
||||
first = false;
|
||||
} else if (!c.isLetterOrNumber() && c != QLatin1Char('_')) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return !first;
|
||||
}
|
||||
|
||||
bool KUpdateLaunchEnvironmentJobPrivate::isSystemdApprovedValue(const QString &value)
|
||||
{
|
||||
// systemd code checks that a value contains no control characters except \n \t
|
||||
// effectively copied from systemd's string_has_cc
|
||||
for (const char &it : value.toLatin1()) {
|
||||
if (it == QLatin1Char('\n') || it == QLatin1Char('\t')) {
|
||||
continue;
|
||||
}
|
||||
if (it > 0 && it < ' ') {
|
||||
return false;
|
||||
}
|
||||
if (it == 127) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
#include "moc_kupdatelaunchenvironmentjob.cpp"
|
||||
Reference in New Issue
Block a user