X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=networking%2Fhttpd.c;h=11e89f64a5c4e3ac9d0aec1ba2ae94634b6080e7;hb=999af20d3e025741197b8aebea9aeb4e435c9ebf;hp=1a3f5f94f3a26d96b1c3ce7b75903f47695c5fe0;hpb=9adcf73152e1cb4d537d3ff713abe9d1c51171dd;p=oweals%2Fbusybox.git diff --git a/networking/httpd.c b/networking/httpd.c index 1a3f5f94f..11e89f64a 100644 --- a/networking/httpd.c +++ b/networking/httpd.c @@ -2,7 +2,7 @@ * httpd implementation for busybox * * Copyright (C) 2002,2003 Glenn Engel - * Copyright (C) 2003 Vladimir Oleynik + * Copyright (C) 2003,2004 Vladimir Oleynik * * simplify patch stolen from libbb without using strdup * @@ -40,11 +40,11 @@ * foo=`httpd -d $foo` # decode "Hello%20World" as "Hello World" * bar=`httpd -e ""` # encode as "<Hello World>" * Note that url encoding for arguments is not the same as html encoding for - * presenation. -d decodes a url-encoded argument while -e encodes in html + * presentation. -d decodes a url-encoded argument while -e encodes in html * for page display. * * httpd.conf has the following format: - * + * * A:172.20. # Allow address from 172.20.0.0/16 * A:10.0.0.0/25 # Allow any address from 10.0.0.0-10.0.0.127 * A:10.0.0.0/255.255.255.128 # Allow any address that previous set @@ -54,33 +54,33 @@ * /adm:admin:setup # Require user admin, pwd setup on urls starting with /adm/ * /adm:toor:PaSsWd # or user toor, pwd PaSsWd on urls starting with /adm/ * .au:audio/basic # additional mime type for audio.au files - * - * A/D may be as a/d or allow/deny - first char case unsensitive + * + * A/D may be as a/d or allow/deny - first char case insensitive * Deny IP rules take precedence over allow rules. - * - * + * + * * The Deny/Allow IP logic: - * + * * - Default is to allow all. No addresses are denied unless - * denied with a D: rule. + * denied with a D: rule. * - Order of Deny/Allow rules is significant * - Deny rules take precedence over allow rules. * - If a deny all rule (D:*) is used it acts as a catch-all for unmatched - * addresses. + * addresses. * - Specification of Allow all (A:*) is a no-op - * + * * Example: * 1. Allow only specified addresses * A:172.20 # Allow any address that begins with 172.20. * A:10.10. # Allow any address that begins with 10.10. * A:127.0.0.1 # Allow local loopback connections * D:* # Deny from other IP connections - * + * * 2. Only deny specified addresses * D:1.2.3. # deny from 1.2.3.0 - 1.2.3.255 * D:2.3.4. # deny from 2.3.4.0 - 2.3.4.255 * A:* # (optional line added for clarity) - * + * * If a sub directory contains a config file it is parsed and merged with * any existing settings as if it was appended to the original configuration. * @@ -91,11 +91,11 @@ * subdir http request, any merge is discarded when the process exits. As a * result, the subdir settings only have a lifetime of a single request. * - * - * If -c is not set, an attempt will be made to open the default + * + * If -c is not set, an attempt will be made to open the default * root configuration file. If -c is set and the file is not found, the * server exits with an error. - * + * */ @@ -116,7 +116,7 @@ #include "busybox.h" -static const char httpdVersion[] = "busybox httpd/1.34 2-Oct-2003"; +static const char httpdVersion[] = "busybox httpd/1.35 6-Oct-2004"; static const char default_path_httpd_conf[] = "/etc"; static const char httpd_conf[] = "httpd.conf"; static const char home[] = "./"; @@ -127,7 +127,9 @@ static const char home[] = "./"; # define cont_l_fmt "%ld" #endif -// Note: bussybox xfuncs are not used because we want the server to keep running +#define TIMEOUT 60 + +// Note: busybox xfuncs are not used because we want the server to keep running // if something bad happens due to a malformed user request. // As a result, all memory allocation after daemonize // is checked rigorously @@ -218,6 +220,8 @@ typedef struct char *remoteuser; #endif + const char *query; + #ifdef CONFIG_FEATURE_HTTPD_CGI char *referer; #endif @@ -230,8 +234,11 @@ typedef struct #endif unsigned port; /* server initial port and for set env REMOTE_PORT */ + union HTTPD_FOUND { + const char *found_mime_type; + const char *found_moved_temporarily; + } httpd_found; - const char *found_mime_type; off_t ContentLength; /* -1 - unknown */ time_t last_mod; @@ -253,6 +260,8 @@ typedef struct #define a_c_r 0 #define a_c_w 1 #endif + volatile int alarm_signaled; + } HttpdConfig; static HttpdConfig *config; @@ -260,7 +269,7 @@ static HttpdConfig *config; static const char request_GET[] = "GET"; /* size algorithic optimize */ static const char* const suffixTable [] = { -/* Warning: shorted equalent suffix in one line must be first */ +/* Warning: shorted equivalent suffix in one line must be first */ ".htm.html", "text/html", ".jpg.jpeg", "image/jpeg", ".gif", "image/gif", @@ -284,11 +293,13 @@ static const char* const suffixTable [] = { typedef enum { HTTP_OK = 200, + HTTP_MOVED_TEMPORARILY = 302, + HTTP_BAD_REQUEST = 400, /* malformed syntax */ HTTP_UNAUTHORIZED = 401, /* authentication needed, respond with auth hdr */ HTTP_NOT_FOUND = 404, - HTTP_NOT_IMPLEMENTED = 501, /* used for unrecognized requests */ - HTTP_BAD_REQUEST = 400, /* malformed syntax */ HTTP_FORBIDDEN = 403, + HTTP_REQUEST_TIMEOUT = 408, + HTTP_NOT_IMPLEMENTED = 501, /* used for unrecognized requests */ HTTP_INTERNAL_SERVER_ERROR = 500, #if 0 /* future use */ HTTP_CONTINUE = 100, @@ -299,7 +310,6 @@ typedef enum HTTP_NO_CONTENT = 204, HTTP_MULTIPLE_CHOICES = 300, HTTP_MOVED_PERMANENTLY = 301, - HTTP_MOVED_TEMPORARILY = 302, HTTP_NOT_MODIFIED = 304, HTTP_PAYMENT_REQUIRED = 402, HTTP_BAD_GATEWAY = 502, @@ -316,7 +326,10 @@ typedef struct } HttpEnumString; static const HttpEnumString httpResponseNames[] = { - { HTTP_OK, "OK" }, + { HTTP_OK, "OK", NULL }, + { HTTP_MOVED_TEMPORARILY, "Found", "Directories must end with a slash." }, + { HTTP_REQUEST_TIMEOUT, "Request Timeout", + "No request appeared within a reasonable time period." }, { HTTP_NOT_IMPLEMENTED, "Not Implemented", "The requested method is not recognized by this server." }, #ifdef CONFIG_FEATURE_HTTPD_BASIC_AUTH @@ -334,7 +347,6 @@ static const HttpEnumString httpResponseNames[] = { { HTTP_NO_CONTENT, "No Content" }, { HTTP_MULTIPLE_CHOICES, "Multiple Choices" }, { HTTP_MOVED_PERMANENTLY, "Moved Permanently" }, - { HTTP_MOVED_TEMPORARILY, "Moved Temporarily" }, { HTTP_NOT_MODIFIED, "Not Modified" }, { HTTP_BAD_GATEWAY, "Bad Gateway", "" }, { HTTP_SERVICE_UNAVAILABLE, "Service Unavailable", "" }, @@ -447,7 +459,7 @@ static void free_config_lines(Htaccess **pprev) > $Function: parse_conf() * * $Description: parse configuration file into in-memory linked list. - * + * * The first non-white character is examined to determine if the config line * is one of the following: * .ext:mime/type # new mime type not compiled into httpd @@ -464,7 +476,7 @@ static void free_config_lines(Htaccess **pprev) * checks. * (int) flag . . . . . . the source of the parse request. * - * $Return: (None) + * $Return: (None) * ****************************************************************************/ static void parse_conf(const char *path, int flag) @@ -661,7 +673,7 @@ static void parse_conf(const char *path, int flag) } else { /* sort path, if current lenght eq or bigger then move up */ Htaccess *prev_hti = config->auth; - int l = strlen(cf); + size_t l = strlen(cf); Htaccess *hti; for(hti = prev_hti; hti; hti = hti->next) { @@ -722,7 +734,7 @@ static char *encodeString(const char *string) while ((ch = *string++)) { // very simple check for what to encode if (isalnum(ch)) *p++ = ch; - else p += sprintf(p, "&#%d", (unsigned char) ch); + else p += sprintf(p, "&#%d;", (unsigned char) ch); } *p=0; return out; @@ -775,7 +787,7 @@ static char *decodeString(char *orig, int flag_plus_to_space) * > $Function: addEnv() * - * $Description: Add an enviornment variable setting to the global list. + * $Description: Add an environment variable setting to the global list. * A NAME=VALUE string is allocated, filled, and added to the list of * environment settings passed to the cgi execution script. * @@ -840,7 +852,7 @@ static void addEnvPort(const char *port_name) static void decodeBase64(char *Data) { - const unsigned char *in = Data; + const unsigned char *in = (const unsigned char *)Data; // The decoded size will be at most 3/4 the size of the encoded unsigned long ch = 0; int i = 0; @@ -943,6 +955,7 @@ static int sendHeaders(HttpResponseNum responseNum) char *buf = config->buf; const char *responseString = ""; const char *infoString = 0; + const char *mime_type; unsigned int i; time_t timer = time(0); char timeStr[80]; @@ -956,16 +969,16 @@ static int sendHeaders(HttpResponseNum responseNum) break; } } - if (responseNum != HTTP_OK) { - config->found_mime_type = "text/html"; // error message is HTML - } + /* error message is HTML */ + mime_type = responseNum == HTTP_OK ? + config->httpd_found.found_mime_type : "text/html"; /* emit the current date */ strftime(timeStr, sizeof(timeStr), RFC1123FMT, gmtime(&timer)); len = sprintf(buf, "HTTP/1.0 %d %s\nContent-type: %s\r\n" "Date: %s\r\nConnection: close\r\n", - responseNum, responseString, config->found_mime_type, timeStr); + responseNum, responseString, mime_type, timeStr); #ifdef CONFIG_FEATURE_HTTPD_BASIC_AUTH if (responseNum == HTTP_UNAUTHORIZED) { @@ -973,6 +986,13 @@ static int sendHeaders(HttpResponseNum responseNum) config->realm); } #endif + if(responseNum == HTTP_MOVED_TEMPORARILY) { + len += sprintf(buf+len, "Location: %s/%s%s\r\n", + config->httpd_found.found_moved_temporarily, + (config->query ? "?" : ""), + (config->query ? config->query : "")); + } + if (config->ContentLength != -1) { /* file */ strftime(timeStr, sizeof(timeStr), RFC1123FMT, gmtime(&config->last_mod)); len += sprintf(buf+len, "Last-Modified: %s\r\n%s " cont_l_fmt "\r\n", @@ -1035,7 +1055,6 @@ static int getLine(void) * * $Parameters: * (const char *) url . . . . . . The requested URL (with leading /). - * (const char *urlArgs). . . . . Any URL arguments. * (int bodyLen) . . . . . . . . Length of the post body. * (const char *cookie) . . . . . For set HTTP_COOKIE. * (const char *content_type) . . For set CONTENT_TYPE. @@ -1047,8 +1066,7 @@ static int getLine(void) * ****************************************************************************/ static int sendCgi(const char *url, - const char *request, const char *urlArgs, - int bodyLen, const char *cookie, + const char *request, int bodyLen, const char *cookie, const char *content_type) { int fromCgi[2]; /* pipe for reading data from CGI */ @@ -1118,19 +1136,24 @@ static int sendCgi(const char *url, addEnv("PATH", "INFO", script); /* set /PATH_INFO or NULL */ addEnv("PATH", "", getenv("PATH")); addEnv("REQUEST", "METHOD", request); - if(urlArgs) { - char *uri = alloca(strlen(purl) + 2 + strlen(urlArgs)); + if(config->query) { + char *uri = alloca(strlen(purl) + 2 + strlen(config->query)); if(uri) - sprintf(uri, "%s?%s", purl, urlArgs); + sprintf(uri, "%s?%s", purl, config->query); addEnv("REQUEST", "URI", uri); } else { addEnv("REQUEST", "URI", purl); } if(script != NULL) *script = '\0'; /* reduce /PATH_INFO */ + /* SCRIPT_FILENAME required by PHP in CGI mode */ + if(realpath(purl + 1, realpath_buff)) + addEnv("SCRIPT", "FILENAME", realpath_buff); + else + *realpath_buff = 0; /* set SCRIPT_NAME as full path: /cgi-bin/dirs/script.cgi */ addEnv("SCRIPT_NAME", "", purl); - addEnv("QUERY_STRING", "", urlArgs); + addEnv("QUERY_STRING", "", config->query); addEnv("SERVER", "SOFTWARE", httpdVersion); addEnv("SERVER", "PROTOCOL", "HTTP/1.0"); addEnv("GATEWAY_INTERFACE", "", "CGI/1.1"); @@ -1148,17 +1171,19 @@ static int sendCgi(const char *url, addEnv("HTTP", "COOKIE", cookie); if(content_type) addEnv("CONTENT", "TYPE", content_type); +#ifdef CONFIG_FEATURE_HTTPD_BASIC_AUTH if(config->remoteuser) { addEnv("REMOTE", "USER", config->remoteuser); addEnv("AUTH_TYPE", "", "Basic"); } +#endif if(config->referer) addEnv("HTTP", "REFERER", config->referer); /* set execve argp[0] without path */ argp[0] = strrchr( purl, '/' ) + 1; /* but script argp[0] must have absolute path and chdiring to this */ - if(realpath(purl + 1, realpath_buff) != NULL) { + if(*realpath_buff) { script = strrchr(realpath_buff, '/'); if(script) { *script = '\0'; @@ -1239,22 +1264,34 @@ static int sendCgi(const char *url, post_readed_idx += count; if(post_readed_size == 0) post_readed_idx = 0; + } else { + post_readed_size = post_readed_idx = bodyLen = 0; /* broken pipe to CGI */ } } else if(bodyLen > 0 && post_readed_size == 0 && FD_ISSET(a_c_r, &readSet)) { - count = bodyLen > sizeof(wbuf) ? sizeof(wbuf) : bodyLen; - count = bb_full_read(a_c_r, wbuf, count); + count = bodyLen > (int)sizeof(wbuf) ? (int)sizeof(wbuf) : bodyLen; + count = safe_read(a_c_r, wbuf, count); if(count > 0) { post_readed_size += count; bodyLen -= count; - } else { + } else { bodyLen = 0; /* closed */ } - } else if(FD_ISSET(inFd, &readSet)) { + } + if(FD_ISSET(inFd, &readSet)) { int s = a_c_w; char *rbuf = config->buf; +#ifndef PIPE_BUF +# define PIPESIZE 4096 /* amount of buffering in a pipe */ +#else +# define PIPESIZE PIPE_BUF +#endif +#if PIPESIZE >= MAX_MEMORY_BUFF +# error "PIPESIZE >= MAX_MEMORY_BUFF" +#endif + // There is something to read - count = bb_full_read(inFd, rbuf, MAX_MEMORY_BUFF-1); + count = safe_read(inFd, rbuf, PIPESIZE); if (count == 0) break; /* closed */ if (count > 0) { @@ -1269,7 +1306,9 @@ static int sendCgi(const char *url, } firstLine = 0; } - bb_full_write(s, rbuf, count); + if (bb_full_write(s, rbuf, count) != count) + break; + #ifdef DEBUG if (config->debugHttpd) fprintf(stderr, "cgi read %d bytes\n", count); @@ -1310,14 +1349,14 @@ static int sendFile(const char *url) break; } /* also, if not found, set default as "application/octet-stream"; */ - config->found_mime_type = *(table+1); + config->httpd_found.found_mime_type = *(table+1); #ifdef CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES if (suffix) { Htaccess * cur; for (cur = config->mime_a; cur; cur = cur->next) { if(strcmp(cur->before_colon, suffix) == 0) { - config->found_mime_type = cur->after_colon; + config->httpd_found.found_mime_type = cur->after_colon; break; } } @@ -1327,7 +1366,7 @@ static int sendFile(const char *url) #ifdef DEBUG if (config->debugHttpd) fprintf(stderr, "Sending file '%s' Content-type: %s\n", - url, config->found_mime_type); + url, config->httpd_found.found_mime_type); #endif f = open(url, O_RDONLY); @@ -1376,7 +1415,7 @@ static int checkPermIP(void) return cur->allow_deny == 'A'; /* Allow/Deny */ } - /* if uncofigured, return 1 - access from all */ + /* if unconfigured, return 1 - access from all */ return !config->flg_deny_all; } @@ -1417,7 +1456,7 @@ static int checkPerm(const char *path, const char *request) fprintf(stderr,"checkPerm: '%s' ? '%s'\n", p0, request); #endif { - int l = strlen(p0); + size_t l = strlen(p0); if(strncmp(p0, path, l) == 0 && (l == 1 || path[l] == '/' || path[l] == 0)) { @@ -1471,6 +1510,20 @@ set_remoteuser_var: #endif /* CONFIG_FEATURE_HTTPD_BASIC_AUTH */ +/**************************************************************************** + * + > $Function: handleIncoming() + * + * $Description: Handle an incoming http request. + * + ****************************************************************************/ + +static void +handle_sigalrm( int sig ) +{ + sendHeaders(HTTP_REQUEST_TIMEOUT); + config->alarm_signaled = sig; +} /**************************************************************************** * @@ -1485,24 +1538,35 @@ static void handleIncoming(void) char *url; char *purl; int blank = -1; - char *urlArgs; + char *test; + struct stat sb; + int ip_allowed; #ifdef CONFIG_FEATURE_HTTPD_CGI const char *prequest = request_GET; long length=0; char *cookie = 0; char *content_type = 0; #endif - char *test; - struct stat sb; - int ip_allowed; +#ifndef CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY + fd_set s_fd; + struct timeval tv; + int retval; +#endif + struct sigaction sa; #ifdef CONFIG_FEATURE_HTTPD_BASIC_AUTH int credentials = -1; /* if not requred this is Ok */ #endif + sa.sa_handler = handle_sigalrm; + sigemptyset(&sa.sa_mask); + sa.sa_flags = 0; /* no SA_RESTART */ + sigaction(SIGALRM, &sa, NULL); + do { int count; + (void) alarm( TIMEOUT ); if (getLine() <= 0) break; /* closed */ @@ -1542,9 +1606,11 @@ BAD_REQUEST: } strcpy(url, buf); /* extract url args if present */ - urlArgs = strchr(url, '?'); - if (urlArgs) - *urlArgs++ = 0; + test = strchr(url, '?'); + if (test) { + *test++ = 0; + config->query = test; + } /* algorithm stolen from libbb bb_simplify_path(), but don`t strdup and reducing trailing slash and protect out root */ @@ -1574,17 +1640,16 @@ BAD_REQUEST: *++purl = 0; /* so keep last character */ test = purl; /* end ptr */ + /* If URL is directory, adding '/' */ /* If URL is directory, adding '/' */ if(test[-1] != '/') { if ( is_directory(url + 1, 1, &sb) ) { - *test++ = '/'; - *test = 0; - purl = test; /* end ptr */ + config->httpd_found.found_moved_temporarily = url; } } #ifdef DEBUG if (config->debugHttpd) - fprintf(stderr, "url='%s', args=%s\n", url, urlArgs); + fprintf(stderr, "url='%s', args=%s\n", url, config->query); #endif test = url; @@ -1599,53 +1664,60 @@ BAD_REQUEST: } *test = '/'; } - - // read until blank line for HTTP version specified, else parse immediate - while (blank >= 0 && (count = getLine()) > 0) { + if(blank >= 0) { + // read until blank line for HTTP version specified, else parse immediate + while(1) { + alarm(TIMEOUT); + count = getLine(); + if(count <= 0) + break; #ifdef DEBUG - if (config->debugHttpd) fprintf(stderr, "Header: '%s'\n", buf); + if (config->debugHttpd) fprintf(stderr, "Header: '%s'\n", buf); #endif #ifdef CONFIG_FEATURE_HTTPD_CGI - /* try and do our best to parse more lines */ - if ((strncasecmp(buf, Content_length, 15) == 0)) { - if(prequest != request_GET) - length = strtol(buf + 15, 0, 0); // extra read only for POST - } else if ((strncasecmp(buf, "Cookie:", 7) == 0)) { - for(test = buf + 7; isspace(*test); test++) - ; - cookie = strdup(test); - } else if ((strncasecmp(buf, "Content-Type:", 13) == 0)) { - for(test = buf + 13; isspace(*test); test++) - ; - content_type = strdup(test); - } else if ((strncasecmp(buf, "Referer:", 8) == 0)) { - for(test = buf + 8; isspace(*test); test++) - ; - config->referer = strdup(test); - } + /* try and do our best to parse more lines */ + if ((strncasecmp(buf, Content_length, 15) == 0)) { + if(prequest != request_GET) + length = strtol(buf + 15, 0, 0); // extra read only for POST + } else if ((strncasecmp(buf, "Cookie:", 7) == 0)) { + for(test = buf + 7; isspace(*test); test++) + ; + cookie = strdup(test); + } else if ((strncasecmp(buf, "Content-Type:", 13) == 0)) { + for(test = buf + 13; isspace(*test); test++) + ; + content_type = strdup(test); + } else if ((strncasecmp(buf, "Referer:", 8) == 0)) { + for(test = buf + 8; isspace(*test); test++) + ; + config->referer = strdup(test); + } #endif #ifdef CONFIG_FEATURE_HTTPD_BASIC_AUTH - if (strncasecmp(buf, "Authorization:", 14) == 0) { - /* We only allow Basic credentials. - * It shows up as "Authorization: Basic " where - * the userid:password is base64 encoded. - */ - for(test = buf + 14; isspace(*test); test++) - ; - if (strncasecmp(test, "Basic", 5) != 0) - continue; - - test += 5; /* decodeBase64() skiping space self */ - decodeBase64(test); - credentials = checkPerm(url, test); - } + if (strncasecmp(buf, "Authorization:", 14) == 0) { + /* We only allow Basic credentials. + * It shows up as "Authorization: Basic " where + * the userid:password is base64 encoded. + */ + for(test = buf + 14; isspace(*test); test++) + ; + if (strncasecmp(test, "Basic", 5) != 0) + continue; + + test += 5; /* decodeBase64() skiping space self */ + decodeBase64(test); + credentials = checkPerm(url, test); + } #endif /* CONFIG_FEATURE_HTTPD_BASIC_AUTH */ - } /* while extra header reading */ - + } /* while extra header reading */ + } + (void) alarm( 0 ); + if(config->alarm_signaled) + break; if (strcmp(strrchr(url, '/') + 1, httpd_conf) == 0 || ip_allowed == 0) { /* protect listing [/path]/httpd_conf or IP deny */ @@ -1663,6 +1735,16 @@ FORBIDDEN: /* protect listing /cgi-bin */ } #endif + if(config->httpd_found.found_moved_temporarily) { + sendHeaders(HTTP_MOVED_TEMPORARILY); +#ifdef DEBUG + /* clear unforked memory flag */ + if(config->debugHttpd) + config->httpd_found.found_moved_temporarily = NULL; +#endif + break; + } + test = url + 1; /* skip first '/' */ #ifdef CONFIG_FEATURE_HTTPD_CGI @@ -1673,7 +1755,7 @@ FORBIDDEN: /* protect listing /cgi-bin */ if (strncmp(test, "cgi-bin", 7) == 0) { if(test[7] == '/' && test[8] == 0) goto FORBIDDEN; // protect listing cgi-bin/ - sendCgi(url, prequest, urlArgs, length, cookie, content_type); + sendCgi(url, prequest, length, cookie, content_type); } else { if (prequest != request_GET) sendHeaders(HTTP_NOT_IMPLEMENTED); @@ -1707,10 +1789,23 @@ FORBIDDEN: /* protect listing /cgi-bin */ # ifdef CONFIG_FEATURE_HTTPD_CGI free(cookie); free(content_type); - free(config->remoteuser); free(config->referer); +#ifdef CONFIG_FEATURE_HTTPD_BASIC_AUTH + free(config->remoteuser); +#endif # endif shutdown(a_c_w, SHUT_WR); + + /* Properly wait for remote to closed */ + FD_ZERO (&s_fd) ; + FD_SET (a_c_w, &s_fd) ; + + do { + tv.tv_sec = 2 ; + tv.tv_usec = 0 ; + retval = select (a_c_w + 1, &s_fd, NULL, NULL, &tv); + } while (retval > 0 && (read (a_c_w, buf, sizeof (config->buf)) > 0)); + shutdown(a_c_r, SHUT_RD); close(config->accepted_socket); #endif /* CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY */ @@ -1743,7 +1838,7 @@ static int miniHttpd(int server) while (1) { readfd = portfd; - /* Now wait INDEFINATELY on the set of sockets! */ + /* Now wait INDEFINITELY on the set of sockets! */ if (select(server + 1, &readfd, 0, 0, 0) > 0) { if (FD_ISSET(server, &readfd)) { int on; @@ -1836,38 +1931,36 @@ static void sighup_handler(int sig) static const char httpd_opts[]="c:d:h:" #ifdef CONFIG_FEATURE_HTTPD_ENCODE_URL_STR "e:" -#define OPT_INC_1 1 -#else -#define OPT_INC_1 0 #endif +#define OPT_INC_1 ENABLE_FEATURE_HTTPD_ENCODE_URL_STR + #ifdef CONFIG_FEATURE_HTTPD_BASIC_AUTH "r:" -# ifdef CONFIG_FEATURE_HTTPD_AUTH_MD5 - "m:" -# define OPT_INC_2 2 -# else -# define OPT_INC_2 1 #endif -#else -#define OPT_INC_2 0 +#define OPT_INC_2 ENABLE_FEATURE_HTTPD_BASIC_AUTH + +#ifdef CONFIG_FEATURE_HTTPD_AUTH_MD5 + "m:" #endif +#define OPT_INC_3 ENABLE_FEATURE_HTTPD_AUTH_MD5 + #ifndef CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY "p:v" +#endif #ifdef CONFIG_FEATURE_HTTPD_SETUID "u:" #endif -#endif /* CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY */ ; -#define OPT_CONFIG_FILE (1<<0) -#define OPT_DECODE_URL (1<<1) -#define OPT_HOME_HTTPD (1<<2) -#define OPT_ENCODE_URL (1<<(2+OPT_INC_1)) -#define OPT_REALM (1<<(3+OPT_INC_1)) -#define OPT_MD5 (1<<(4+OPT_INC_1)) -#define OPT_PORT (1<<(3+OPT_INC_1+OPT_INC_2)) -#define OPT_DEBUG (1<<(4+OPT_INC_1+OPT_INC_2)) -#define OPT_SETUID (1<<(5+OPT_INC_1+OPT_INC_2)) +#define OPT_CONFIG_FILE (1<<0) /* c */ +#define OPT_DECODE_URL (1<<1) /* d */ +#define OPT_HOME_HTTPD (1<<2) /* h */ +#define OPT_ENCODE_URL (1<<(2+OPT_INC_1)) /* e */ +#define OPT_REALM (1<<(2+OPT_INC_1+OPT_INC_2)) /* r */ +#define OPT_MD5 (1<<(2+OPT_INC_1+OPT_INC_2+OPT_INC_3)) /* m */ +#define OPT_PORT (1<<(3+OPT_INC_1+OPT_INC_2+OPT_INC_3)) /* p */ +#define OPT_DEBUG (1<<(4+OPT_INC_1+OPT_INC_2+OPT_INC_3)) /* v */ +#define OPT_SETUID (1<<(5+OPT_INC_1+OPT_INC_2+OPT_INC_3)) /* u */ #ifdef HTTPD_STANDALONE @@ -1956,7 +2049,7 @@ int httpd_main(int argc, char *argv[]) uid = strtol(s_uid, &e, 0); if(*e != '\0') { /* not integer */ - uid = my_getpwnam(s_uid); + uid = bb_xgetpwnam(s_uid); } } #endif @@ -1968,7 +2061,7 @@ int httpd_main(int argc, char *argv[]) #ifndef CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY server = openServer(); # ifdef CONFIG_FEATURE_HTTPD_SETUID - /* drop privilegies */ + /* drop privileges */ if(uid > 0) setuid(uid); # endif