X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=cgisimple.c;h=8acfc1e2b6b31bf67324b1d86ec02084d6352606;hp=3ab3428efd9d9c8d18e864adeda1bb225a319dca;hb=cae3149411d1f24e533eb6028e7fe5c3057c4626;hpb=2f946641e6706380d376f6946f30ebe239cc94bc diff --git a/cgisimple.c b/cgisimple.c index 3ab3428e..8acfc1e2 100644 --- a/cgisimple.c +++ b/cgisimple.c @@ -1,22 +1,19 @@ -const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.109 2011/04/19 13:00:47 fabiankeil Exp $"; +const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.141 2016/05/08 10:46:29 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/cgisimple.c,v $ * * Purpose : Simple CGIs to get information about Privoxy's * status. - * - * Functions declared include: - * * - * Copyright : Written by and Copyright (C) 2001-2011 the + * Copyright : Written by and Copyright (C) 2001-2016 the * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written - * by and Copyright (C) 1997 Anonymous Coders and + * by and Copyright (C) 1997 Anonymous Coders and * Junkbusters Corporation. http://www.junkbusters.com * - * This program is free software; you can redistribute it + * This program is free software; you can redistribute it * and/or modify it under the terms of the GNU General * Public License as published by the Free Software * Foundation; either version 2 of the License, or (at @@ -46,9 +43,9 @@ const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.109 2011/04/19 13:00:47 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" @@ -63,6 +60,9 @@ const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.109 2011/04/19 13:00:47 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; @@ -80,7 +80,7 @@ static jb_err load_file(const char *filename, char **buffer, size_t *length); * Description : CGI function that is called for the CGI_SITE_1_HOST * and CGI_SITE_2_HOST/CGI_SITE_2_PATH base URLs. * Boring - only exports the default exports. - * + * * Parameters : * 1 : csp = Current client state (buffers, headers, etc...) * 2 : rsp = http_response data structure for output @@ -118,7 +118,7 @@ jb_err cgi_default(struct client_state *csp, * * Description : CGI function that is called if an unknown action was * given. - * + * * Parameters : * 1 : csp = Current client state (buffers, headers, etc...) * 2 : rsp = http_response data structure for output @@ -127,7 +127,7 @@ jb_err cgi_default(struct client_state *csp, * CGI Parameters : none * * Returns : JB_ERR_OK on success - * JB_ERR_MEMORY on out-of-memory error. + * JB_ERR_MEMORY on out-of-memory error. * *********************************************************************/ jb_err cgi_error_404(struct client_state *csp, @@ -145,12 +145,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); } @@ -165,7 +160,7 @@ jb_err cgi_error_404(struct client_state *csp, * NOTE: Turning this on in a production build * would be a BAD idea. An EXTREMELY BAD idea. * In short, don't do it. - * + * * Parameters : * 1 : csp = Current client state (buffers, headers, etc...) * 2 : rsp = http_response data structure for output @@ -174,7 +169,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, @@ -187,7 +181,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" @@ -208,13 +202,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; } @@ -227,7 +216,7 @@ jb_err cgi_die (struct client_state *csp, * * Description : Show the client's request and what sed() would have * made of it. - * + * * Parameters : * 1 : csp = Current client state (buffers, headers, etc...) * 2 : rsp = http_response data structure for output @@ -236,7 +225,7 @@ jb_err cgi_die (struct client_state *csp, * CGI Parameters : none * * Returns : JB_ERR_OK on success - * JB_ERR_MEMORY on out-of-memory error. + * JB_ERR_MEMORY on out-of-memory error. * *********************************************************************/ jb_err cgi_show_request(struct client_state *csp, @@ -254,11 +243,11 @@ jb_err cgi_show_request(struct client_state *csp, { return JB_ERR_MEMORY; } - + /* * Repair the damage done to the IOB by get_header() */ - for (p = csp->iob->buf; p < csp->iob->eod; p++) + for (p = csp->client_iob->buf; p < csp->client_iob->cur; p++) { if (*p == '\0') *p = '\n'; } @@ -268,7 +257,7 @@ jb_err cgi_show_request(struct client_state *csp, * be sending to the server if this wasn't a CGI call */ - if (map(exports, "client-request", 1, html_encode(csp->iob->buf), 0)) + if (map(exports, "client-request", 1, html_encode(csp->client_iob->buf), 0)) { free_map(exports); return JB_ERR_MEMORY; @@ -285,11 +274,177 @@ 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, + "
\n" + " \n" + " \n" + " \n" + " \n" + "
", 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; + const char *toggled_tag; + const char *toggle_state; + const char *tag_expires; + time_t time_to_live; + char *client_tag_status; + char buf[1000]; + + assert(csp); + assert(rsp); + assert(parameters); + + if (NULL == (exports = default_exports(csp, "client-tags"))) + { + return JB_ERR_MEMORY; + } + assert(csp->client_address != NULL); + toggled_tag = lookup(parameters, "tag"); + if (*toggled_tag != '\0') + { + 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); + } + } + this_tag = csp->config->client_tags; + if (this_tag->name == NULL) + { + client_tag_status = strdup_or_die("

No tags available.

\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) + { + free_map(exports); + return JB_ERR_MEMORY; + } + this_tag = this_tag->next; + } + if (!err) err = string_append(&client_tag_status, "
Tag nameCurrent stateChange stateDescription
"); + 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 (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); +} +#endif /* def FEATURE_CLIENT_TAGS */ + + /********************************************************************* * * Function : cgi_send_banner * - * Description : CGI function that returns a banner. + * Description : CGI function that returns a banner. * * Parameters : * 1 : csp = Current client state (buffers, headers, etc...) @@ -304,7 +459,7 @@ jb_err cgi_show_request(struct client_state *csp, * equivalent). * * Returns : JB_ERR_OK on success - * JB_ERR_MEMORY on out-of-memory error. + * JB_ERR_MEMORY on out-of-memory error. * *********************************************************************/ jb_err cgi_send_banner(struct client_state *csp, @@ -317,7 +472,7 @@ jb_err cgi_send_banner(struct client_state *csp, * If type is auto, then determine the right thing * to do from the set-image-blocker action */ - if (imagetype == 'a') + if (imagetype == 'a') { /* * Default to pattern @@ -368,20 +523,16 @@ jb_err cgi_send_banner(struct client_state *csp, } #endif /* def FEATURE_IMAGE_BLOCKING */ } - + /* * Now imagetype is either the non-auto type we were called with, * or it was auto and has since been determined. In any case, we * can proceed to actually answering the request by sending a redirect * or an image as appropriate: */ - if (imagetype == 'r') + 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])) { @@ -390,7 +541,7 @@ jb_err cgi_send_banner(struct client_state *csp, } else { - if ((imagetype == 'b') || (imagetype == 't')) + if ((imagetype == 'b') || (imagetype == 't')) { rsp->body = bindup(image_blank_data, image_blank_length); rsp->content_length = image_blank_length; @@ -432,7 +583,7 @@ jb_err cgi_send_banner(struct client_state *csp, * CGI Parameters : None * * Returns : JB_ERR_OK on success - * JB_ERR_MEMORY on out-of-memory error. + * JB_ERR_MEMORY on out-of-memory error. * *********************************************************************/ jb_err cgi_transparent_image(struct client_state *csp, @@ -476,7 +627,7 @@ jb_err cgi_transparent_image(struct client_state *csp, * CGI Parameters : None * * Returns : JB_ERR_OK on success - * JB_ERR_MEMORY on out-of-memory error. + * JB_ERR_MEMORY on out-of-memory error. * *********************************************************************/ jb_err cgi_send_default_favicon(struct client_state *csp, @@ -537,7 +688,7 @@ jb_err cgi_send_default_favicon(struct client_state *csp, * CGI Parameters : None * * Returns : JB_ERR_OK on success - * JB_ERR_MEMORY on out-of-memory error. + * JB_ERR_MEMORY on out-of-memory error. * *********************************************************************/ jb_err cgi_send_error_favicon(struct client_state *csp, @@ -599,7 +750,7 @@ jb_err cgi_send_error_favicon(struct client_state *csp, * CGI Parameters : None * * Returns : JB_ERR_OK on success - * JB_ERR_MEMORY on out-of-memory error. + * JB_ERR_MEMORY on out-of-memory error. * *********************************************************************/ jb_err cgi_send_stylesheet(struct client_state *csp, @@ -607,7 +758,7 @@ jb_err cgi_send_stylesheet(struct client_state *csp, const struct map *parameters) { jb_err err; - + assert(csp); assert(rsp); @@ -653,7 +804,7 @@ jb_err cgi_send_stylesheet(struct client_state *csp, * CGI Parameters : None * * Returns : JB_ERR_OK on success - * JB_ERR_MEMORY on out-of-memory error. + * JB_ERR_MEMORY on out-of-memory error. * *********************************************************************/ jb_err cgi_send_url_info_osd(struct client_state *csp, @@ -700,8 +851,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[] = { @@ -739,7 +890,7 @@ static const char *get_content_type(const char *filename) * (relative to user-manual from config) * * Returns : JB_ERR_OK on success - * JB_ERR_MEMORY on out-of-memory error. + * JB_ERR_MEMORY on out-of-memory error. * *********************************************************************/ jb_err cgi_send_user_manual(struct client_state *csp, @@ -829,7 +980,7 @@ jb_err cgi_send_user_manual(struct client_state *csp, * CGI Parameters : none * * Returns : JB_ERR_OK on success - * JB_ERR_MEMORY on out-of-memory error. + * JB_ERR_MEMORY on out-of-memory error. * *********************************************************************/ jb_err cgi_show_version(struct client_state *csp, @@ -878,7 +1029,7 @@ jb_err cgi_show_version(struct client_state *csp, * Default is to show menu and other information. * * Returns : JB_ERR_OK on success - * JB_ERR_MEMORY on out-of-memory error. + * JB_ERR_MEMORY on out-of-memory error. * *********************************************************************/ jb_err cgi_show_status(struct client_state *csp, @@ -924,7 +1075,7 @@ jb_err cgi_show_status(struct client_state *csp, if (!err) err = map(exports, "options", 1, csp->config->proxy_args, 1); if (!err) err = show_defines(exports); - if (err) + if (err) { free_map(exports); return JB_ERR_MEMORY; @@ -966,10 +1117,10 @@ 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 */ - - /* + + /* * List all action files in use, together with view and edit links, * except for standard.action, which should only be viewable. (Not * enforced in the editor itself) @@ -988,7 +1139,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 @@ -1010,7 +1160,7 @@ jb_err cgi_show_status(struct client_state *csp, if (!err) err = string_append(&s, "\n"); } } - if (*s != '\0') + if (*s != '\0') { if (!err) err = map(exports, "actions-filenames", 1, s, 0); } @@ -1019,7 +1169,7 @@ jb_err cgi_show_status(struct client_state *csp, if (!err) err = map(exports, "actions-filenames", 1, "None specified", 1); } - /* + /* * List all re_filterfiles in use, together with view options. * FIXME: Shouldn't include hardwired HTML here, use line template instead! */ @@ -1036,7 +1186,7 @@ jb_err cgi_show_status(struct client_state *csp, if (!err) err = string_append(&s, "\n"); } } - if (*s != '\0') + if (*s != '\0') { if (!err) err = map(exports, "re-filter-filenames", 1, s, 0); } @@ -1067,6 +1217,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); @@ -1076,7 +1228,7 @@ jb_err cgi_show_status(struct client_state *csp, return template_fill_for_cgi(csp, "show-status", exports, rsp); } - + /********************************************************************* * * Function : cgi_show_url_info @@ -1097,7 +1249,7 @@ jb_err cgi_show_status(struct client_state *csp, * the template. * * Returns : JB_ERR_OK on success - * JB_ERR_MEMORY on out-of-memory error. + * JB_ERR_MEMORY on out-of-memory error. * *********************************************************************/ jb_err cgi_show_url_info(struct client_state *csp, @@ -1120,12 +1272,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); /* @@ -1144,7 +1291,7 @@ jb_err cgi_show_url_info(struct client_state *csp, { /* * Empty URL (just prefix). - * Make it totally empty so it's caught by the next if() + * Make it totally empty so it's caught by the next if () */ url_param[0] = '\0'; } @@ -1155,7 +1302,7 @@ jb_err cgi_show_url_info(struct client_state *csp, { /* * Empty URL (just prefix). - * Make it totally empty so it's caught by the next if() + * Make it totally empty so it's caught by the next if () */ url_param[0] = '\0'; } @@ -1168,7 +1315,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)) { @@ -1188,6 +1335,7 @@ 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; } @@ -1215,7 +1363,7 @@ jb_err cgi_show_url_info(struct client_state *csp, struct http_request url_to_query[1]; struct current_action_spec action[1]; int i; - + if (map(exports, "url", 1, html_encode(url_param), 0)) { free(url_param); @@ -1280,7 +1428,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++) { @@ -1411,6 +1559,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); } @@ -1503,7 +1654,7 @@ jb_err cgi_show_url_info(struct client_state *csp, * CGI Parameters : None * * Returns : JB_ERR_OK on success - * JB_ERR_MEMORY on out-of-memory error. + * JB_ERR_MEMORY on out-of-memory error. * *********************************************************************/ jb_err cgi_robots_txt(struct client_state *csp, @@ -1516,7 +1667,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" @@ -1524,10 +1675,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); @@ -1551,136 +1698,208 @@ jb_err cgi_robots_txt(struct client_state *csp, * 1 : exports = map to extend * * Returns : JB_ERR_OK on success - * JB_ERR_MEMORY on out-of-memory error. + * JB_ERR_MEMORY on out-of-memory error. * *********************************************************************/ 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_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_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_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 */ - + 1, +#else + 0, +#endif + }, + { + "FEATURE_IMAGE_DETECT_MSIE", #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 */ + 1, +#else + 0, +#endif + }, + { + "FEATURE_DYNAMIC_PCRE", +#ifdef FEATURE_DYNAMIC_PCRE + 1, +#else + 0, +#endif + } + }; + + for (i = 0; i < SZ(features); i++) + { + err = map_conditional(exports, features[i].name, features[i].is_available); + if (err) + { + break; + } + } return err; + } @@ -1697,7 +1916,7 @@ static jb_err show_defines(struct map *exports) *********************************************************************/ static char *show_rcs(void) { - char *result = strdup(""); + char *result = strdup_or_die(""); char buf[BUFFER_SIZE]; /* Instead of including *all* dot h's in the project (thus creating a @@ -1801,7 +2020,7 @@ static char *show_rcs(void) * Default is to show menu and other information. * * Returns : JB_ERR_OK on success - * JB_ERR_MEMORY on out-of-memory error. + * JB_ERR_MEMORY on out-of-memory error. * *********************************************************************/ static jb_err cgi_show_file(struct client_state *csp, @@ -1858,8 +2077,8 @@ static jb_err cgi_show_file(struct client_state *csp, return JB_ERR_MEMORY; } - if ( map(exports, "file-description", 1, file_description, 1) - || map(exports, "filepath", 1, html_encode(filename), 0) ) + if (map(exports, "file-description", 1, file_description, 1) + || map(exports, "filepath", 1, html_encode(filename), 0)) { free_map(exports); return JB_ERR_MEMORY; @@ -1879,6 +2098,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; } @@ -1895,7 +2115,7 @@ static jb_err cgi_show_file(struct client_state *csp, return JB_ERR_CGI_PARAMS; } - + /********************************************************************* * * Function : load_file @@ -1950,19 +2170,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; }