X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=cgisimple.c;h=733c350095e644ad3e03d4400b5f7943405d4cc4;hb=472006f94cd350ff6e734c156cbbb93dab86d864;hp=641379606a11c7a097af942a44b05e0f5bc6682b;hpb=1751eb2fdcb7ea86547b6e26a83228325d6e4f0a;p=privoxy.git diff --git a/cgisimple.c b/cgisimple.c index 64137960..733c3500 100644 --- a/cgisimple.c +++ b/cgisimple.c @@ -1,16 +1,16 @@ -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.22 2002/03/24 16:18:15 jongfoster Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/cgisimple.c,v $ * - * Purpose : Simple CGIs to get information about JunkBuster's + * Purpose : Simple CGIs to get information about Privoxy's * status. * * Functions declared include: * * * Copyright : Written by and Copyright (C) 2001 the SourceForge - * IJBSWA team. http://ijbswa.sourceforge.net + * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -36,6 +36,56 @@ const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.9 2001/11/30 23:09:15 jongfos * * Revisions : * $Log: cgisimple.c,v $ + * Revision 1.22 2002/03/24 16:18:15 jongfoster + * Removing old logo + * + * Revision 1.21 2002/03/24 15:23:33 jongfoster + * Name changes + * + * Revision 1.20 2002/03/24 13:25:43 swa + * name change related issues + * + * Revision 1.19 2002/03/16 23:54:06 jongfoster + * Adding graceful termination feature, to help look for memory leaks. + * If you enable this (which, by design, has to be done by hand + * editing config.h) and then go to http://i.j.b/die, then the program + * will exit cleanly after the *next* request. It should free all the + * memory that was used. + * + * Revision 1.18 2002/03/12 01:44:49 oes + * Changed default for "blocked" image from jb logo to checkboard pattern + * + * Revision 1.17 2002/03/08 16:43:18 oes + * Added choice beween GIF and PNG built-in images + * + * 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 +169,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 +186,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 +201,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 +236,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 * @@ -218,7 +261,7 @@ jb_err cgi_error_404(struct client_state *csp, return JB_ERR_MEMORY; } - rsp->status = strdup("404 JunkBuster configuration page not found"); + rsp->status = strdup("404 Privoxy configuration page not found"); if (rsp->status == NULL) { free_map(exports); @@ -229,6 +272,48 @@ jb_err cgi_error_404(struct client_state *csp, } +#ifdef FEATURE_GRACEFUL_TERMINATION +/********************************************************************* + * + * Function : cgi_die + * + * Description : CGI function to shut down Privoxy. + * 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 + * 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_die (struct client_state *csp, + struct http_response *rsp, + const struct map *parameters) +{ + assert(csp); + assert(rsp); + assert(parameters); + + /* quit */ + g_terminate = 1; + + /* + * I don't really care what gets sent back to the browser. + * Take the easy option - "out of memory" page. + */ + + return JB_ERR_MEMORY; +} +#endif /* def FEATURE_GRACEFUL_TERMINATION */ + + /********************************************************************* * * Function : cgi_show_request @@ -237,9 +322,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 +361,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 +385,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 +403,41 @@ 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 */ { - rsp->body = bindup(image_junkbuster_gif_data, image_junkbuster_gif_length); - rsp->content_length = image_junkbuster_gif_length; + /* Default to pattern */ + imagetype = 'p'; +#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 */ } - else + + if ((imagetype == 'b') || (imagetype == 't')) /* blank / transparent */ { - rsp->body = bindup(image_blank_gif_data, image_blank_gif_length); - rsp->content_length = image_blank_gif_length; + rsp->body = bindup(image_blank_data, image_blank_length); + rsp->content_length = image_blank_length; + + } + else /* pattern */ + { + rsp->body = bindup(image_pattern_data, image_pattern_length); + rsp->content_length = image_pattern_length; } if (rsp->body == NULL) @@ -331,7 +445,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; } @@ -348,12 +503,12 @@ jb_err cgi_send_banner(struct client_state *csp, * Function : cgi_show_version * * Description : CGI function that returns a a web page describing the - * file versions of IJB. + * file versions of Privoxy. * * 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 * @@ -391,12 +546,12 @@ jb_err cgi_show_version(struct client_state *csp, * Function : cgi_show_status * * Description : CGI function that returns a a web page describing the - * current status of IJB. + * current status of Privoxy. * * 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 +574,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 +645,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 (&matches, html_encode(b->url->spec));
+ string_append(&matches, "
");
- string_append(&matches, b->url->spec);
- string_append(&matches, "