mirror
/
darkhttpd
mirror of https://github.com/emikulic/darkhttpd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

. Added str_to_num(). 

. Added handling of --uid.
This commit is contained in:
Emil Mikulic 2003-11-27 05:10:20 +00:00
parent b2b6d75a05
commit b5f0992e7e
1 changed files with 50 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
trunk/darkhttpd.c
View File

@ -17,7 +17,8 @@
* x If-Modified-Since.
* x Test If-Mod-Since with IE, Phoenix, lynx, links, Opera
* x Keep-alive connections.
* . Chroot, set{uid|gid}.
* . Chroot
* . Set{uid|gid}.
* . Port to Win32.
* x Detect Content-Type from a list of content types.
* x Log Referer, User-Agent.
@ -251,6 +252,12 @@ static char *logfile_name = NULL; /* NULL = no logging */
static FILE *logfile = NULL;
static int want_chroot = 0;
#define INVALID_UID ((uid_t) -1)
#define INVALID_GID ((gid_t) -1)
static uid_t drop_uid = INVALID_UID;
static gid_t drop_gid = INVALID_GID;
/* Default mimetype mappings - make sure this array is NULL terminated. */
static const char *default_extension_map[] = {
"text/html html htm",
@ -891,13 +898,31 @@ static void usage(void)
"\t--mimetypes filename (optional)\n"
"\t\tParses specified file for extension-MIME associations.\n"
"\n"
/* "\t--uid blah, --gid blah\n" FIXME */
, bindport, index_name);
"\t--uid uid, --gid gid\n"
"\t\tDrops privileges to given uid:gid after initialization.\n"
"\n",
bindport, index_name);
exit(EXIT_FAILURE);
}
/* ---------------------------------------------------------------------------
* Returns 1 if string is a number, 0 otherwise. Set num to NULL if
* disinterested in value.
*/
static int str_to_num(const char *str, int *num)
{
char *endptr;
long l = strtol(str, &endptr, 10);
if (*endptr != '\0') return 0;
if (num != NULL) *num = (int)l;
return 1;
}
/* ---------------------------------------------------------------------------
* Parses commandline options.
*/
@ -951,6 +976,21 @@ static void parse_commandline(const int argc, char *argv[])
if (++i >= argc) errx(1, "missing filename after --mimetypes");
parse_extension_map_file(argv[i]);
}
else if (strcmp(argv[i], "--uid") == 0)
{
struct passwd *p;
int num;
if (++i >= argc) errx(1, "missing uid after --uid");
if (!str_to_num(argv[i], &num))
p = getpwnam(argv[i]);
else
p = getpwuid( (uid_t)num );
if (p == NULL)
errx(1, "no such uid: `%s'", argv[i]);
else
drop_uid = p->pw_uid;
}
else
errx(1, "unknown argument `%s'", argv[i]);
}
@ -2032,6 +2072,13 @@ int main(int argc, char *argv[])
if (signal(SIGQUIT, exit_quickly) == SIG_ERR)
err(1, "signal(SIGQUIT)");
/* security */
if (drop_uid != INVALID_UID)
{
if (setuid(drop_uid) == -1) err(1, "setuid(%d)", drop_uid);
debugf("set uid to %d\n", drop_uid);
}
for (;;) httpd_poll();
return EXIT_FAILURE; /* unreachable */