forked from pool/plasma5-disks
Plasma 5.20.0, second try
OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/plasma5-disks?expand=0&rev=2
This commit is contained in:
Git OBS Bridge
parent
27abfbdecf
commit
9d75348983
135
0001-pass-device-names-to-the-helper.patch
Normal file
135
0001-pass-device-names-to-the-helper.patch
Normal file
@ -0,0 +1,135 @@
|
||||
From b7373d6c3060817a0ecf7f4d9a06c8a9aa16548a Mon Sep 17 00:00:00 2001
|
||||
From: Harald Sitter <sitter@kde.org>
|
||||
Date: Thu, 8 Oct 2020 11:45:10 +0200
|
||||
Subject: [PATCH] pass device names to the helper
|
||||
|
||||
paths are somewhat trivial to exploit. instead resolve them to the
|
||||
actual block device names under /dev/ and pass that into the privileged
|
||||
helper. the helper then only needs to verify that $name is in fact a
|
||||
block device under /dev/.
|
||||
since unprivileged processes cannot create files in /dev/ directly, let
|
||||
alone block devices, this should give us a very reliable way of
|
||||
preventing abuse.
|
||||
---
|
||||
src/helper.cpp | 68 ++++++++++++++++++++++++++++++++++++++----------
|
||||
src/smartctl.cpp | 11 +++++++-
|
||||
2 files changed, 64 insertions(+), 15 deletions(-)
|
||||
|
||||
diff --git a/src/helper.cpp b/src/helper.cpp
|
||||
index 5418b25..5a9ce47 100644
|
||||
--- a/src/helper.cpp
|
||||
+++ b/src/helper.cpp
|
||||
@@ -6,28 +6,68 @@
|
||||
#include <QDebug>
|
||||
#include <QProcess>
|
||||
#include <QFileInfo>
|
||||
+#include <QScopeGuard>
|
||||
|
||||
-QString pathFrom(const QVariantMap &args)
|
||||
+#include <sys/types.h>
|
||||
+#include <sys/stat.h>
|
||||
+#include <fcntl.h>
|
||||
+#include <unistd.h>
|
||||
+#include <string.h>
|
||||
+#include <sys/types.h>
|
||||
+#include <dirent.h>
|
||||
+
|
||||
+// Append name to /dev/ and ensure it is a trustable block device.
|
||||
+static QString nameToPath(const QString &name)
|
||||
{
|
||||
- const auto devicePath = args.value(QStringLiteral("devicePath")).toString();
|
||||
- QFileInfo info(devicePath);
|
||||
- return info.absoluteFilePath();
|
||||
+ if (name.isEmpty()) {
|
||||
+ return {};
|
||||
+ }
|
||||
+
|
||||
+ // This also excludes relative path shenanigans as they'd all need to contain a separator.
|
||||
+ if (name.contains(QLatin1Char('/'))) {
|
||||
+ qWarning() << "Device names must not contain slashes";
|
||||
+ return {};
|
||||
+ }
|
||||
+
|
||||
+ const QString path = QStringLiteral("/dev/%1").arg(name);
|
||||
+
|
||||
+ int blockFD = open(QFile::encodeName(path), O_PATH | O_NOFOLLOW);
|
||||
+ auto blockFDClose = qScopeGuard([blockFD] { close(blockFD); });
|
||||
+ if (blockFD == -1) {
|
||||
+ const int err = errno;
|
||||
+ qWarning() << "Failed to open block device" << name << strerror(err);
|
||||
+ return {};
|
||||
+ }
|
||||
+
|
||||
+ struct stat sb;
|
||||
+ if (fstat(blockFD, &sb) == -1) {
|
||||
+ const int err = errno;
|
||||
+ qWarning() << "Failed to stat block device" << name << strerror(err);
|
||||
+ return {};
|
||||
+ }
|
||||
+
|
||||
+ if (!S_ISBLK(sb.st_mode)) {
|
||||
+ qWarning() << "Device is not actually a block device" << name;
|
||||
+ return {};
|
||||
+ }
|
||||
+
|
||||
+ if (sb.st_uid != 0) {
|
||||
+ qWarning() << "Device is not owned by root" << name;
|
||||
+ return {};
|
||||
+ }
|
||||
+
|
||||
+ return path;
|
||||
}
|
||||
|
||||
ActionReply SMARTHelper::smartctl(const QVariantMap &args)
|
||||
{
|
||||
- // I may be better overall to also spin up solid on the root end and only allow
|
||||
- // UDIs as input. We can then assert expected input. Not sure it makes much
|
||||
- // of a difference though.
|
||||
- const QString devicePath = pathFrom(args);
|
||||
- if (devicePath.isEmpty() || !QFile::exists(devicePath)) {
|
||||
- qDebug() << "bad path";
|
||||
+ // For security reasons we only accept fully resolved device names which
|
||||
+ // we use to construct the final /dev/$name path.
|
||||
+ const QString name = args.value(QStringLiteral("deviceName")).toString();
|
||||
+ const QString devicePath = nameToPath(name);
|
||||
+ if (devicePath.isEmpty()) {
|
||||
return ActionReply::HelperErrorReply();
|
||||
}
|
||||
- if (!devicePath.startsWith(QStringLiteral("/dev/"))) {
|
||||
- qDebug() << "unauthorized path";
|
||||
- return ActionReply::HelperErrorReply(KAuth::ActionReply::AuthorizationDeniedError);
|
||||
- }
|
||||
|
||||
// PATH is super minimal when invoked through dbus
|
||||
setenv("PATH", "/usr/sbin:/sbin", 1);
|
||||
diff --git a/src/smartctl.cpp b/src/smartctl.cpp
|
||||
index b214fff..a8f66ce 100644
|
||||
--- a/src/smartctl.cpp
|
||||
+++ b/src/smartctl.cpp
|
||||
@@ -4,6 +4,7 @@
|
||||
#include "smartctl.h"
|
||||
|
||||
#include <QDebug>
|
||||
+#include <QFileInfo>
|
||||
#include <KAuthAction>
|
||||
#include <KAuthExecuteJob>
|
||||
#include <KLocalizedString>
|
||||
@@ -32,7 +33,15 @@ void SMARTCtl::run(const QString &devicePath)
|
||||
devicePath) }
|
||||
});
|
||||
action.setHelperId(QStringLiteral("org.kde.kded.smart"));
|
||||
- action.addArgument(QStringLiteral("devicePath"), devicePath);
|
||||
+
|
||||
+ // The helper only consumes names, ensure we fully resolve the name of the
|
||||
+ // device to /dev/$name.
|
||||
+ const QString canonicalDevicePath = QFileInfo(devicePath).canonicalFilePath();
|
||||
+ Q_ASSERT(!canonicalDevicePath.isEmpty());
|
||||
+ const QFileInfo canonicalDeviceInfo(canonicalDevicePath);
|
||||
+ Q_ASSERT(canonicalDeviceInfo.absolutePath() == QLatin1String("/dev"));
|
||||
+
|
||||
+ action.addArgument(QStringLiteral("deviceName"), canonicalDeviceInfo.fileName());
|
||||
qCDebug(KDED) << action.isValid()
|
||||
<< action.hasHelper()
|
||||
<< action.helperId()
|
||||
--
|
||||
2.25.1
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:74dfc55eae1fc9c4b41f816a848d54cc547e1ec8f95f9360ac19b2613a4e979d
|
||||
size 59008
|
||||
@ -1,11 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQEzBAABCAAdFiEEs8s2ZVJUC+Bu6a2XEZaMRJKMrvwFAl9jSLsACgkQEZaMRJKM
|
||||
rvx4lwf8D01JdqmWnJCaf9fzldflQz3gJIwT7ox5rEiihtQI8EKEgcnSzPuXzgrD
|
||||
CRoIcB4LpoW/1DIi7Y4wYXxSns4PstRPVVMWC3zQGpPXI9bmREI6NNmmJLVhOYDw
|
||||
BBupTsprM2yEuHMpWxUVFA1H4/mgBVh3nqpUDm5/XE9OBQNi2kk69O5PfegK9AwR
|
||||
DMFsmdhmimPp8x2CFo4sqmuvAd0Er9usC6f47dwZvKO004N1KjvjGyEFZZiXFW/A
|
||||
hptHuxarOEQg/R5pkMUI+JTgD39Dj780Z6gEBbd1fQyLf3yig+aQ6bxql7K0JYR+
|
||||
wlDKNeEfriFgnxyk4chTA4FxPT0CXA==
|
||||
=PPOS
|
||||
-----END PGP SIGNATURE-----
|
||||
3
plasma-disks-5.20.0.tar.xz
Normal file
3
plasma-disks-5.20.0.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:a76b5d9ee0fadc29d5d4127e4cc984fecb17609e17fbecb5cb376969791bc17b
|
||||
size 60060
|
||||
11
plasma-disks-5.20.0.tar.xz.sig
Normal file
11
plasma-disks-5.20.0.tar.xz.sig
Normal file
@ -0,0 +1,11 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAl9/PKkACgkQ7JTRj38F
|
||||
mX7BKgf+In9/thSWo5LqlsodUlA7GmDhHMa1+/BwLQUW4TAZGAWDbZwZa+kumwP4
|
||||
WNJWBO+GmeI/UCG4P8KxUlDQGVqkBqk1f7Y51eeR5V0ymb8hRoer2DLfukZDq4n6
|
||||
Sjcc2Klex5Azu6BKBBPZjlPCWtrMWjXe/Dj+nzOxpK4t/oTP1IR1TZdXQBlzWrvF
|
||||
8Sg/2nXkdahrbE44KNOwt4YQfxTZlTs1zo+e8UslBqIl1KGajvtIM0CoeSJ7ffs7
|
||||
Xx+ai4b8/Ix2p8zClgVP8J+4MGJv7sqKI6xnMg7VMrrJ54bmdj2bjHOCKS0B83Q6
|
||||
n6wmzlHenbNFxI1VVNN+UsWmzyL6yQ==
|
||||
=r5sZ
|
||||
-----END PGP SIGNATURE-----
|
||||
@ -1,4 +0,0 @@
|
||||
-------------------------------------------------------------------
|
||||
Sat Sep 19 21:00:16 UTC 2020 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||
|
||||
- Initial commit
|
||||
16
plasma5-disks.changes
Normal file
16
plasma5-disks.changes
Normal file
@ -0,0 +1,16 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Oct 8 16:58:05 UTC 2020 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||
|
||||
- Update to 5.20.0
|
||||
* New bugfix release
|
||||
* For more details please see:
|
||||
* https://kde.org/announcements/plasma-5.20.0
|
||||
- Changes since 5.19.90:
|
||||
* add request queuing to kauth smartctl
|
||||
- Add patch to harden the kauth helper (boo#1176742):
|
||||
* 0001-pass-device-names-to-the-helper.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Sep 19 21:00:16 UTC 2020 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||
|
||||
- Initial commit
|
||||
@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package plasma-disks
|
||||
# spec file for package plasma5-disks
|
||||
#
|
||||
# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
#
|
||||
@ -19,8 +19,8 @@
|
||||
%define kf5_version 5.74.0
|
||||
%bcond_without lang
|
||||
|
||||
Name: plasma-disks
|
||||
Version: 5.19.90
|
||||
Name: plasma5-disks
|
||||
Version: 5.20.0
|
||||
Release: 0
|
||||
Summary: Plasma service for monitoring disk health
|
||||
License: GPL-2.0-only OR GPL-3.0-only
|
||||
@ -31,6 +31,8 @@ Source: plasma-disks-%{version}.tar.xz
|
||||
Source1: plasma-disks-%{version}.tar.xz.sig
|
||||
Source2: plasma.keyring
|
||||
%endif
|
||||
# PATCH-FIX-UPSTREAM:
|
||||
Patch1: 0001-pass-device-names-to-the-helper.patch
|
||||
BuildRequires: cmake >= 3.16
|
||||
BuildRequires: extra-cmake-modules >= %{kf5_version}
|
||||
BuildRequires: cmake(KF5CoreAddons) >= %{kf5_version}
|
||||
@ -45,6 +47,9 @@ BuildRequires: cmake(KF5Declarative) >= %{kf5_version}
|
||||
BuildRequires: cmake(Qt5Core) >= 5.15.0
|
||||
BuildRequires: cmake(Qt5Gui)
|
||||
BuildRequires: cmake(Qt5Test)
|
||||
# Old temporary name, only in K:F5
|
||||
Provides: plasma-disks = %{version}
|
||||
Obsoletes: plasma-disks < %{version}
|
||||
Requires: /usr/sbin/smartctl
|
||||
|
||||
%description
|
||||
@ -53,7 +58,7 @@ Monitors S.M.A.R.T. capable devices for imminent failure and informs the user.
|
||||
%lang_package
|
||||
|
||||
%prep
|
||||
%autosetup -p1
|
||||
%autosetup -p1 -n plasma-disks-%{version}
|
||||
|
||||
%build
|
||||
%cmake_kf5 -d build -- -DBUILD_TESTING=ON
|
||||
Loading…
x
Reference in New Issue
Block a user