0ct0pu5/ladybird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

userdel: Use Core::File::remove() instead of spawning /bin/rm

Browse source
This commit is contained in:
Lucas CHOLLET 2022-12-07 00:14:01 +01:00 • committed by Andrew Kaster
parent d49fccf0d5
commit 3c76790d51
Notes: sideshowbarker 2024-07-17 02:23:22 +09:00
1 changed files with 6 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
Userland/Utilities/userdel.cpp
View file

@ -7,31 +7,23 @@
#include <AK/DeprecatedString.h> #include <AK/DeprecatedString.h>
#include <AK/ScopeGuard.h> #include <AK/ScopeGuard.h>
#include <AK/StringBuilder.h>
#include <LibCore/Account.h> #include <LibCore/Account.h>
#include <LibCore/ArgsParser.h> #include <LibCore/ArgsParser.h>
#include <LibCore/File.h> #include <LibCore/File.h>
#include <LibCore/System.h> #include <LibCore/System.h>
#include <LibMain/Main.h> #include <LibMain/Main.h>
#include <ctype.h>
#include <dirent.h>
#include <errno.h>
#include <pwd.h> #include <pwd.h>
#include <shadow.h> #include <shadow.h>
#include <spawn.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h>
#include <sys/wait.h>
#include <unistd.h> #include <unistd.h>
ErrorOr<int> serenity_main(Main::Arguments arguments) ErrorOr<int> serenity_main(Main::Arguments arguments)
{ {
TRY(Core::System::pledge("stdio wpath rpath cpath fattr proc exec")); TRY(Core::System::pledge("stdio wpath rpath cpath fattr"));
TRY(Core::System::unveil("/etc/", "rwc")); TRY(Core::System::unveil("/etc/", "rwc"));
TRY(Core::System::unveil("/bin/rm", "x"));
StringView username; StringView username;
bool remove_home = false; bool remove_home = false;
@ -50,11 +42,9 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
auto& target_account = account_or_error.value(); auto& target_account = account_or_error.value();
if (remove_home) { if (remove_home)
TRY(Core::System::unveil(target_account.home_directory(), "c"sv)); TRY(Core::System::unveil(target_account.home_directory(), "c"sv));
} else {
TRY(Core::System::pledge("stdio wpath rpath cpath fattr"));
}
TRY(Core::System::unveil(nullptr, nullptr)); TRY(Core::System::unveil(nullptr, nullptr));
char temp_passwd[] = "/etc/passwd.XXXXXX"; char temp_passwd[] = "/etc/passwd.XXXXXX";
@ -153,26 +143,15 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
if (access(target_account.home_directory().characters(), F_OK) == -1) if (access(target_account.home_directory().characters(), F_OK) == -1)
return 0; return 0;
DeprecatedString real_path = Core::File::real_path_for(target_account.home_directory()); auto const real_path = Core::File::real_path_for(target_account.home_directory());
if (real_path == "/") { if (real_path == "/") {
warnln("home directory is /, not deleted!"); warnln("home directory is /, not deleted!");
return 12; return 12;
} }
pid_t child; if (auto result = Core::File::remove(real_path, Core::File::RecursionMode::Allowed); result.is_error()) {
char const* argv[] = { "rm", "-r", target_account.home_directory().characters(), nullptr }; warnln("{}", result.release_error());
if ((errno = posix_spawn(&child, "/bin/rm", nullptr, nullptr, const_cast<char**>(argv), environ))) {
perror("posix_spawn");
return 12;
}
int wstatus;
if (waitpid(child, &wstatus, 0) < 0) {
perror("waitpid");
return 12;
}
if (WEXITSTATUS(wstatus)) {
warnln("failed to remove the home directory");
return 12; return 12;
} }
} }