system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-10-15 12:23:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

passwd: Port to LibMain

Browse source
This commit is contained in:
David Lindbom 2021-12-11 17:23:20 +01:00 committed by Brian Gianforcaro
parent e34eb3e36d
commit 235a2b35d6
2 changed files with 20 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Userland/Utilities/CMakeLists.txt
View file

@ -101,7 +101,7 @@ target_link_libraries(notify LibGUI)
target_link_libraries(nproc LibMain)
target_link_libraries(open LibDesktop)
target_link_libraries(pape LibGUI)
target_link_libraries(passwd LibCrypt)
target_link_libraries(passwd LibCrypt LibMain)
target_link_libraries(paste LibGUI)
target_link_libraries(pgrep LibRegex)
target_link_libraries(pls LibCrypt)

67
Userland/Utilities/passwd.cpp
View file

@ -9,10 +9,12 @@
#include <LibCore/Account.h>
#include <LibCore/ArgsParser.h>
#include <LibCore/GetPassword.h>
#include <LibCore/System.h>
#include <LibMain/Main.h>
#include <string.h>
#include <unistd.h>
int main(int argc, char** argv)
ErrorOr<int> serenity_main(Main::Arguments arguments)
{
if (geteuid() != 0) {
warnln("Not running as root :^(");
@ -24,17 +26,9 @@ int main(int argc, char** argv)
return 1;
}
if (pledge("stdio wpath rpath cpath fattr tty", nullptr) < 0) {
perror("pledge");
return 1;
}
if (unveil("/etc", "rwc") < 0) {
perror("unveil");
return 1;
}
unveil(nullptr, nullptr);
TRY(Core::System::pledge("stdio wpath rpath cpath fattr tty"));
TRY(Core::System::unveil("/etc", "rwc"));
TRY(Core::System::unveil(nullptr, nullptr));
bool del = false;
bool lock = false;
@ -48,24 +42,17 @@ int main(int argc, char** argv)
args_parser.add_option(unlock, "Unlock password", "unlock", 'u');
args_parser.add_positional_argument(username, "Username", "username", Core::ArgsParser::Required::No);
args_parser.parse(argc, argv);
args_parser.parse(arguments);
uid_t current_uid = getuid();
auto account_or_error = (username)
? Core::Account::from_name(username)
: Core::Account::from_uid(current_uid);
if (account_or_error.is_error()) {
warnln("Core::Account::{}: {}", (username) ? "from_name" : "from_uid", account_or_error.error());
return 1;
}
// target_account is the account we are changing the password of.
auto target_account = TRY((username)
? Core::Account::from_name(username)
: Core::Account::from_uid(current_uid));
setpwent();
// target_account is the account we are changing the password of.
auto& target_account = account_or_error.value();
if (current_uid != 0 && current_uid != target_account.uid()) {
warnln("You can't modify passwd for {}", username);
return 1;
@ -79,50 +66,34 @@ int main(int argc, char** argv)
target_account.set_password_enabled(true);
} else {
if (current_uid != 0) {
auto current_password = Core::get_password("Current password: ");
if (current_password.is_error()) {
warnln("{}", current_password.error());
return 1;
}
auto current_password = TRY(Core::get_password("Current password: "));
if (!target_account.authenticate(current_password.value())) {
if (!target_account.authenticate(current_password)) {
warnln("Incorrect or disabled password.");
warnln("Password for user {} unchanged.", target_account.username());
return 1;
}
}
auto new_password = Core::get_password("New password: ");
if (new_password.is_error()) {
warnln("{}", new_password.error());
return 1;
}
auto new_password = TRY(Core::get_password("New password: "));
auto new_password_retype = TRY(Core::get_password("Retype new password: "));
auto new_password_retype = Core::get_password("Retype new password: ");
if (new_password_retype.is_error()) {
warnln("{}", new_password_retype.error());
return 1;
}
if (new_password.value().is_empty() && new_password_retype.value().is_empty()) {
if (new_password.is_empty() && new_password_retype.is_empty()) {
warnln("No password supplied.");
warnln("Password for user {} unchanged.", target_account.username());
return 1;
}
if (new_password.value().view() != new_password_retype.value().view()) {
if (new_password.view() != new_password_retype.view()) {
warnln("Sorry, passwords don't match.");
warnln("Password for user {} unchanged.", target_account.username());
return 1;
}
target_account.set_password(new_password.value());
target_account.set_password(new_password);
}
if (pledge("stdio wpath rpath cpath fattr", nullptr) < 0) {
perror("pledge");
return 1;
}
TRY(Core::System::pledge("stdio wpath rpath cpath fattr"));
if (!target_account.sync()) {
perror("Core::Account::Sync");