Skip to content

main: add -Z to drop privileges after binding sockets #40

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

Open
JuliusBairaktaris wants to merge 1 commit into
base: master
Choose a base branch
from
Open

main: add -Z to drop privileges after binding sockets #40

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 26 additions & 1 deletion main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,9 @@

#include <getopt.h>
#include <errno.h>
#include <grp.h>
#include <netdb.h>
#include <pwd.h>
#include <signal.h>

#include <libubox/usock.h>
Expand Down Expand Up @@ -135,6 +137,7 @@ static int usage(const char *name)
" -f Do not fork to background\n"
" -c file Configuration file, default is '/etc/httpd.conf'\n"
" -p [addr:]port Bind to specified address and port, multiple allowed\n"
" -Z user Drop to the given user after binding sockets\n"
#ifdef HAVE_TLS
" -s [addr:]port Like -p but provide HTTPS on this port\n"
" -C file ASN.1 server certificate file\n"
Expand Down Expand Up @@ -275,6 +278,7 @@ int main(int argc, char **argv)
struct alias *alias;
bool nofork = false;
char *port;
const char *priv_user = NULL;
int opt, ch;
int cur_fd;
int bound = 0;
Expand All @@ -295,7 +299,7 @@ int main(int argc, char **argv)
init_defaults_pre();
signal(SIGPIPE, SIG_IGN);

while ((ch = getopt(argc, argv, "A:ab:C:c:Dd:E:e:fh:H:I:i:K:k:L:l:m:N:n:O:o:P:p:qQ:Rr:Ss:T:t:U:u:Xx:y:")) != -1) {
while ((ch = getopt(argc, argv, "A:ab:C:c:Dd:E:e:fh:H:I:i:K:k:L:l:m:N:n:O:o:P:p:qQ:Rr:Ss:T:t:U:u:Xx:y:Z:")) != -1) {
switch(ch) {
#ifdef HAVE_TLS
case 'C':
Expand Down Expand Up @@ -579,6 +583,10 @@ int main(int argc, char **argv)
"ignoring -%c\n", ch);
break;
#endif
case 'Z':
priv_user = optarg;
break;

default:
return usage(argv[0]);
}
Expand Down Expand Up @@ -614,6 +622,23 @@ int main(int argc, char **argv)
}
#endif

if (priv_user) {
struct passwd *pw = getpwnam(priv_user);

if (!pw) {
fprintf(stderr, "Error: Invalid user %s\n", priv_user);
return 1;
}

if (initgroups(priv_user, pw->pw_gid) ||
setgid(pw->pw_gid) ||
setresuid(pw->pw_uid, pw->pw_uid, pw->pw_uid)) {
fprintf(stderr, "Error: Failed to drop privileges to %s: %s\n",
priv_user, strerror(errno));
return 1;
}
}

#ifdef HAVE_LUA
if (lua_handler || lua_prefix) {
fprintf(stderr, "Need handler and prefix to enable Lua support\n");
Expand Down