emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

htppd: lots of variable/function renaming in config file parsing.

Browse Source 
fixed a bug where we trashed config file's name;
otherwise, should not have any real behavioral changes.

function                                             old     new   delta
check_user_passwd                                      -     338    +338
handle_incoming_and_exit                            2661    2649     -12
parse_conf                                          1650    1536    -114
checkPerm                                            338       -    -338
------------------------------------------------------------------------------
(add/remove: 1/1 grow/shrink: 0/2 up/down: 338/-464)         Total: -126 bytes
This commit is contained in:
Denis Vlasenko 2008-06-13 09:53:06 +00:00
parent bd8390a872
commit 0eb406caa8
1 changed files with 102 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

225
networking/httpd.c
View File

@ -27,7 +27,7 @@
* Doc: * Doc:
* "CGI Environment Variables": http://hoohoo.ncsa.uiuc.edu/cgi/env.html * "CGI Environment Variables": http://hoohoo.ncsa.uiuc.edu/cgi/env.html
* *
* The server can also be invoked as a url arg decoder and html text encoder * The applet can also be invoked as a url arg decoder and html text encoder
* as follows: * as follows:
* foo=`httpd -d $foo` # decode "Hello%20World" as "Hello World" * foo=`httpd -d $foo` # decode "Hello%20World" as "Hello World"
* bar=`httpd -e "<Hello World>"` # encode as "&#60Hello&#32World&#62" * bar=`httpd -e "<Hello World>"` # encode as "&#60Hello&#32World&#62"
@ -55,19 +55,11 @@
* .au:audio/basic # additional mime type for audio.au files * .au:audio/basic # additional mime type for audio.au files
* *.php:/path/php # running cgi.php scripts through an interpreter * *.php:/path/php # running cgi.php scripts through an interpreter
* *
* A/D may be as a/d or allow/deny - first char case insensitive * A/D may be as a/d or allow/deny - only first char matters.
* Deny IP rules take precedence over allow rules. * Deny/Allow IP logic:
* * - Default is to allow all (Allow all (A:*) is a no-op).
*
* The Deny/Allow IP logic:
*
* - Default is to allow all. No addresses are denied unless
* denied with a D: rule.
* - Order of Deny/Allow rules is significant
* - Deny rules take precedence over allow rules. * - Deny rules take precedence over allow rules.
* - If a deny all rule (D:*) is used it acts as a catch-all for unmatched * - "Deny all" rule (D:*) is applied last.
* addresses.
* - Specification of Allow all (A:*) is a no-op
* *
* Example: * Example:
* 1. Allow only specified addresses * 1. Allow only specified addresses
@ -494,10 +486,10 @@ static void parse_conf(const char *path, int flag)
|| ENABLE_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR || ENABLE_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR
Htaccess *cur; Htaccess *cur;
#endif #endif
const char *cf = configFile; const char *filename = configFile;
char buf[160]; char buf[160];
char *p0; char *p, *p0;
char *c, *p; char *after_colon;
Htaccess_IP *pip; Htaccess_IP *pip;
/* discard old rules */ /* discard old rules */
@ -520,20 +512,20 @@ static void parse_conf(const char *path, int flag)
} }
#endif #endif
if (flag == SUBDIR_PARSE || cf == NULL) { if (flag == SUBDIR_PARSE || filename == NULL) {
cf = alloca(strlen(path) + sizeof(httpd_conf) + 2); filename = alloca(strlen(path) + sizeof(httpd_conf) + 2);
sprintf((char *)cf, "%s/%s", path, httpd_conf); sprintf((char *)filename, "%s/%s", path, httpd_conf);
} }
while ((f = fopen(cf, "r")) == NULL) { while ((f = fopen(filename, "r")) == NULL) {
if (flag == SUBDIR_PARSE || flag == FIND_FROM_HTTPD_ROOT) { if (flag == SUBDIR_PARSE || flag == FIND_FROM_HTTPD_ROOT) {
/* config file not found, no changes to config */ /* config file not found, no changes to config */
return; return;
} }
if (configFile && flag == FIRST_PARSE) /* if -c option given */ if (configFile && flag == FIRST_PARSE) /* if -c option given */
bb_simple_perror_msg_and_die(cf); bb_simple_perror_msg_and_die(filename);
flag = FIND_FROM_HTTPD_ROOT; flag = FIND_FROM_HTTPD_ROOT;
cf = httpd_conf; filename = httpd_conf;
} }
#if ENABLE_FEATURE_HTTPD_BASIC_AUTH #if ENABLE_FEATURE_HTTPD_BASIC_AUTH
@ -541,58 +533,53 @@ static void parse_conf(const char *path, int flag)
#endif #endif
/* This could stand some work */ /* This could stand some work */
while ((p0 = fgets(buf, sizeof(buf), f)) != NULL) { while ((p0 = fgets(buf, sizeof(buf), f)) != NULL) {
c = NULL; after_colon = NULL;
for (p = p0; *p0 != '\0' && *p0 != '#'; p0++) { for (p = p0; *p0 != '\0' && *p0 != '#'; p0++) {
if (!isspace(*p0)) { if (!isspace(*p0)) {
*p++ = *p0; *p++ = *p0;
if (*p0 == ':' && c == NULL) if (*p0 == ':' && after_colon == NULL)
c = p; after_colon = p;
} }
} }
*p = '\0'; *p = '\0';
/* test for empty or strange line */ /* test for empty or strange line */
if (c == NULL || *c == '\0') if (after_colon == NULL || *after_colon == '\0')
continue; continue;
p0 = buf; p0 = buf;
if (*p0 == 'd') if (*p0 == 'd' || *p0 == 'a')
*p0 = 'D'; *p0 -= 0x20; /* a/d -> A/D */
if (*c == '*') { if (*after_colon == '*') {
if (*p0 == 'D') { if (*p0 == 'D') {
/* memorize deny all */ /* memorize "deny all" */
flg_deny_all = 1; flg_deny_all = 1;
} }
/* skip default other "word:*" config lines */ /* skip assumed "A:*", it is a default anyway */
continue; continue;
} }
if (*p0 == 'a')
*p0 = 'A';
if (*p0 == 'A' || *p0 == 'D') { if (*p0 == 'A' || *p0 == 'D') {
/* storing current config IP line */ /* storing current config IP line */
pip = xzalloc(sizeof(Htaccess_IP)); pip = xzalloc(sizeof(Htaccess_IP));
if (pip) { if (scan_ip_mask(after_colon, &(pip->ip), &(pip->mask))) {
if (scan_ip_mask(c, &(pip->ip), &(pip->mask))) { /* IP{/mask} syntax error detected, protect all */
/* syntax IP{/mask} error detected, protect all */ *p0 = 'D';
*p0 = 'D'; pip->mask = 0;
pip->mask = 0; }
} pip->allow_deny = *p0;
pip->allow_deny = *p0; if (*p0 == 'D') {
if (*p0 == 'D') { /* Deny:from_IP - prepend */
/* Deny:from_IP move top */ pip->next = ip_a_d;
pip->next = ip_a_d; ip_a_d = pip;
} else {
/* A:from_IP - append (thus D precedes A) */
Htaccess_IP *prev_IP = ip_a_d;
if (prev_IP == NULL) {
ip_a_d = pip; ip_a_d = pip;
} else { } else {
/* add to bottom A:form_IP config line */ while (prev_IP->next)
Htaccess_IP *prev_IP = ip_a_d; prev_IP = prev_IP->next;
prev_IP->next = pip;
if (prev_IP == NULL) {
ip_a_d = pip;
} else {
while (prev_IP->next)
prev_IP = prev_IP->next;
prev_IP->next = pip;
}
} }
} }
continue; continue;
@ -601,24 +588,18 @@ static void parse_conf(const char *path, int flag)
#if ENABLE_FEATURE_HTTPD_ERROR_PAGES #if ENABLE_FEATURE_HTTPD_ERROR_PAGES
if (flag == FIRST_PARSE && *p0 == 'E') { if (flag == FIRST_PARSE && *p0 == 'E') {
unsigned i; unsigned i;
/* error status code */ int status = atoi(++p0); /* error status code */
int status = atoi(++p0);
/* c already points at the character following ':' in parse loop */
/* c = strchr(p0, ':'); c++; */
if (status < HTTP_CONTINUE) { if (status < HTTP_CONTINUE) {
bb_error_msg("config error '%s' in '%s'", buf, cf); bb_error_msg("config error '%s' in '%s'", buf, filename);
continue; continue;
} }
/* then error page; find matching status */ /* then error page; find matching status */
for (i = 0; i < ARRAY_SIZE(http_response_type); i++) { for (i = 0; i < ARRAY_SIZE(http_response_type); i++) {
if (http_response_type[i] == status) { if (http_response_type[i] == status) {
// We chdir to home_httpd, thus no need to /* We chdir to home_httpd, thus no need to
// concat_path_file(home_httpd, c) * concat_path_file(home_httpd, after_colon)
//if (c[0] == '/' || home_httpd[0] != '/') * here */
http_error_page[i] = xstrdup(c); http_error_page[i] = xstrdup(after_colon);
//else
// http_error_page[i] = concat_path_file(home_httpd, c);
break; break;
} }
} }
@ -632,22 +613,22 @@ static void parse_conf(const char *path, int flag)
char *url_from, *host_port, *url_to; char *url_from, *host_port, *url_to;
Htaccess_Proxy *proxy_entry; Htaccess_Proxy *proxy_entry;
url_from = c; url_from = after_colon;
host_port = strchr(c, ':'); host_port = strchr(after_colon, ':');
if (host_port == NULL) { if (host_port == NULL) {
bb_error_msg("config error '%s' in '%s'", buf, cf); bb_error_msg("config error '%s' in '%s'", buf, filename);
continue; continue;
} }
*host_port++ = '\0'; *host_port++ = '\0';
if (strncmp(host_port, "http://", 7) == 0) if (strncmp(host_port, "http://", 7) == 0)
host_port += 7; host_port += 7;
if (*host_port == '\0') { if (*host_port == '\0') {
bb_error_msg("config error '%s' in '%s'", buf, cf); bb_error_msg("config error '%s' in '%s'", buf, filename);
continue; continue;
} }
url_to = strchr(host_port, '/'); url_to = strchr(host_port, '/');
if (url_to == NULL) { if (url_to == NULL) {
bb_error_msg("config error '%s' in '%s'", buf, cf); bb_error_msg("config error '%s' in '%s'", buf, filename);
continue; continue;
} }
*url_to = '\0'; *url_to = '\0';
@ -665,45 +646,44 @@ static void parse_conf(const char *path, int flag)
#if ENABLE_FEATURE_HTTPD_BASIC_AUTH #if ENABLE_FEATURE_HTTPD_BASIC_AUTH
if (*p0 == '/') { if (*p0 == '/') {
/* make full path from httpd root / current_path / config_line_path */ /* make full path from httpd root / current_path / config_line_path */
cf = (flag == SUBDIR_PARSE ? path : ""); const char *tp = (flag == SUBDIR_PARSE ? path : "");
p0 = xmalloc(strlen(cf) + (c - buf) + 2 + strlen(c)); p0 = xmalloc(strlen(tp) + (after_colon - buf) + 2 + strlen(after_colon));
c[-1] = '\0'; after_colon[-1] = '\0';
sprintf(p0, "/%s%s", cf, buf); sprintf(p0, "/%s%s", tp, buf);
/* another call bb_simplify_path */
cf = p = p0;
/* looks like bb_simplify_path... */
tp = p = p0;
do { do {
if (*p == '/') { if (*p == '/') {
if (*cf == '/') { /* skip duplicate (or initial) slash */ if (*tp == '/') { /* skip duplicate (or initial) slash */
continue; continue;
} }
if (*cf == '.') { if (*tp == '.') {
if (cf[1] == '/' || cf[1] == '\0') { /* remove extra '.' */ if (tp[1] == '/' || tp[1] == '\0') { /* remove extra '.' */
continue; continue;
} }
if ((cf[1] == '.') && (cf[2] == '/' || cf[2] == '\0')) { if ((tp[1] == '.') && (tp[2] == '/' || tp[2] == '\0')) {
++cf; ++tp;
if (p > p0) { if (p > p0) {
while (*--p != '/') /* omit previous dir */; while (*--p != '/') /* omit previous dir */
continue;
} }
continue; continue;
} }
} }
} }
*++p = *cf; *++p = *tp;
} while (*++cf); } while (*++tp);
if ((p == p0) || (*p != '/')) { /* not a trailing slash */ if ((p == p0) || (*p != '/')) { /* not a trailing slash */
++p; /* so keep last character */ ++p; /* so keep last character */
} }
*p = ':'; *p = ':';
strcpy(p + 1, c); strcpy(p + 1, after_colon);
} }
#endif #endif
if (*p0 == 'I') { if (*p0 == 'I') {
index_page = xstrdup(c); index_page = xstrdup(after_colon);
continue; continue;
} }
@ -712,38 +692,39 @@ static void parse_conf(const char *path, int flag)
|| ENABLE_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR || ENABLE_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR
/* storing current config line */ /* storing current config line */
cur = xzalloc(sizeof(Htaccess) + strlen(p0)); cur = xzalloc(sizeof(Htaccess) + strlen(p0));
cf = strcpy(cur->before_colon, p0); strcpy(cur->before_colon, p0);
#if ENABLE_FEATURE_HTTPD_BASIC_AUTH #if ENABLE_FEATURE_HTTPD_BASIC_AUTH
if (*p0 == '/') if (*p0 == '/') /* was malloced - see above */
free(p0); free(p0);
#endif #endif
c = strchr(cf, ':'); cur->after_colon = strchr(cur->before_colon, ':');
*c++ = '\0'; *cur->after_colon++ = '\0';
cur->after_colon = c;
#if ENABLE_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES #if ENABLE_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES
if (*cf == '.') { if (cur->before_colon[0] == '.') {
/* config .mime line move top for overwrite previous */ /* .mime line: prepend to mime_a list */
cur->next = mime_a; cur->next = mime_a;
mime_a = cur; mime_a = cur;
continue; continue;
} }
#endif #endif
#if ENABLE_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR #if ENABLE_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR
if (*cf == '*' && cf[1] == '.') { if (cur->before_colon[0] == '*' && cur->before_colon[1] == '.') {
/* config script interpreter line move top for overwrite previous */ /* script interpreter line: prepend to script_i list */
cur->next = script_i; cur->next = script_i;
script_i = cur; script_i = cur;
continue; continue;
} }
#endif #endif
#if ENABLE_FEATURE_HTTPD_BASIC_AUTH #if ENABLE_FEATURE_HTTPD_BASIC_AUTH
//TODO: we do not test for leading "/"??
//also, do we leak cur if BASIC_AUTH is off?
if (prev == NULL) { if (prev == NULL) {
/* first line */ /* first line */
g_auth = prev = cur; g_auth = prev = cur;
} else { } else {
/* sort path, if current length eq or bigger then move up */ /* sort path, if current length eq or bigger then move up */
Htaccess *prev_hti = g_auth; Htaccess *prev_hti = g_auth;
size_t l = strlen(cf); size_t l = strlen(cur->before_colon);
Htaccess *hti; Htaccess *hti;
for (hti = prev_hti; hti; hti = hti->next) { for (hti = prev_hti; hti; hti = hti->next) {
@ -1651,7 +1632,6 @@ static int checkPermIP(void)
{ {
Htaccess_IP *cur; Htaccess_IP *cur;
/* This could stand some work */
for (cur = ip_a_d; cur; cur = cur->next) { for (cur = ip_a_d; cur; cur = cur->next) {
#if DEBUG #if DEBUG
fprintf(stderr, fprintf(stderr,
@ -1668,26 +1648,23 @@ static int checkPermIP(void)
); );
#endif #endif
if ((rmt_ip & cur->mask) == cur->ip) if ((rmt_ip & cur->mask) == cur->ip)
return cur->allow_deny == 'A'; /* Allow/Deny */ return (cur->allow_deny == 'A'); /* A -> 1 */
} }
/* if unconfigured, return 1 - access from all */ return !flg_deny_all; /* depends on whether we saw "D:*" */
return !flg_deny_all;
} }
#if ENABLE_FEATURE_HTTPD_BASIC_AUTH #if ENABLE_FEATURE_HTTPD_BASIC_AUTH
/* /*
* Check the permission file for access password protected. * Config file entries are of the form "/<path>:<user>:<passwd>".
* If config file has no prefix match for path, access is allowed.
* *
* If config file isn't present, everything is allowed. * path The file path
* Entries are of the form you can see example from header source * user_and_passwd "user:passwd" to validate
* *
* path The file path. * Returns 1 if user_and_passwd is OK.
* request User information to validate.
*
* Returns 1 if request is OK.
*/ */
static int checkPerm(const char *path, const char *request) static int check_user_passwd(const char *path, const char *request)
{ {
Htaccess *cur; Htaccess *cur;
const char *p; const char *p;
@ -1786,7 +1763,6 @@ static void handle_incoming_and_exit(const len_and_sockaddr *fromAddr)
char *urlcopy; char *urlcopy;
char *urlp; char *urlp;
char *tptr; char *tptr;
int ip_allowed;
#if ENABLE_FEATURE_HTTPD_CGI #if ENABLE_FEATURE_HTTPD_CGI
static const char request_HEAD[] ALIGN1 = "HEAD"; static const char request_HEAD[] ALIGN1 = "HEAD";
const char *prequest; const char *prequest;
@ -1797,6 +1773,10 @@ static void handle_incoming_and_exit(const len_and_sockaddr *fromAddr)
#define prequest request_GET #define prequest request_GET
unsigned long length = 0; unsigned long length = 0;
#endif #endif
#if ENABLE_FEATURE_HTTPD_BASIC_AUTH
smallint authorized = -1;
#endif
smallint ip_allowed;
char http_major_version; char http_major_version;
#if ENABLE_FEATURE_HTTPD_PROXY #if ENABLE_FEATURE_HTTPD_PROXY
char http_minor_version; char http_minor_version;
@ -1804,9 +1784,6 @@ static void handle_incoming_and_exit(const len_and_sockaddr *fromAddr)
char *header_ptr = header_ptr; char *header_ptr = header_ptr;
Htaccess_Proxy *proxy_entry; Htaccess_Proxy *proxy_entry;
#endif #endif
#if ENABLE_FEATURE_HTTPD_BASIC_AUTH
int credentials = -1; /* if not required this is Ok */
#endif
/* Allocation of iobuf is postponed until now /* Allocation of iobuf is postponed until now
* (IOW, server process doesn't need to waste 8k) */ * (IOW, server process doesn't need to waste 8k) */
@ -1946,7 +1923,7 @@ static void handle_incoming_and_exit(const len_and_sockaddr *fromAddr)
/* have path1/path2 */ /* have path1/path2 */
*tptr = '\0'; *tptr = '\0';
if (is_directory(urlcopy + 1, 1, &sb)) { if (is_directory(urlcopy + 1, 1, &sb)) {
/* may be having subdir config */ /* may have subdir config */
parse_conf(urlcopy + 1, SUBDIR_PARSE); parse_conf(urlcopy + 1, SUBDIR_PARSE);
ip_allowed = checkPermIP(); ip_allowed = checkPermIP();
} }
@ -2019,8 +1996,8 @@ static void handle_incoming_and_exit(const len_and_sockaddr *fromAddr)
#if ENABLE_FEATURE_HTTPD_BASIC_AUTH #if ENABLE_FEATURE_HTTPD_BASIC_AUTH
if (STRNCASECMP(iobuf, "Authorization:") == 0) { if (STRNCASECMP(iobuf, "Authorization:") == 0) {
/* We only allow Basic credentials. /* We only allow Basic credentials.
* It shows up as "Authorization: Basic <userid:password>" where * It shows up as "Authorization: Basic <user>:<passwd>" where
* the userid:password is base64 encoded. * "<user>:<passwd>" is base64 encoded.
*/ */
tptr = skip_whitespace(iobuf + sizeof("Authorization:")-1); tptr = skip_whitespace(iobuf + sizeof("Authorization:")-1);
if (STRNCASECMP(tptr, "Basic") != 0) if (STRNCASECMP(tptr, "Basic") != 0)
@ -2028,9 +2005,9 @@ static void handle_incoming_and_exit(const len_and_sockaddr *fromAddr)
tptr += sizeof("Basic")-1; tptr += sizeof("Basic")-1;
/* decodeBase64() skips whitespace itself */ /* decodeBase64() skips whitespace itself */
decodeBase64(tptr); decodeBase64(tptr);
credentials = checkPerm(urlcopy, tptr); authorized = check_user_passwd(urlcopy, tptr);
} }
#endif /* FEATURE_HTTPD_BASIC_AUTH */ #endif
#if ENABLE_FEATURE_HTTPD_RANGES #if ENABLE_FEATURE_HTTPD_RANGES
if (STRNCASECMP(iobuf, "Range:") == 0) { if (STRNCASECMP(iobuf, "Range:") == 0) {
/* We know only bytes=NNN-[MMM] */ /* We know only bytes=NNN-[MMM] */
@ -2054,13 +2031,15 @@ static void handle_incoming_and_exit(const len_and_sockaddr *fromAddr)
/* We are done reading headers, disable peer timeout */ /* We are done reading headers, disable peer timeout */
alarm(0); alarm(0);
if (strcmp(bb_basename(urlcopy), httpd_conf) == 0 || ip_allowed == 0) { if (strcmp(bb_basename(urlcopy), httpd_conf) == 0 || !ip_allowed) {
/* protect listing [/path]/httpd_conf or IP deny */ /* protect listing [/path]/httpd_conf or IP deny */
send_headers_and_exit(HTTP_FORBIDDEN); send_headers_and_exit(HTTP_FORBIDDEN);
} }
#if ENABLE_FEATURE_HTTPD_BASIC_AUTH #if ENABLE_FEATURE_HTTPD_BASIC_AUTH
if (credentials <= 0 && checkPerm(urlcopy, ":") == 0) { /* Case: no "Authorization:" was seen, but page does require passwd.
* Check that with dummy user:pass */
if ((authorized <= 0) && check_user_passwd(urlcopy, ":") == 0) {
send_headers_and_exit(HTTP_UNAUTHORIZED); send_headers_and_exit(HTTP_UNAUTHORIZED);
} }
#endif #endif