X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=cgisimple.c;h=5099a579e765d43ca1e3219fa5bb34e4d02f45ac;hp=c1758b973b08e95ed7d5cb44cdb49de9e218352c;hb=60513e33c518dd45644143581976e601d4d6aa60;hpb=e493a146bdd7213e4b2aa16fbc4ecb988f27a59a diff --git a/cgisimple.c b/cgisimple.c index c1758b97..5099a579 100644 --- a/cgisimple.c +++ b/cgisimple.c @@ -1,4 +1,3 @@ -const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.116 2012/10/21 12:39:27 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/cgisimple.c,v $ @@ -6,8 +5,8 @@ const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.116 2012/10/21 12:39:27 fabia * Purpose : Simple CGIs to get information about Privoxy's * status. * - * Copyright : Written by and Copyright (C) 2001-2011 the - * Privoxy team. http://www.privoxy.org/ + * Copyright : Written by and Copyright (C) 2001-2020 the + * Privoxy team. https://www.privoxy.org/ * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -43,9 +42,9 @@ const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.116 2012/10/21 12:39:27 fabia #include #include -#ifdef HAVE_ACCESS +#if defined (HAVE_ACCESS) && defined (HAVE_UNISTD_H) #include -#endif /* def HAVE_ACCESS */ +#endif /* def HAVE_ACCESS && HAVE_UNISTD_H */ #include "project.h" #include "cgi.h" @@ -60,10 +59,10 @@ const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.116 2012/10/21 12:39:27 fabia #include "parsers.h" #include "urlmatch.h" #include "errlog.h" +#ifdef FEATURE_CLIENT_TAGS +#include "client-tags.h" +#endif -const char cgisimple_h_rcs[] = CGISIMPLE_H_VERSION; - -static char *show_rcs(void); static jb_err show_defines(struct map *exports); static jb_err cgi_show_file(struct client_state *csp, struct http_response *rsp, @@ -142,12 +141,7 @@ jb_err cgi_error_404(struct client_state *csp, return JB_ERR_MEMORY; } - rsp->status = strdup("404 Privoxy configuration page not found"); - if (rsp->status == NULL) - { - free_map(exports); - return JB_ERR_MEMORY; - } + rsp->status = strdup_or_die("404 Privoxy configuration page not found"); return template_fill_for_cgi(csp, "cgi-error-404", exports, rsp); } @@ -171,7 +165,6 @@ jb_err cgi_error_404(struct client_state *csp, * CGI Parameters : none * * Returns : JB_ERR_OK on success - * JB_ERR_MEMORY on out-of-memory error. * *********************************************************************/ jb_err cgi_die (struct client_state *csp, @@ -184,7 +177,7 @@ jb_err cgi_die (struct client_state *csp, "\n" " Privoxy shutdown request received\n" " \n" - " \n" + " \n" "\n" "\n" "

Privoxy shutdown request received

\n" @@ -205,13 +198,8 @@ jb_err cgi_die (struct client_state *csp, rsp->head_length = 0; rsp->is_static = 0; - rsp->body = strdup(body); - rsp->status = strdup(status); - - if ((rsp->body == NULL) || (rsp->status == NULL)) - { - return JB_ERR_MEMORY; - } + rsp->body = strdup_or_die(body); + rsp->status = strdup_or_die(status); return JB_ERR_OK; } @@ -272,7 +260,13 @@ jb_err cgi_show_request(struct client_state *csp, } if (map(exports, "processed-request", 1, - html_encode_and_free_original(list_to_text(csp->headers)), 0)) + html_encode_and_free_original( +#ifdef FEATURE_HTTPS_INSPECTION + csp->http->ssl ? + list_to_text(csp->https_headers) : +#endif + list_to_text(csp->headers) + ), 0)) { free_map(exports); return JB_ERR_MEMORY; @@ -282,6 +276,244 @@ jb_err cgi_show_request(struct client_state *csp, } +#ifdef FEATURE_CLIENT_TAGS +/********************************************************************* + * + * Function : cgi_create_client_tag_form + * + * Description : Creates a HTML form to enable or disable a given + * client tag. + * XXX: Could use a template. + * + * Parameters : + * 1 : form = Buffer to fill with the generated form + * 2 : size = Size of the form buffer + * 3 : tag = Name of the tag this form should affect + * 4 : toggle_state = Desired state after the button pressed 0 + * 5 : expires = Whether or not the tag should be enabled. + * Only checked if toggle_state is 1. + * + * Returns : void + * + *********************************************************************/ +static void cgi_create_client_tag_form(char *form, size_t size, + const char *tag, int toggle_state, int expires) +{ + char *button_name; + + if (toggle_state == 1) + { + button_name = (expires == 1) ? "Enable" : "Enable temporarily"; + } + else + { + assert(toggle_state == 0); + button_name = "Disable"; + } + + snprintf(form, size, + "", tag, toggle_state, !expires, button_name); +} + +/********************************************************************* + * + * Function : cgi_show_client_tags + * + * Description : Shows the tags that can be set based on the client + * address (opt-in). + * + * Parameters : + * 1 : csp = Current client state (buffers, headers, etc...) + * 2 : rsp = http_response data structure for output + * 3 : parameters = map of cgi parameters + * + * CGI Parameters : none + * + * Returns : JB_ERR_OK on success + * JB_ERR_MEMORY on out-of-memory error. + * + *********************************************************************/ +jb_err cgi_show_client_tags(struct client_state *csp, + struct http_response *rsp, + const struct map *parameters) +{ + struct map *exports; + struct client_tag_spec *this_tag; + jb_err err = JB_ERR_OK; + char *client_tag_status; + char buf[1000]; + time_t refresh_delay; + + assert(csp); + assert(rsp); + assert(parameters); + + if (NULL == (exports = default_exports(csp, "client-tags"))) + { + return JB_ERR_MEMORY; + } + assert(csp->client_address != NULL); + + this_tag = csp->config->client_tags; + if (this_tag->name == NULL) + { + client_tag_status = strdup_or_die("

No tags have been configured.

\n"); + } + else + { + client_tag_status = strdup_or_die("\n" + "\n" + "\n"); + while ((this_tag != NULL) && (this_tag->name != NULL)) + { + int tag_state; + + privoxy_mutex_lock(&client_tags_mutex); + tag_state = client_has_requested_tag(csp->client_address, this_tag->name); + privoxy_mutex_unlock(&client_tags_mutex); + if (!err) err = string_append(&client_tag_status, "\n"); + if (err) + { + break; + } + this_tag = this_tag->next; + } + if (!err) err = string_append(&client_tag_status, "

Tag name	Current state	Change state	Description
"); + if (!err) err = string_append(&client_tag_status, this_tag->name); + if (!err) err = string_append(&client_tag_status, "	"); + if (!err) err = string_append(&client_tag_status, tag_state == 1 ? "Enabled" : "Disabled"); + if (!err) err = string_append(&client_tag_status, "	"); + cgi_create_client_tag_form(buf, sizeof(buf), this_tag->name, !tag_state, 1); + if (!err) err = string_append(&client_tag_status, buf); + if (tag_state == 0) + { + cgi_create_client_tag_form(buf, sizeof(buf), this_tag->name, !tag_state, 0); + if (!err) err = string_append(&client_tag_status, buf); + } + if (!err) err = string_append(&client_tag_status, "	"); + if (!err) err = string_append(&client_tag_status, this_tag->description); + if (!err) err = string_append(&client_tag_status, "

\n"); + if (err) + { + free_map(exports); + return JB_ERR_MEMORY; + } + } + refresh_delay = get_next_tag_timeout_for_client(csp->client_address); + if (refresh_delay != 0) + { + snprintf(buf, sizeof(buf), "%u", csp->config->client_tag_lifetime); + if (map(exports, "refresh-delay", 1, buf, 1)) + { + freez(client_tag_status); + free_map(exports); + return JB_ERR_MEMORY; + } + } + else + { + err = map_block_killer(exports, "tags-expire"); + if (err != JB_ERR_OK) + { + freez(client_tag_status); + return err; + } + } + + if (map(exports, "client-tags", 1, client_tag_status, 0)) + { + free_map(exports); + return JB_ERR_MEMORY; + } + + if (map(exports, "client-ip-addr", 1, csp->client_address, 1)) + { + free_map(exports); + return JB_ERR_MEMORY; + } + + return template_fill_for_cgi(csp, "client-tags", exports, rsp); +} + + +/********************************************************************* + * + * Function : cgi_toggle_client_tag + * + * Description : Toggles a client tag and redirects to the show-tags + * page + * + * Parameters : + * 1 : csp = Current client state (buffers, headers, etc...) + * 2 : rsp = http_response data structure for output + * 3 : parameters = map of cgi parameters + * + * CGI Parameters : none + * 1 : tag = Name of the tag to enable or disable + * 2 : toggle-state = How to toggle the tag (0/1) + * 3 : expires = Set to 1 if the tag should be enabled + * temporarily, otherwise set to 0 + * + * Returns : JB_ERR_OK on success + * JB_ERR_MEMORY on out-of-memory error. + * + *********************************************************************/ +jb_err cgi_toggle_client_tag(struct client_state *csp, + struct http_response *rsp, + const struct map *parameters) +{ + const char *toggled_tag; + const char *toggle_state; + const char *tag_expires; + time_t time_to_live; + + assert(csp); + assert(rsp); + assert(parameters); + + toggled_tag = lookup(parameters, "tag"); + if (*toggled_tag == '\0') + { + log_error(LOG_LEVEL_ERROR, "Received tag toggle request without tag"); + } + else + { + tag_expires = lookup(parameters, "expires"); + if (*tag_expires == '0') + { + time_to_live = 0; + } + else + { + time_to_live = csp->config->client_tag_lifetime; + } + toggle_state = lookup(parameters, "toggle-state"); + if (*toggle_state == '1') + { + enable_client_specific_tag(csp, toggled_tag, time_to_live); + } + else + { + disable_client_specific_tag(csp, toggled_tag); + } + } + rsp->status = strdup_or_die("302 Done dealing with toggle request"); + if (enlist_unique_header(rsp->headers, + "Location", CGI_PREFIX "client-tags")) + { + return JB_ERR_MEMORY; + } + return JB_ERR_OK; + +} +#endif /* def FEATURE_CLIENT_TAGS */ + + /********************************************************************* * * Function : cgi_send_banner @@ -374,11 +606,7 @@ jb_err cgi_send_banner(struct client_state *csp, */ if (imagetype == 'r') { - rsp->status = strdup("302 Local Redirect from Privoxy"); - if (rsp->status == NULL) - { - return JB_ERR_MEMORY; - } + rsp->status = strdup_or_die("302 Local Redirect from Privoxy"); if (enlist_unique_header(rsp->headers, "Location", csp->action->string[ACTION_STRING_IMAGE_BLOCKER])) { @@ -697,8 +925,8 @@ static const char *get_content_type(const char *filename) int i; struct content_type { - const char *extension; - const char *content_type; + const char extension[6]; + const char content_type[11]; }; static const struct content_type content_types[] = { @@ -811,47 +1039,140 @@ jb_err cgi_send_user_manual(struct client_state *csp, } +#ifdef FEATURE_EXTENDED_STATISTICS /********************************************************************* * - * Function : cgi_show_version + * Function : get_block_reason_statistics_table * - * Description : CGI function that returns a a web page describing the - * file versions of Privoxy. + * Description : Produces the block reason statistic table content. * * Parameters : * 1 : csp = Current client state (buffers, headers, etc...) - * 2 : rsp = http_response data structure for output - * 3 : parameters = map of cgi parameters * - * CGI Parameters : none - * - * Returns : JB_ERR_OK on success - * JB_ERR_MEMORY on out-of-memory error. + * Returns : Pointer to the HTML statistic table content or + * NULL on out of memory * *********************************************************************/ -jb_err cgi_show_version(struct client_state *csp, - struct http_response *rsp, - const struct map *parameters) +static char *get_block_reason_statistics_table(const struct client_state *csp) { - struct map *exports; + char buf[BUFFER_SIZE]; + char *statistics; + int i; + struct file_list *fl; + jb_err err = JB_ERR_OK; - assert(csp); - assert(rsp); - assert(parameters); + statistics = strdup_or_die(""); - if (NULL == (exports = default_exports(csp, "show-version"))) + /* Run through all action files. */ + for (i = 0; i < MAX_AF_FILES; i++) { - return JB_ERR_MEMORY; + struct url_actions *b; + struct action_spec *last_action = NULL; + + if (((fl = csp->actions_list[i]) == NULL) || ((b = fl->f) == NULL)) + { + /* Skip empty files */ + continue; + } + + /* Go through all the actions. */ + for (b = b->next; NULL != b; b = b->next) + { + if (last_action == b->action) + { + continue; + } + if ((b->action->add & ACTION_BLOCK)) + { + unsigned long long count; + const char *block_reason = b->action->string[ACTION_STRING_BLOCK]; + const char *encoded_block_reason = html_encode(block_reason); + + if (encoded_block_reason == NULL) + { + freez(statistics); + return NULL; + } + get_block_reason_count(block_reason, &count); + snprintf(buf, sizeof(buf), + "%s%llu\n", + encoded_block_reason, count); + freez(encoded_block_reason); + + if (!err) err = string_append(&statistics, buf); + } + last_action = b->action; + } } - if (map(exports, "sourceversions", 1, show_rcs(), 0)) + return statistics; + +} + + +/********************************************************************* + * + * Function : get_filter_statistics_table + * + * Description : Produces the filter statistic table content. + * + * Parameters : + * 1 : csp = Current client state (buffers, headers, etc...) + * + * Returns : Pointer to the HTML statistic table content or + * NULL on out of memory + * + *********************************************************************/ +static char *get_filter_statistics_table(const struct client_state *csp) +{ + char buf[BUFFER_SIZE]; + char *statistics; + int i; + struct file_list *fl; + struct re_filterfile_spec *b; + jb_err err = JB_ERR_OK; + + statistics = strdup_or_die(""); + + for (i = 0; i < MAX_AF_FILES; i++) { - free_map(exports); - return JB_ERR_MEMORY; - } + fl = csp->rlist[i]; + if ((NULL == fl) || (NULL == fl->f)) + { + /* + * Either there are no filter files left or this + * filter file just contains no valid filters. + * + * Continue to be sure we don't miss valid filter + * files that are chained after empty or invalid ones. + */ + continue; + } + + for (b = fl->f; b != NULL; b = b->next) + { + if (b->type == FT_CONTENT_FILTER) + { + unsigned long long executions; + unsigned long long response_bodies_modified; + unsigned long long hits; + + get_filter_statistics(b->name, &executions, &response_bodies_modified, &hits); + snprintf(buf, sizeof(buf), + "%s%llu" + "%llu" + "%llu\n", + b->name, executions, response_bodies_modified, hits); + + if (!err) err = string_append(&statistics, buf); + } + } + } + + return statistics; - return template_fill_for_cgi(csp, "show-version", exports, rsp); } +#endif /* def FEATURE_EXTENDED_STATISTICS */ /********************************************************************* @@ -963,9 +1284,38 @@ jb_err cgi_show_status(struct client_state *csp, } #else /* ndef FEATURE_STATISTICS */ - err = err || map_block_killer(exports, "statistics"); + if (!err) err = map_block_killer(exports, "statistics"); #endif /* ndef FEATURE_STATISTICS */ +#ifdef FEATURE_EXTENDED_STATISTICS + if (!err) + { + char *block_reason_statistics = get_block_reason_statistics_table(csp); + if (block_reason_statistics != NULL) + { + err = map(exports, "block-reason-statistics", 1, block_reason_statistics, 0); + } + else + { + err = map_block_killer(exports, "extended-statistics"); + } + } + if (!err) + { + char *filter_statistics = get_filter_statistics_table(csp); + if (filter_statistics != NULL) + { + err = map(exports, "filter-statistics", 1, filter_statistics, 0); + } + else + { + err = map_block_killer(exports, "extended-statistics"); + } + } +#else /* ndef FEATURE_EXTENDED_STATISTICS */ + if (!err) err = map_block_killer(exports, "extended-statistics"); +#endif /* def FEATURE_EXTENDED_STATISTICS */ + /* * List all action files in use, together with view and edit links, * except for standard.action, which should only be viewable. (Not @@ -985,7 +1335,6 @@ jb_err cgi_show_status(struct client_state *csp, #ifdef FEATURE_CGI_EDIT_ACTIONS if ((csp->config->feature_flags & RUNTIME_FEATURE_CGI_EDIT_ACTIONS) - && (NULL == strstr(csp->actions_list[i]->filename, "standard.action")) && (NULL != csp->config->actions_file_short[i])) { #ifdef HAVE_ACCESS @@ -1007,13 +1356,14 @@ jb_err cgi_show_status(struct client_state *csp, if (!err) err = string_append(&s, "\n"); } } - if (*s != '\0') + if (!err && *s != '\0') { - if (!err) err = map(exports, "actions-filenames", 1, s, 0); + err = map(exports, "actions-filenames", 1, s, 0); } else { if (!err) err = map(exports, "actions-filenames", 1, "None specified", 1); + freez(s); } /* @@ -1033,14 +1383,15 @@ jb_err cgi_show_status(struct client_state *csp, if (!err) err = string_append(&s, "\n"); } } - if (*s != '\0') + if (!err && *s != '\0') { - if (!err) err = map(exports, "re-filter-filenames", 1, s, 0); + err = map(exports, "re-filter-filenames", 1, s, 0); } else { if (!err) err = map(exports, "re-filter-filenames", 1, "None specified", 1); if (!err) err = map_block_killer(exports, "have-filterfile"); + freez(s); } #ifdef FEATURE_TRUST @@ -1064,6 +1415,8 @@ jb_err cgi_show_status(struct client_state *csp, } #endif /* ndef CGI_EDIT_ACTIONS */ + if (!err) err = map(exports, "force-prefix", 1, FORCE_PREFIX, 1); + if (err) { free_map(exports); @@ -1117,12 +1470,7 @@ jb_err cgi_show_url_info(struct client_state *csp, /* * Get the url= parameter (if present) and remove any leading/trailing spaces. */ - url_param = strdup(lookup(parameters, "url")); - if (url_param == NULL) - { - free_map(exports); - return JB_ERR_MEMORY; - } + url_param = strdup_or_die(lookup(parameters, "url")); chomp(url_param); /* @@ -1165,7 +1513,7 @@ jb_err cgi_show_url_info(struct client_state *csp, * No prefix or at least no prefix before * the first slash - assume http:// */ - char *url_param_prefixed = strdup("http://"); + char *url_param_prefixed = strdup_or_die("http://"); if (JB_ERR_OK != string_join(&url_param_prefixed, url_param)) { @@ -1185,13 +1533,14 @@ jb_err cgi_show_url_info(struct client_state *csp, map_block_killer(exports, "privoxy-is-toggled-off") ) { + freez(url_param); free_map(exports); return JB_ERR_MEMORY; } if (url_param[0] == '\0') { - /* URL paramater not specified, display query form only. */ + /* URL parameter not specified, display query form only. */ free(url_param); if (map_block_killer(exports, "url-given") || map(exports, "url", 1, "", 1)) @@ -1264,11 +1613,14 @@ jb_err cgi_show_url_info(struct client_state *csp, } /* - * We have a warning about SSL paths. Hide it for unencrypted sites. + * We have a warning about SSL paths. Hide it for unencrypted sites + * and unconditionally if https inspection is enabled. */ +#ifndef FEATURE_HTTPS_INSPECTION if (!url_to_query->ssl) +#endif { - if (map_block_killer(exports, "https")) + if (map_block_killer(exports, "https-and-no-https-inspection")) { free_current_action(action); free_map(exports); @@ -1277,7 +1629,7 @@ jb_err cgi_show_url_info(struct client_state *csp, } } - matches = strdup(""); + matches = strdup_or_die("

"); for (i = 0; i < MAX_AF_FILES; i++) { @@ -1408,6 +1760,9 @@ jb_err cgi_show_url_info(struct client_state *csp, case SOCKS_5: socks_type = "socks5"; break; + case SOCKS_5T: + socks_type = "socks5t"; + break; default: log_error(LOG_LEVEL_FATAL, "Unknown socks type: %d.", fwd->type); } @@ -1513,7 +1868,7 @@ jb_err cgi_robots_txt(struct client_state *csp, (void)csp; (void)parameters; - rsp->body = strdup( + rsp->body = strdup_or_die( "# This is the Privoxy control interface.\n" "# It isn't very useful to index it, and you're likely to break stuff.\n" "# So go away!\n" @@ -1521,10 +1876,6 @@ jb_err cgi_robots_txt(struct client_state *csp, "User-agent: *\n" "Disallow: /\n" "\n"); - if (rsp->body == NULL) - { - return JB_ERR_MEMORY; - } err = enlist_unique(rsp->headers, "Content-Type: text/plain", 13); @@ -1541,7 +1892,7 @@ jb_err cgi_robots_txt(struct client_state *csp, * * Function : show_defines * - * Description : Add to a map the state od all conditional #defines + * Description : Add to a map the state of all conditional #defines * used when building * * Parameters : @@ -1554,225 +1905,233 @@ jb_err cgi_robots_txt(struct client_state *csp, static jb_err show_defines(struct map *exports) { jb_err err = JB_ERR_OK; + int i; + struct feature { + const char name[31]; + const unsigned char is_available; + }; + static const struct feature features[] = { + { + "FEATURE_64_BIT_TIME_T", +#if (SIZEOF_TIME_T == 8) + 1, +#else + 0, +#endif + }, + { + "FEATURE_ACCEPT_FILTER", #ifdef FEATURE_ACCEPT_FILTER - if (!err) err = map_conditional(exports, "FEATURE_ACCEPT_FILTER", 1); -#else /* ifndef FEATURE_ACCEPT_FILTER */ - if (!err) err = map_conditional(exports, "FEATURE_ACCEPT_FILTER", 0); -#endif /* ndef FEATURE_ACCEPT_FILTER */ - + 1, +#else + 0, +#endif + }, + { + "FEATURE_ACL", #ifdef FEATURE_ACL - if (!err) err = map_conditional(exports, "FEATURE_ACL", 1); -#else /* ifndef FEATURE_ACL */ - if (!err) err = map_conditional(exports, "FEATURE_ACL", 0); -#endif /* ndef FEATURE_ACL */ - + 1, +#else + 0, +#endif + }, + { + "FEATURE_BROTLI", +#ifdef FEATURE_BROTLI + 1, +#else + 0, +#endif + }, + { + "FEATURE_CGI_EDIT_ACTIONS", #ifdef FEATURE_CGI_EDIT_ACTIONS - if (!err) err = map_conditional(exports, "FEATURE_CGI_EDIT_ACTIONS", 1); -#else /* ifndef FEATURE_CGI_EDIT_ACTIONS */ - if (!err) err = map_conditional(exports, "FEATURE_CGI_EDIT_ACTIONS", 0); -#endif /* ndef FEATURE_CGI_EDIT_ACTIONS */ - + 1, +#else + 0, +#endif + }, + { + "FEATURE_CLIENT_TAGS", +#ifdef FEATURE_CLIENT_TAGS + 1, +#else + 0, +#endif + }, + { + "FEATURE_COMPRESSION", #ifdef FEATURE_COMPRESSION - if (!err) err = map_conditional(exports, "FEATURE_COMPRESSION", 1); -#else /* ifndef FEATURE_COMPRESSION */ - if (!err) err = map_conditional(exports, "FEATURE_COMPRESSION", 0); -#endif /* ndef FEATURE_COMPRESSION */ - + 1, +#else + 0, +#endif + }, + { + "FEATURE_CONNECTION_KEEP_ALIVE", #ifdef FEATURE_CONNECTION_KEEP_ALIVE - if (!err) err = map_conditional(exports, "FEATURE_CONNECTION_KEEP_ALIVE", 1); -#else /* ifndef FEATURE_CONNECTION_KEEP_ALIVE */ - if (!err) err = map_conditional(exports, "FEATURE_CONNECTION_KEEP_ALIVE", 0); -#endif /* ndef FEATURE_CONNECTION_KEEP_ALIVE */ - + 1, +#else + 0, +#endif + }, + { + "FEATURE_CONNECTION_SHARING", #ifdef FEATURE_CONNECTION_SHARING - if (!err) err = map_conditional(exports, "FEATURE_CONNECTION_SHARING", 1); -#else /* ifndef FEATURE_CONNECTION_SHARING */ - if (!err) err = map_conditional(exports, "FEATURE_CONNECTION_SHARING", 0); -#endif /* ndef FEATURE_CONNECTION_SHARING */ - + 1, +#else + 0, +#endif + }, + { + "FEATURE_EXTERNAL_FILTERS", +#ifdef FEATURE_EXTERNAL_FILTERS + 1, +#else + 0, +#endif + }, + { + "FEATURE_FAST_REDIRECTS", #ifdef FEATURE_FAST_REDIRECTS - if (!err) err = map_conditional(exports, "FEATURE_FAST_REDIRECTS", 1); -#else /* ifndef FEATURE_FAST_REDIRECTS */ - if (!err) err = map_conditional(exports, "FEATURE_FAST_REDIRECTS", 0); -#endif /* ndef FEATURE_FAST_REDIRECTS */ - + 1, +#else + 0, +#endif + }, + { + "FEATURE_FORCE_LOAD", #ifdef FEATURE_FORCE_LOAD - if (!err) err = map_conditional(exports, "FEATURE_FORCE_LOAD", 1); - if (!err) err = map(exports, "FORCE_PREFIX", 1, FORCE_PREFIX, 1); -#else /* ifndef FEATURE_FORCE_LOAD */ - if (!err) err = map_conditional(exports, "FEATURE_FORCE_LOAD", 0); - if (!err) err = map(exports, "FORCE_PREFIX", 1, "(none - disabled)", 1); -#endif /* ndef FEATURE_FORCE_LOAD */ - + 1, +#else + 0, +#endif + }, + { + "FEATURE_GRACEFUL_TERMINATION", #ifdef FEATURE_GRACEFUL_TERMINATION - if (!err) err = map_conditional(exports, "FEATURE_GRACEFUL_TERMINATION", 1); -#else /* ifndef FEATURE_GRACEFUL_TERMINATION */ - if (!err) err = map_conditional(exports, "FEATURE_GRACEFUL_TERMINATION", 0); -#endif /* ndef FEATURE_GRACEFUL_TERMINATION */ - + 1, +#else + 0, +#endif + }, + { + "FEATURE_HTTPS_INSPECTION", +#ifdef FEATURE_HTTPS_INSPECTION + 1, +#else + 0, +#endif + }, + { + "FEATURE_IMAGE_BLOCKING", #ifdef FEATURE_IMAGE_BLOCKING - if (!err) err = map_conditional(exports, "FEATURE_IMAGE_BLOCKING", 1); -#else /* ifndef FEATURE_IMAGE_BLOCKING */ - if (!err) err = map_conditional(exports, "FEATURE_IMAGE_BLOCKING", 0); -#endif /* ndef FEATURE_IMAGE_BLOCKING */ - -#ifdef FEATURE_IMAGE_DETECT_MSIE - if (!err) err = map_conditional(exports, "FEATURE_IMAGE_DETECT_MSIE", 1); -#else /* ifndef FEATURE_IMAGE_DETECT_MSIE */ - if (!err) err = map_conditional(exports, "FEATURE_IMAGE_DETECT_MSIE", 0); -#endif /* ndef FEATURE_IMAGE_DETECT_MSIE */ - + 1, +#else + 0, +#endif + }, + { + "FEATURE_IPV6_SUPPORT", #ifdef HAVE_RFC2553 - if (!err) err = map_conditional(exports, "FEATURE_IPV6_SUPPORT", 1); -#else /* ifndef HAVE_RFC2553 */ - if (!err) err = map_conditional(exports, "FEATURE_IPV6_SUPPORT", 0); -#endif /* ndef HAVE_RFC2553 */ - + 1, +#else + 0, +#endif + }, + { + "FEATURE_NO_GIFS", #ifdef FEATURE_NO_GIFS - if (!err) err = map_conditional(exports, "FEATURE_NO_GIFS", 1); -#else /* ifndef FEATURE_NO_GIFS */ - if (!err) err = map_conditional(exports, "FEATURE_NO_GIFS", 0); -#endif /* ndef FEATURE_NO_GIFS */ - + 1, +#else + 0, +#endif + }, + { + "FEATURE_PTHREAD", #ifdef FEATURE_PTHREAD - if (!err) err = map_conditional(exports, "FEATURE_PTHREAD", 1); -#else /* ifndef FEATURE_PTHREAD */ - if (!err) err = map_conditional(exports, "FEATURE_PTHREAD", 0); -#endif /* ndef FEATURE_PTHREAD */ - + 1, +#else + 0, +#endif + }, + { + "FEATURE_STATISTICS", #ifdef FEATURE_STATISTICS - if (!err) err = map_conditional(exports, "FEATURE_STATISTICS", 1); -#else /* ifndef FEATURE_STATISTICS */ - if (!err) err = map_conditional(exports, "FEATURE_STATISTICS", 0); -#endif /* ndef FEATURE_STATISTICS */ - + 1, +#else + 0, +#endif + }, + { + "FEATURE_STRPTIME_SANITY_CHECKS", +#ifdef FEATURE_STRPTIME_SANITY_CHECKS + 1, +#else + 0, +#endif + }, + { + "FEATURE_TOGGLE", #ifdef FEATURE_TOGGLE - if (!err) err = map_conditional(exports, "FEATURE_TOGGLE", 1); -#else /* ifndef FEATURE_TOGGLE */ - if (!err) err = map_conditional(exports, "FEATURE_TOGGLE", 0); -#endif /* ndef FEATURE_TOGGLE */ - + 1, +#else + 0, +#endif + }, + { + "FEATURE_TRUST", #ifdef FEATURE_TRUST - if (!err) err = map_conditional(exports, "FEATURE_TRUST", 1); -#else /* ifndef FEATURE_TRUST */ - if (!err) err = map_conditional(exports, "FEATURE_TRUST", 0); -#endif /* ndef FEATURE_TRUST */ - + 1, +#else + 0, +#endif + }, + { + "FEATURE_ZLIB", #ifdef FEATURE_ZLIB - if (!err) err = map_conditional(exports, "FEATURE_ZLIB", 1); -#else /* ifndef FEATURE_ZLIB */ - if (!err) err = map_conditional(exports, "FEATURE_ZLIB", 0); -#endif /* ndef FEATURE_ZLIB */ - -#ifdef STATIC_PCRE - if (!err) err = map_conditional(exports, "STATIC_PCRE", 1); -#else /* ifndef STATIC_PCRE */ - if (!err) err = map_conditional(exports, "STATIC_PCRE", 0); -#endif /* ndef STATIC_PCRE */ - -#ifdef STATIC_PCRS - if (!err) err = map_conditional(exports, "STATIC_PCRS", 1); -#else /* ifndef STATIC_PCRS */ - if (!err) err = map_conditional(exports, "STATIC_PCRS", 0); -#endif /* ndef STATIC_PCRS */ - - return err; -} - - -/********************************************************************* - * - * Function : show_rcs - * - * Description : Create a string with the rcs info for all sourcefiles - * - * Parameters : None - * - * Returns : A string, or NULL on out-of-memory. - * - *********************************************************************/ -static char *show_rcs(void) -{ - char *result = strdup(""); - char buf[BUFFER_SIZE]; + 1, +#else + 0, +#endif + }, + { + "FEATURE_DYNAMIC_PCRE", +#ifdef FEATURE_DYNAMIC_PCRE + 1, +#else + 0, +#endif + }, + { + "FEATURE_EXTENDED_STATISTICS", +#ifdef FEATURE_EXTENDED_STATISTICS + 1, +#else + 0, +#endif + }, + { + "FEATURE_PCRE_HOST_PATTERNS", +#ifdef FEATURE_PCRE_HOST_PATTERNS + 1, +#else + 0, +#endif + } + }; - /* Instead of including *all* dot h's in the project (thus creating a - * tremendous amount of dependencies), I will concede to declaring them - * as extern's. This forces the developer to add to this list, but oh well. - */ + for (i = 0; i < SZ(features); i++) + { + err = map_conditional(exports, features[i].name, features[i].is_available); + if (err) + { + break; + } + } -#define SHOW_RCS(__x) \ - { \ - extern const char __x[]; \ - snprintf(buf, sizeof(buf), " %s\n", __x); \ - string_append(&result, buf); \ - } - - /* In alphabetical order */ - SHOW_RCS(actions_h_rcs) - SHOW_RCS(actions_rcs) -#ifdef AMIGA - SHOW_RCS(amiga_h_rcs) - SHOW_RCS(amiga_rcs) -#endif /* def AMIGA */ - SHOW_RCS(cgi_h_rcs) - SHOW_RCS(cgi_rcs) -#ifdef FEATURE_CGI_EDIT_ACTIONS - SHOW_RCS(cgiedit_h_rcs) - SHOW_RCS(cgiedit_rcs) -#endif /* def FEATURE_CGI_EDIT_ACTIONS */ - SHOW_RCS(cgisimple_h_rcs) - SHOW_RCS(cgisimple_rcs) -#ifdef __MINGW32__ - SHOW_RCS(cygwin_h_rcs) -#endif - SHOW_RCS(deanimate_h_rcs) - SHOW_RCS(deanimate_rcs) - SHOW_RCS(encode_h_rcs) - SHOW_RCS(encode_rcs) - SHOW_RCS(errlog_h_rcs) - SHOW_RCS(errlog_rcs) - SHOW_RCS(filters_h_rcs) - SHOW_RCS(filters_rcs) - SHOW_RCS(gateway_h_rcs) - SHOW_RCS(gateway_rcs) - SHOW_RCS(jbsockets_h_rcs) - SHOW_RCS(jbsockets_rcs) - SHOW_RCS(jcc_h_rcs) - SHOW_RCS(jcc_rcs) - SHOW_RCS(list_h_rcs) - SHOW_RCS(list_rcs) - SHOW_RCS(loadcfg_h_rcs) - SHOW_RCS(loadcfg_rcs) - SHOW_RCS(loaders_h_rcs) - SHOW_RCS(loaders_rcs) - SHOW_RCS(miscutil_h_rcs) - SHOW_RCS(miscutil_rcs) - SHOW_RCS(parsers_h_rcs) - SHOW_RCS(parsers_rcs) - SHOW_RCS(pcrs_rcs) - SHOW_RCS(pcrs_h_rcs) - SHOW_RCS(project_h_rcs) - SHOW_RCS(ssplit_h_rcs) - SHOW_RCS(ssplit_rcs) - SHOW_RCS(urlmatch_h_rcs) - SHOW_RCS(urlmatch_rcs) -#ifdef _WIN32 -#ifndef _WIN_CONSOLE - SHOW_RCS(w32log_h_rcs) - SHOW_RCS(w32log_rcs) - SHOW_RCS(w32res_h_rcs) - SHOW_RCS(w32taskbar_h_rcs) - SHOW_RCS(w32taskbar_rcs) -#endif /* ndef _WIN_CONSOLE */ - SHOW_RCS(win32_h_rcs) - SHOW_RCS(win32_rcs) -#endif /* def _WIN32 */ - -#undef SHOW_RCS - - return result; + return err; } @@ -1876,6 +2235,7 @@ static jb_err cgi_show_file(struct client_state *csp, s = html_encode_and_free_original(s); if (NULL == s) { + free_map(exports); return JB_ERR_MEMORY; } @@ -1947,19 +2307,18 @@ static jb_err load_file(const char *filename, char **buffer, size_t *length) filename); } - *buffer = (char *)zalloc(*length + 1); - if (NULL == *buffer) - { - err = JB_ERR_MEMORY; - } - else if (!fread(*buffer, *length, 1, fp)) + *buffer = zalloc_or_die(*length + 1); + + if (1 != fread(*buffer, *length, 1, fp)) { /* - * May happen if the file size changes between fseek() and - * fread(). If it does, we just log it and serve what we got. + * May theoretically happen if the file size changes between + * fseek() and fread() because it's edited in-place. Privoxy + * and common text editors don't do that, thus we just fail. */ log_error(LOG_LEVEL_ERROR, "Couldn't completely read file %s.", filename); + freez(*buffer); err = JB_ERR_FILE; }