RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-14 08:54:58 +00:00
Code Issues Activity Actions

groupadd: Port to LibMain and use the new Core::Group abstraction :^)

Browse source
This commit is contained in:
Kenneth Myhra 2022-01-02 22:54:06 +01:00 • committed by Andreas Kling
parent a99b50ce8c
commit b76c66a9ed
2 changed files with 13 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Userland/Utilities/CMakeLists.txt
View file

@ -102,6 +102,7 @@ target_link_libraries(functrace LibDebug LibX86 LibMain)
target_link_libraries(gml-format LibGUI LibMain)
target_link_libraries(grep LibRegex LibMain)
target_link_libraries(gron LibMain)
target_link_libraries(groupadd LibMain)
target_link_libraries(groups LibMain)
target_link_libraries(gunzip LibCompress LibMain)
target_link_libraries(gzip LibCompress LibMain)

84
Userland/Utilities/groupadd.cpp
View file

@ -2,90 +2,30 @@
* Copyright (c) 2019-2020, Jesse Buhagiar <jooster669@gmail.com>
* Copyright (c) 2021, Brandon Pruitt <brapru@pm.me>
* Copyright (c) 2021, Maxime Friess <M4x1me@pm.me>
* Copyright (c) 2022, Kenneth Myhra <kennethmyhra@gmail.com>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
#include <LibCore/ArgsParser.h>
#include <ctype.h>
#include <grp.h>
#include <string.h>
#include <unistd.h>
#include <LibCore/Group.h>
#include <LibCore/System.h>
#include <LibMain/Main.h>
constexpr gid_t GROUPS_GID = 100;
int main(int argc, char** argv)
ErrorOr<int> serenity_main(Main::Arguments arguments)
{
if (pledge("stdio wpath rpath cpath chown", nullptr) < 0) {
perror("pledge");
return 1;
}
TRY(Core::System::pledge("stdio wpath rpath cpath chown"));
int gid = 0;
char const* groupname = nullptr;
gid_t gid = 0;
StringView group_name;
Core::ArgsParser args_parser;
args_parser.add_option(gid, "Group ID (gid) for the new group", "gid", 'g', "gid");
args_parser.add_positional_argument(groupname, "Name of the group (groupname)", "group");
args_parser.add_positional_argument(group_name, "Name of the group (groupname)", "group");
args_parser.parse(arguments);
args_parser.parse(argc, argv);
// Let's run a quick sanity check on groupname
if (strpbrk(groupname, "\\/!@#$%^&*()~+=`:\n")) {
warnln("invalid character in groupname, {}", groupname);
return 1;
}
// Disallow names starting with _ and -
if (groupname[0] == '_' || groupname[0] == '-' || !isalpha(groupname[0])) {
warnln("invalid groupname, {}", groupname);
return 1;
}
if (getgrnam(groupname)) {
warnln("Group {} already exists!", groupname);
return 1;
}
if (gid < 0) {
warnln("invalid gid {}!", gid);
return 3;
}
// First, let's sort out the gid for the group
if (gid > 0) {
if (getgrgid(static_cast<uid_t>(gid))) {
warnln("gid {} already exists!", gid);
return 4;
}
} else {
for (gid = GROUPS_GID; getgrgid(static_cast<uid_t>(gid)); gid++) {
}
}
if (gid < 0) {
warnln("invalid gid {}", gid);
return 3;
}
FILE* grfile = fopen("/etc/group", "a");
if (!grfile) {
perror("failed to open /etc/group");
return 1;
}
struct group g;
g.gr_name = const_cast<char*>(groupname);
g.gr_passwd = const_cast<char*>("x");
g.gr_gid = static_cast<gid_t>(gid);
g.gr_mem = nullptr;
if (putgrent(&g, grfile) < 0) {
perror("putpwent");
return 1;
}
fclose(grfile);
auto group = Core::Group { group_name, gid };
TRY(Core::Group::add_group(group));
return 0;
}