RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 09:57:34 +00:00
Code Issues Activity Actions

pls: Port to LibMain :^)

Browse source
This commit is contained in:
Andreas Kling 2021-12-16 19:18:37 +01:00
parent 2c3699e257
commit 9e9662b695
2 changed files with 23 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Userland/Utilities/CMakeLists.txt
View file

@ -118,6 +118,7 @@ target_link_libraries(open LibDesktop)
target_link_libraries(pape LibGUI) target_link_libraries(pape LibGUI)
target_link_libraries(passwd LibCrypt LibMain) target_link_libraries(passwd LibCrypt LibMain)
target_link_libraries(paste LibGUI) target_link_libraries(paste LibGUI)
target_link_libraries(pls LibMain)
target_link_libraries(pgrep LibRegex) target_link_libraries(pgrep LibRegex)
target_link_libraries(pls LibCrypt) target_link_libraries(pls LibCrypt)
target_link_libraries(pmap LibMain) target_link_libraries(pmap LibMain)

81
Userland/Utilities/pls.cpp
View file

@ -5,98 +5,61 @@
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
#include <AK/ScopeGuard.h>
#include <LibCore/Account.h> #include <LibCore/Account.h>
#include <LibCore/ArgsParser.h> #include <LibCore/ArgsParser.h>
#include <LibCore/GetPassword.h> #include <LibCore/GetPassword.h>
#include <LibCore/System.h>
#include <LibMain/Main.h>
#include <stdio.h> #include <stdio.h>
#include <unistd.h> #include <unistd.h>
int main(int argc, char** argv) ErrorOr<int> serenity_main(Main::Arguments arguments)
{ {
Vector<char const*> command; Vector<char const*> command;
Core::ArgsParser args_parser; Core::ArgsParser args_parser;
uid_t as_user_uid = 0; uid_t as_user_uid = 0;
args_parser.add_option(as_user_uid, "User to execute as", nullptr, 'u', "UID"); args_parser.add_option(as_user_uid, "User to execute as", nullptr, 'u', "UID");
args_parser.add_positional_argument(command, "Command to run at elevated privilege level", "command"); args_parser.add_positional_argument(command, "Command to run at elevated privilege level", "command");
args_parser.parse(argc, argv); args_parser.parse(arguments);
if (pledge("stdio rpath exec id tty", nullptr) < 0) { TRY(Core::System::pledge("stdio rpath exec id tty"));
perror("pledge");
return 1;
}
if (seteuid(0) < 0) { TRY(Core::System::seteuid(0));
perror("seteuid");
return 1;
}
// Fail gracefully if as_user_uid is invalid auto as_user = TRY(Core::Account::from_uid(as_user_uid));
auto as_user_or_error = Core::Account::from_uid(as_user_uid);
if (as_user_or_error.is_error()) {
warnln("{}", as_user_or_error.error());
return 1;
}
// If the current user is not a superuser, make them authenticate themselves. // If the current user is not a superuser, make them authenticate themselves.
if (auto uid = getuid()) { if (auto uid = getuid()) {
auto account_or_error = Core::Account::from_uid(uid); auto account = TRY(Core::Account::from_uid(uid));
if (account_or_error.is_error()) {
warnln("{}", account_or_error.error());
return 1;
}
auto const& account = account_or_error.value();
if (account.has_password()) { if (account.has_password()) {
auto password_or_error = Core::get_password(); auto password = TRY(Core::get_password());
if (password_or_error.is_error()) { if (!account.authenticate(password))
warnln("{}", password_or_error.error()); return Error::from_string_literal("Incorrect or disabled password."sv);
return 1;
}
auto const& password = password_or_error.value();
if (!account.authenticate(password)) {
warnln("Incorrect or disabled password.");
return 1;
}
} }
} }
if (pledge("stdio rpath exec id", nullptr) < 0) { TRY(Core::System::pledge("stdio rpath exec id"));
perror("pledge");
return 1;
}
if (setgid(0) < 0) { TRY(Core::System::setgid(0));
perror("setgid"); TRY(Core::System::setuid(as_user_uid));
return 1;
}
if (setuid(as_user_uid) < 0) { TRY(Core::System::pledge("stdio rpath exec"));
perror("setuid");
return 1;
}
if (pledge("stdio rpath exec", nullptr) < 0) { Vector<char const*> exec_arguments;
perror("pledge");
return 1;
}
Vector<char const*> arguments;
for (auto const& arg : command) for (auto const& arg : command)
arguments.append(arg); exec_arguments.append(arg);
arguments.append(nullptr); exec_arguments.append(nullptr);
Vector<String> environment_strings; Vector<String> environment_strings;
if (auto* term = getenv("TERM")) if (auto* term = getenv("TERM"))
environment_strings.append(String::formatted("TERM={}", term)); environment_strings.append(String::formatted("TERM={}", term));
Vector<char const*> environment; Vector<char const*> exec_environment;
for (auto& item : environment_strings) for (auto& item : environment_strings)
environment.append(item.characters()); exec_environment.append(item.characters());
environment.append(nullptr); exec_environment.append(nullptr);
if (execvpe(command.at(0), const_cast<char**>(arguments.data()), const_cast<char**>(environment.data())) < 0) { if (execvpe(command.at(0), const_cast<char**>(exec_arguments.data()), const_cast<char**>(exec_environment.data())) < 0) {
perror("execvpe"); perror("execvpe");
exit(1); exit(1);
} }