clearlinux/uwsgi
2
0
Fork 0
mirror of https://github.com/clearlinux/uwsgi.git synced 2026-10-03 23:48:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add emperor-tyrant-initgroups option: add additional groups set via initgroups() in Tyrant mode.

Browse Source
This commit is contained in:
Andjelko Horvat
2014-10-18 00:08:08 +02:00
parent 19c2e22d37
commit ab50662658
3 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/emperor.c
+24 -3
View File
@@ -1524,9 +1524,30 @@ static void uwsgi_emperor_spawn_vassal(struct uwsgi_instance *n_ui) {
uwsgi_error("setgid()");
exit(1);
}
if (setgroups(0, NULL)) {
uwsgi_error("setgroups()");
exit(1);
if (uwsgi.emperor_tyrant_initgroups) {
char *uidname = NULL;
gid_t gid = NULL;
struct passwd *pw = getpwuid(n_ui->uid);
if (pw) {
uidname = pw->pw_name;
gid = pw->pw_gid;
}
if (!uidname) {
uidname = uwsgi_num2str(n_ui->uid);
}
if (initgroups(uidname, gid)) {
uwsgi_error("initgroups()");
exit(1);
}
} else {
if (setgroups(0, NULL)) {
uwsgi_error("setgroups()");
exit(1);
}
}
if (setuid(n_ui->uid)) {
core/uwsgi.c
+1
View File
@@ -212,6 +212,7 @@ static struct uwsgi_option uwsgi_base_options[] = {
{"emperor-pidfile", required_argument, 0, "write the Emperor pid in the specified file", uwsgi_opt_set_str, &uwsgi.emperor_pidfile, 0},
{"emperor-tyrant", no_argument, 0, "put the Emperor in Tyrant mode", uwsgi_opt_true, &uwsgi.emperor_tyrant, 0},
{"emperor-tyrant-nofollow", no_argument, 0, "do not follow symlinks when checking for uid/gid in Tyrant mode", uwsgi_opt_true, &uwsgi.emperor_tyrant_nofollow, 0},
{"emperor-tyrant-initgroups", no_argument, 0, "add additional groups set via initgroups() in Tyrant mode", uwsgi_opt_true, &uwsgi.emperor_tyrant_initgroups, 0},
{"emperor-stats", required_argument, 0, "run the Emperor stats server", uwsgi_opt_set_str, &uwsgi.emperor_stats, 0},
{"emperor-stats-server", required_argument, 0, "run the Emperor stats server", uwsgi_opt_set_str, &uwsgi.emperor_stats, 0},
{"early-emperor", no_argument, 0, "spawn the emperor as soon as possibile", uwsgi_opt_true, &uwsgi.early_emperor, 0},
uwsgi.h
+1
View File
@@ -1861,6 +1861,7 @@ struct uwsgi_server {
int emperor_nofollow;
int emperor_tyrant;
int emperor_tyrant_nofollow;
int emperor_tyrant_initgroups;
int emperor_fd_config;
int early_emperor;
int emperor_throttle;