Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Inherit supplementary groups if no group has been specified #341

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Inherit supplementary groups if no group has been specified #341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ead09f1
Inherit supplementary groups if no group has been specified
socram8888 Oct 24, 2019
dca7ed9
Use returned group number from getgrouplist to avoid race conditions
socram8888 Oct 24, 2019
25143ef
Added groupname to sniproxy.conf man file
socram8888 Oct 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions man/sniproxy.conf.5
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,21 @@ username daemon
Specify the user sniproxy will run as. When sniproxy is launched as super user,
it will drop permissions to this user.

.SS GROUPNAME

.PP
.nf
groupname daemon
.fi
.PP

Overrides the group sniproxy will run as. When sniproxy is launched as super
user, it will change its primary group to this, and drop all supplementary
groups.

If this parameter is not specified, the primary group and supplementary groups
will be taken from the user sniproxy is running as.

.SS PIDFILE

.PP
Expand Down
26 changes: 22 additions & 4 deletions src/sniproxy.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,11 +233,29 @@ drop_perms(const char *username, const char *groupname) {
fatal("getgrnam(): group %s does not exist", groupname);

gid = group->gr_gid;
}

/* drop any supplementary groups */
if (setgroups(1, &gid) < 0)
fatal("setgroups(): %s", strerror(errno));
/* drop any supplementary groups */
if (setgroups(1, &gid) < 0)
fatal("setgroups(): %s", strerror(errno));
} else {
/* if no group has been specified, load user's supplementary groups */
int ngroups = 0;
if (getgrouplist(user->pw_name, user->pw_gid, NULL, &ngroups) != -1)
fatal("getgrouplist(): %s", strerror(errno));

gid_t *groups = malloc(ngroups * sizeof(gid_t));
if (groups == NULL)
fatal("malloc(): %s", strerror(errno));

ngroups = getgrouplist(user->pw_name, user->pw_gid, groups, &ngroups);
if (ngroups < 0)
fatal("getgrouplist(): %s", strerror(errno));

if (setgroups(ngroups, groups) < 0)
fatal("setgroups(): %s", strerror(errno));

free(groups);
}

/* set the main gid */
if (setgid(gid) < 0)
Expand Down