mirror of
https://github.com/keepassxreboot/keepassxc.git
synced 2026-03-11 08:54:48 +00:00
804a3b6706
This gets rid of the m_registered state, so whenever there is a valid m_backend, it is guaranteed to be registered already. While at it, this commit also improves DBusObject::registerWithPath a little bit by allowing properly registering multiple paths using the same adaptor, mostly for supporting Collection aliases. Now when DBus registration fails, the code does not go into an inconsistent state or crash.
64 lines
1.9 KiB
C++
64 lines
1.9 KiB
C++
/*
|
|
* Copyright (C) 2018 Aetf <aetf@unlimitedcodeworks.xyz>
|
|
*
|
|
* 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 or (at your option)
|
|
* version 3 of the License.
|
|
*
|
|
* 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, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include "DBusObject.h"
|
|
|
|
#include <QFile>
|
|
#include <QRegularExpression>
|
|
#include <QTextStream>
|
|
#include <QUrl>
|
|
#include <QUuid>
|
|
|
|
namespace FdoSecrets
|
|
{
|
|
|
|
DBusObject::DBusObject(DBusObject* parent)
|
|
: QObject(parent)
|
|
, m_dbusAdaptor(nullptr)
|
|
{
|
|
}
|
|
|
|
bool DBusObject::registerWithPath(const QString& path, bool primary)
|
|
{
|
|
if (primary) {
|
|
m_objectPath.setPath(path);
|
|
}
|
|
|
|
return QDBusConnection::sessionBus().registerObject(path, this);
|
|
}
|
|
|
|
QString DBusObject::callingPeerName() const
|
|
{
|
|
auto pid = callingPeerPid();
|
|
QFile proc(QStringLiteral("/proc/%1/comm").arg(pid));
|
|
if (!proc.open(QFile::ReadOnly)) {
|
|
return callingPeer();
|
|
}
|
|
QTextStream stream(&proc);
|
|
return stream.readAll().trimmed();
|
|
}
|
|
|
|
QString encodePath(const QString& value)
|
|
{
|
|
// toPercentEncoding encodes everything except those in the unreserved group:
|
|
// ALPHA / DIGIT / "-" / "." / "_" / "~"
|
|
// we want only ALPHA / DIGIT / "_", with "_" as the escape character
|
|
// so force "-.~_" to be encoded
|
|
return QUrl::toPercentEncoding(value, "", "-.~_").replace('%', '_');
|
|
}
|
|
|
|
} // namespace FdoSecrets
|