From 92b178b7404b002778d8288353f65e27ee5de5dd Mon Sep 17 00:00:00 2001 From: Felix Ernst Date: Mon, 1 Jul 2024 12:03:22 +0000 Subject: Guide users to using kio-admin instead of sudo This commit adds a guided setup that leads users from a situation in which they try to "sudo dolphin" towards them successfully setting up and using kio-admin. 1. When users enter "sudo dolphin", they are told to start Dolphin by typing "dolphin --sudo" or "dolphin --admin" instead. 2. When Dolphin is started with "--sudo" or "--admin" it checks whether an "admin" protocol is installed. If not, a guided setup leads users towards installing it. 3. After that, Dolphin starts with an installed "admin" protocoll like kio-admin. Now a non-modal information dialog appears that explains how to activate and use kio-admin. --- src/main.cpp | 42 +++++++++++++++++++++++++++--------------- 1 file changed, 27 insertions(+), 15 deletions(-) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index 6df53b62e..d68cc3cc1 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -6,6 +6,7 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ +#include "admin/workerintegration.h" #include "config-dolphin.h" #include "dbusinterface.h" #include "dolphin_generalsettings.h" @@ -54,24 +55,22 @@ #endif #include +constexpr auto dolphinTranslationDomain{"dolphin"}; + int main(int argc, char **argv) { #ifndef Q_OS_WIN // Prohibit using sudo or kdesu (but allow using the root user directly) - if (getuid() == 0) { - if (!qEnvironmentVariableIsEmpty("SUDO_USER")) { - std::cout << "Running Dolphin with sudo is not supported as it can cause bugs and expose you to security vulnerabilities. Instead, install the " - "`kio-admin` package from your distro and use it to manage root-owned locations by right-clicking on them and selecting \"Open as " - "Administrator\"." - << std::endl; - return EXIT_FAILURE; - } else if (!qEnvironmentVariableIsEmpty("KDESU_USER")) { - std::cout << "Running Dolphin with kdesu is not supported as it can cause bugs and expose you to security vulnerabilities. Instead, install the " - "`kio-admin` package from your distro and use it to manage root-owned locations by right-clicking on them and selecting \"Open as " - "Administrator\"." - << std::endl; - return EXIT_FAILURE; - } + if (getuid() == 0 && (!qEnvironmentVariableIsEmpty("SUDO_USER") || !qEnvironmentVariableIsEmpty("KDESU_USER"))) { + QCoreApplication app(argc, argv); // Needed for the xi18ndc() call below. + std::cout << qPrintable( + xi18ndc(dolphinTranslationDomain, + "@info:shell %1 is a terminal command", + "Running Dolphin with sudo is discouraged. Please run %1 instead.", + QStringLiteral("dolphin --sudo"))) + << std::endl; + // We could perform a privilege de-escalation here and continue as normal. It is a bit safer though to simply let the user restart without sudo. + return EXIT_FAILURE; } #endif @@ -116,7 +115,7 @@ int main(int argc, char **argv) migrate.migrate(); #endif - KLocalizedString::setApplicationDomain("dolphin"); + KLocalizedString::setApplicationDomain(dolphinTranslationDomain); KAboutData aboutData(QStringLiteral("dolphin"), i18n("Dolphin"), @@ -164,6 +163,8 @@ int main(int argc, char **argv) "will be selected."))); parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("split"), i18nc("@info:shell", "Dolphin will get started with a split view."))); parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("new-window"), i18nc("@info:shell", "Dolphin will explicitly open in a new window."))); + parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("sudo") << QStringLiteral("admin"), + i18nc("@info:shell", "Set up Dolphin for administrative tasks."))); parser.addOption( QCommandLineOption(QStringList() << QStringLiteral("daemon"), i18nc("@info:shell", "Start Dolphin Daemon (only required for DBus Interface)."))); parser.addPositionalArgument(QStringLiteral("+[Url]"), i18nc("@info:shell", "Document to open")); @@ -173,11 +174,18 @@ int main(int argc, char **argv) const bool splitView = parser.isSet(QStringLiteral("split")) || GeneralSettings::splitView(); const bool openFiles = parser.isSet(QStringLiteral("select")); + const bool adminWorkerInfoWanted = parser.isSet(QStringLiteral("sudo")) || parser.isSet(QStringLiteral("admin")); const QStringList args = parser.positionalArguments(); QList urls = Dolphin::validateUris(args); // We later mutate urls, so we need to store if it was empty originally const bool startedWithURLs = !urls.isEmpty(); + if (adminWorkerInfoWanted || std::any_of(urls.cbegin(), urls.cend(), [](const QUrl &url) { + return url.scheme() == QStringLiteral("admin"); + })) { + Admin::guideUserTowardsInstallingAdminWorker(); + } + if (parser.isSet(QStringLiteral("daemon"))) { // Disable session management for the daemonized version // See https://bugs.kde.org/show_bug.cgi?id=417219 @@ -275,6 +283,10 @@ int main(int argc, char **argv) mainWindow->setSessionAutoSaveEnabled(GeneralSettings::rememberOpenedTabs()); + if (adminWorkerInfoWanted) { + Admin::guideUserTowardsUsingAdminWorker(); + } + #if HAVE_KUSERFEEDBACK auto feedbackProvider = DolphinFeedbackProvider::instance(); Q_UNUSED(feedbackProvider) -- cgit v1.3