commit 81680dc7a4465bddde098271843049bdd9f23b9990ee21796639d0ded84d5c30 from: Stefan Sperling date: Mon Sep 29 10:33:03 2025 UTC pass gotwebd.conf's www user setting to every gotwebd child process commit - c75383b43523395c0bf9fca87daec3a3bed6d30b19d400680abbc2b48a424cf8 commit + 81680dc7a4465bddde098271843049bdd9f23b9990ee21796639d0ded84d5c30 blob - 620fb0fda596a12c432cd92b0c3712d84600fa44f9c0465d2b994ad63b7ded94 blob + f16b4f9fd70e10451c5a6c89fc42b13c73934467fe3945c10fa13616276272b2 --- gotwebd/gotwebd.c +++ gotwebd/gotwebd.c @@ -448,13 +448,22 @@ gotwebd_sighdlr(int sig, short event, void *arg) static void spawn_process(struct gotwebd *env, const char *argv0, struct imsgev *iev, enum gotwebd_proc_type proc_type, const char *username, - void (*handler)(int, short, void *)) + const char *www_user, void (*handler)(int, short, void *)) { const char *argv[10]; int argc = 0; int p[2]; pid_t pid; + char usernames[_PW_NAME_LEN * 2 + 1 + 1]; + int ret; + ret = snprintf(usernames, sizeof(usernames), "%s:%s", + username, www_user); + if (ret == -1) + fatal("snprintf"); + if ((size_t)ret >= sizeof(usernames)) + fatalx("usernames too long"); + if (socketpair(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC | SOCK_NONBLOCK, PF_UNSPEC, p) == -1) fatal("socketpair"); @@ -483,22 +492,22 @@ spawn_process(struct gotwebd *env, const char *argv0, char *s; argv[argc++] = "-S"; - argv[argc++] = username; + argv[argc++] = usernames; if (asprintf(&s, "-S%d", env->prefork) == -1) fatal("asprintf"); argv[argc++] = s; } else if (proc_type == GOTWEBD_PROC_LOGIN) { argv[argc++] = "-L"; - argv[argc++] = username; + argv[argc++] = usernames; } else if (proc_type == GOTWEBD_PROC_FCGI) { argv[argc++] = "-F"; - argv[argc++] = username; + argv[argc++] = usernames; } else if (proc_type == GOTWEBD_PROC_AUTH) { argv[argc++] = "-A"; - argv[argc++] = username; + argv[argc++] = usernames; } else if (proc_type == GOTWEBD_PROC_GOTWEB) { argv[argc++] = "-G"; - argv[argc++] = username; + argv[argc++] = usernames; } if (strcmp(env->gotwebd_conffile, GOTWEBD_CONF) != 0) { argv[argc++] = "-f"; @@ -531,6 +540,26 @@ usage(void) exit(1); } +static void +get_usernames(const char **gotwebd_username, const char **www_username, + char *optarg) +{ + static char usernames[_PW_NAME_LEN * 2 + 1 + 1]; + char *colon; + + if (strlcpy(usernames, optarg, sizeof(usernames)) >= + sizeof(usernames)) + fatalx("usernames too long"); + + colon = strchr(usernames, ':'); + if (colon == NULL) + fatalx("bad username option parameter"); + *colon = '\0'; + + *gotwebd_username = &usernames[0]; + *www_username = colon + 1; +} + int main(int argc, char **argv) { @@ -563,7 +592,7 @@ main(int argc, char **argv) switch (ch) { case 'A': proc_type = GOTWEBD_PROC_AUTH; - gotwebd_username = optarg; + get_usernames(&gotwebd_username, &www_username, optarg); break; case 'D': if (cmdline_symset(optarg) < 0) @@ -575,18 +604,18 @@ main(int argc, char **argv) break; case 'G': proc_type = GOTWEBD_PROC_GOTWEB; - gotwebd_username = optarg; + get_usernames(&gotwebd_username, &www_username, optarg); break; case 'f': conffile = optarg; break; case 'F': proc_type = GOTWEBD_PROC_FCGI; - gotwebd_username = optarg; + get_usernames(&gotwebd_username, &www_username, optarg); break; case 'L': proc_type = GOTWEBD_PROC_LOGIN; - gotwebd_username = optarg; + get_usernames(&gotwebd_username, &www_username, optarg); break; case 'n': no_action = 1; @@ -594,9 +623,10 @@ main(int argc, char **argv) case 'S': proc_type = GOTWEBD_PROC_SOCKETS; i = strtonum(optarg, 1, INT_MAX, &errstr); - if (errstr) - gotwebd_username = optarg; - else + if (errstr) { + get_usernames(&gotwebd_username, + &www_username, optarg); + } else env->prefork = i; break; case 'v': @@ -639,13 +669,13 @@ main(int argc, char **argv) pw = getpwnam(www_username); if (pw == NULL) - fatalx("unknown user %s", www_username); + fatalx("%d unknown user %s", proc_type, www_username); env->www_uid = pw->pw_uid; www_gid = pw->pw_gid; pw = getpwnam(gotwebd_username); if (pw == NULL) - fatalx("unknown user %s", gotwebd_username); + fatalx("%d unknown user %s", proc_type, gotwebd_username); if (getgrouplist(gotwebd_username, pw->pw_gid, gotwebd_groups, &gotwebd_ngroups) == -1) fatalx("too many groups for user %s", gotwebd_username); @@ -753,22 +783,22 @@ main(int argc, char **argv) fatal("calloc"); spawn_process(env, argv0, env->iev_sockets, - GOTWEBD_PROC_SOCKETS, gotwebd_username, + GOTWEBD_PROC_SOCKETS, gotwebd_username, www_username, gotwebd_dispatch_server); spawn_process(env, argv0, env->iev_login, GOTWEBD_PROC_LOGIN, - gotwebd_username, gotwebd_dispatch_login); + gotwebd_username, www_username, gotwebd_dispatch_login); spawn_process(env, argv0, env->iev_fcgi, - GOTWEBD_PROC_FCGI, gotwebd_username, + GOTWEBD_PROC_FCGI, gotwebd_username, www_username, gotwebd_dispatch_fcgi); for (i = 0; i < env->prefork; ++i) { spawn_process(env, argv0, &env->iev_auth[i], - GOTWEBD_PROC_AUTH, gotwebd_username, + GOTWEBD_PROC_AUTH, gotwebd_username, www_username, gotwebd_dispatch_auth); spawn_process(env, argv0, &env->iev_gotweb[i], - GOTWEBD_PROC_GOTWEB, gotwebd_username, + GOTWEBD_PROC_GOTWEB, gotwebd_username, www_username, gotwebd_dispatch_gotweb); }