X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=cgisimple.c;h=67d27650ba492018d659406fa6815e606a829dc3;hp=641379606a11c7a097af942a44b05e0f5bc6682b;hb=2548b4e9ade78bd5bf52baacd1bdc91a0bdbcdbc;hpb=1751eb2fdcb7ea86547b6e26a83228325d6e4f0a diff --git a/cgisimple.c b/cgisimple.c index 64137960..67d27650 100644 --- a/cgisimple.c +++ b/cgisimple.c @@ -1,4 +1,4 @@ -const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.9 2001/11/30 23:09:15 jongfoster Exp $"; +const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.16 2002/03/07 03:48:38 oes Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/cgisimple.c,v $ @@ -36,6 +36,34 @@ const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.9 2001/11/30 23:09:15 jongfos * * Revisions : * $Log: cgisimple.c,v $ + * Revision 1.16 2002/03/07 03:48:38 oes + * - Changed built-in images from GIF to PNG + * (with regard to Unisys patent issue) + * - Added a 4x4 pattern PNG which is less intrusive + * than the logo but also clearly marks the deleted banners + * + * Revision 1.15 2002/03/06 22:54:35 jongfoster + * Automated function-comment nitpicking. + * + * Revision 1.14 2002/03/02 04:14:50 david__schmidt + * Clean up a little CRLF unpleasantness that suddenly appeared + * + * Revision 1.13 2002/02/21 00:10:37 jongfoster + * Adding send-banner?type=auto option + * + * Revision 1.12 2002/01/23 01:03:32 jongfoster + * Fixing gcc [CygWin] compiler warnings + * + * Revision 1.11 2002/01/23 00:01:04 jongfoster + * Adding cgi_transparent_gif() for http://i.j.b/t + * Adding missing html_encode() to many CGI functions. + * Adding urlmatch.[ch] to http://i.j.b/show-version + * + * Revision 1.10 2002/01/17 21:10:37 jongfoster + * Changes to cgi_show_url_info to use new matching code from urlmatch.c. + * Also fixing a problem in the same function with improperly quoted URLs + * in output HTML, and adding code to handle https:// URLs correctly. + * * Revision 1.9 2001/11/30 23:09:15 jongfoster * Now reports on FEATURE_CGI_EDIT_ACTIONS * Removing FEATURE_DENY_GZIP from template @@ -119,9 +147,9 @@ static jb_err show_defines(struct map *exports); * Lists menu of available unhidden CGIs. * * Parameters : - * 1 : csp = Current client state (buffers, headers, etc...) - * 2 : rsp = http_response data structure for output - * 3 : parameters = map of cgi 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 * @@ -136,7 +164,6 @@ jb_err cgi_default(struct client_state *csp, struct http_response *rsp, const struct map *parameters) { - char *p; char *tmp; struct map *exports; @@ -152,15 +179,9 @@ jb_err cgi_default(struct client_state *csp, /* If there were other parameters, export a dump as "cgi-parameters" */ if (parameters->first) { - if (NULL == (p = dump_map(parameters))) - { - free_map(exports); - return JB_ERR_MEMORY; - } tmp = strdup("

What made you think this cgi takes parameters?\n" "Anyway, here they are, in case you're interested:

\n"); - string_append(&tmp, p); - free(p); + string_join(&tmp, dump_map(parameters)); if (tmp == NULL) { free_map(exports); @@ -193,9 +214,9 @@ jb_err cgi_default(struct client_state *csp, * given. * * Parameters : - * 1 : csp = Current client state (buffers, headers, etc...) - * 2 : rsp = http_response data structure for output - * 3 : parameters = map of cgi 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 * @@ -237,9 +258,9 @@ jb_err cgi_error_404(struct client_state *csp, * made of it. * * Parameters : - * 1 : csp = Current client state (buffers, headers, etc...) - * 2 : rsp = http_response data structure for output - * 3 : parameters = map of cgi 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 * @@ -276,18 +297,19 @@ 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, csp->iob->buf, 1)) + if (map(exports, "client-request", 1, html_encode(csp->iob->buf), 0)) { free_map(exports); return JB_ERR_MEMORY; } - if (map(exports, "processed-request", 1, sed(client_patterns, add_client_headers, csp), 0)) + if (map(exports, "processed-request", 1, html_encode_and_free_original( + sed(client_patterns, add_client_headers, csp)), 0)) { free_map(exports); return JB_ERR_MEMORY; } - + return template_fill_for_cgi(csp, "show-request", exports, rsp); } @@ -299,13 +321,15 @@ jb_err cgi_show_request(struct client_state *csp, * Description : CGI function that returns a banner. * * Parameters : - * 1 : csp = Current client state (buffers, headers, etc...) - * 2 : rsp = http_response data structure for output - * 3 : parameters = map of cgi 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 : - * type : Selects the type of banner between "trans" and "jb". - * Defaults to "jb" if absent or != "trans". + * type : Selects the type of banner between "trans", "logo", + * and "auto". Defaults to "logo" if absent or invalid. + * "auto" means to select as if we were image-blocking. + * (Only the first character really counts). * * Returns : JB_ERR_OK on success * JB_ERR_MEMORY on out-of-memory error. @@ -315,15 +339,46 @@ jb_err cgi_send_banner(struct client_state *csp, struct http_response *rsp, const struct map *parameters) { - if (strcmp(lookup(parameters, "type"), "trans")) + char imagetype = lookup(parameters, "type")[0]; + + if (imagetype == 'a') /* auto */ + { + /* Default to logo */ + imagetype = 'l'; +#ifdef FEATURE_IMAGE_BLOCKING + if ((csp->action->flags & ACTION_IMAGE_BLOCKER) != 0) + { + /* determine HOW images should be blocked */ + const char * p = csp->action->string[ACTION_STRING_IMAGE_BLOCKER]; + + /* and handle accordingly: */ + if ((p != NULL) && (0 == strcmpic(p, "blank"))) + { + imagetype = 'b'; + } + else if ((p != NULL) && (0 == strcmpic(p, "pattern"))) + { + imagetype = 'p'; + } + } +#endif /* def FEATURE_IMAGE_BLOCKING */ + } + + if ((imagetype == 'b') || (imagetype == 't')) /* blank / transparent */ { - rsp->body = bindup(image_junkbuster_gif_data, image_junkbuster_gif_length); - rsp->content_length = image_junkbuster_gif_length; + rsp->body = bindup(image_blank_data, image_blank_length); + rsp->content_length = image_blank_length; + } - else + else if (imagetype == 'p') /* pattern */ + { + rsp->body = bindup(image_pattern_data, image_pattern_length); + rsp->content_length = image_pattern_length; + } + else /* logo */ { - rsp->body = bindup(image_blank_gif_data, image_blank_gif_length); - rsp->content_length = image_blank_gif_length; + rsp->body = bindup(image_logo_data, image_logo_length); + rsp->content_length = image_logo_length; } if (rsp->body == NULL) @@ -331,7 +386,48 @@ jb_err cgi_send_banner(struct client_state *csp, return JB_ERR_MEMORY; } - if (enlist(rsp->headers, "Content-Type: image/gif")) + if (enlist(rsp->headers, "Content-Type: " BUILTIN_IMAGE_MIMETYPE)) + { + return JB_ERR_MEMORY; + } + + rsp->is_static = 1; + + return JB_ERR_OK; + +} + + +/********************************************************************* + * + * Function : cgi_transparent_image + * + * Description : CGI function that sends a 1x1 transparent image. + * + * 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_transparent_image(struct client_state *csp, + struct http_response *rsp, + const struct map *parameters) +{ + rsp->body = bindup(image_blank_data, image_blank_length); + rsp->content_length = image_blank_length; + + if (rsp->body == NULL) + { + return JB_ERR_MEMORY; + } + + if (enlist(rsp->headers, "Content-Type: " BUILTIN_IMAGE_MIMETYPE)) { return JB_ERR_MEMORY; } @@ -351,9 +447,9 @@ jb_err cgi_send_banner(struct client_state *csp, * file versions of IJB. * * Parameters : - * 1 : csp = Current client state (buffers, headers, etc...) - * 2 : rsp = http_response data structure for output - * 3 : parameters = map of cgi 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 * @@ -394,9 +490,9 @@ jb_err cgi_show_version(struct client_state *csp, * current status of IJB. * * Parameters : - * 1 : csp = Current client state (buffers, headers, etc...) - * 2 : rsp = http_response data structure for output - * 3 : parameters = map of cgi 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 : * file : Which file to show. Only first letter is checked, @@ -419,7 +515,6 @@ jb_err cgi_show_status(struct client_state *csp, FILE * fp; char buf[BUFFER_SIZE]; - char * p; const char * filename = NULL; char * file_description = NULL; #ifdef FEATURE_STATISTICS @@ -491,13 +586,8 @@ jb_err cgi_show_status(struct client_state *csp, s = strdup(""); while ((s != NULL) && fgets(buf, sizeof(buf), fp)) { - p = html_encode(buf); - if (p) - { - string_append(&s, p); - freez(p); - string_append(&s, "
"); - } + string_join (&s, html_encode(buf)); + string_append(&s, "
"); } fclose(fp); @@ -511,16 +601,16 @@ jb_err cgi_show_status(struct client_state *csp, return template_fill_for_cgi(csp, "show-status-file", exports, rsp); } - if (map(exports, "redirect-url", 1, REDIRECT_URL, 1)) + if (map(exports, "redirect-url", 1, html_encode(REDIRECT_URL), 0)) { free_map(exports); return JB_ERR_MEMORY; } s = strdup(""); - for (i=0; i < Argc; i++) + for (i = 0; (s != NULL) && (i < Argc); i++) { - string_append(&s, Argv[i]); + string_join (&s, html_encode(Argv[i])); string_append(&s, " "); } if (map(exports, "invocation", 1, s, 0)) @@ -573,7 +663,7 @@ jb_err cgi_show_status(struct client_state *csp, if (csp->actions_list) { - if (!err) err = map(exports, "actions-filename", 1, csp->actions_list->filename, 1); + if (!err) err = map(exports, "actions-filename", 1, html_encode(csp->actions_list->filename), 0); } else { @@ -582,7 +672,7 @@ jb_err cgi_show_status(struct client_state *csp, if (csp->rlist) { - if (!err) err = map(exports, "re-filter-filename", 1, csp->rlist->filename, 1); + if (!err) err = map(exports, "re-filter-filename", 1, html_encode(csp->rlist->filename), 0); } else { @@ -592,7 +682,7 @@ jb_err cgi_show_status(struct client_state *csp, #ifdef FEATURE_TRUST if (csp->tlist) { - if (!err) err = map(exports, "trust-filename", 1, csp->tlist->filename, 1); + if (!err) err = map(exports, "trust-filename", 1, html_encode(csp->tlist->filename), 0); } else { @@ -621,9 +711,9 @@ jb_err cgi_show_status(struct client_state *csp, * matches starting from the defaults have lead to that. * * Parameters : - * 1 : csp = Current client state (buffers, headers, etc...) - * 2 : rsp = http_response data structure for output - * 3 : parameters = map of cgi 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 : * url : The url whose actions are to be determined. @@ -640,7 +730,6 @@ jb_err cgi_show_url_info(struct client_state *csp, const struct map *parameters) { char *url_param; - char *host = NULL; struct map *exports; assert(csp); @@ -746,7 +835,8 @@ jb_err cgi_show_url_info(struct client_state *csp, init_current_action(action); - if (map(exports, "default", 1, current_action_to_text(action), 0)) + if (map(exports, "default", 1, html_encode_and_free_original( + current_action_to_text(action)), 0)) { free_current_action(action); free(url_param); @@ -814,27 +904,25 @@ jb_err cgi_show_url_info(struct client_state *csp, matches = strdup(""); - for (b = b->next; NULL != b; b = b->next) + for (b = b->next; (b != NULL) && (matches != NULL); b = b->next) { if (url_match(b->url, url_to_query)) { - s = actions_to_text(b->action); - if (s == NULL) + string_append(&matches, "{"); + string_join (&matches, html_encode_and_free_original( + actions_to_text(b->action))); + string_append(&matches, " }
\n"); + string_join (&matches, html_encode(b->url->spec)); + string_append(&matches, "
\n
\n"); + + if (merge_current_action(action, b->action)) { + freez(matches); free_http_request(url_to_query); - free(url_param); free_current_action(action); free_map(exports); return JB_ERR_MEMORY; } - string_append(&matches, "{"); - string_append(&matches, s); - string_append(&matches, " }
\n"); - string_append(&matches, b->url->spec); - string_append(&matches, "
\n
\n"); - free(s); - - merge_current_action(action, b->action); /* FIXME: Add error checking */ hits++; } } @@ -860,7 +948,7 @@ jb_err cgi_show_url_info(struct client_state *csp, return JB_ERR_MEMORY; } - s = current_action_to_text(action); + s = html_encode_and_free_original(current_action_to_text(action)); free_current_action(action); @@ -882,9 +970,9 @@ jb_err cgi_show_url_info(struct client_state *csp, * Description : CGI function to return "/robots.txt". * * Parameters : - * 1 : csp = Current client state (buffers, headers, etc...) - * 2 : rsp = http_response data structure for output - * 3 : parameters = map of cgi 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 * @@ -931,7 +1019,7 @@ jb_err cgi_robots_txt(struct client_state *csp, * used when building * * Parameters : - * 1 : exports = map to extend + * 1 : exports = map to extend * * Returns : JB_ERR_OK on success * JB_ERR_MEMORY on out-of-memory error. @@ -989,6 +1077,12 @@ static jb_err show_defines(struct map *exports) if (!err) err = map_conditional(exports, "FEATURE_KILL_POPUPS", 0); #endif /* ndef FEATURE_KILL_POPUPS */ +#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 */ + #ifdef FEATURE_PTHREAD if (!err) err = map_conditional(exports, "FEATURE_PTHREAD", 1); #else /* ifndef FEATURE_PTHREAD */ @@ -1122,6 +1216,8 @@ static char *show_rcs(void) 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)