X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=cgisimple.c;h=46bb33ec5ee5e9d9f97435ccaaa4ec8eff2fcf40;hb=4d4e3eaeaacbd0f7319056dd45883b97e5c2aff7;hp=21a9872a542db94fbfa2d887d856adc4c4ff69fa;hpb=9e7f4fd31d803a5d913205fa37e8de941c0f75ea;p=privoxy.git diff --git a/cgisimple.c b/cgisimple.c index 21a9872a..46bb33ec 100644 --- a/cgisimple.c +++ b/cgisimple.c @@ -1,4 +1,4 @@ -const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.29 2002/04/10 13:38:35 oes Exp $"; +const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.40 2006/09/09 13:05:33 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/cgisimple.c,v $ @@ -36,6 +36,91 @@ const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.29 2002/04/10 13:38:35 oes Ex * * Revisions : * $Log: cgisimple.c,v $ + * Revision 1.40 2006/09/09 13:05:33 fabiankeil + * Modified cgi_send_user_manual to serve binary + * content without destroying it first. Should also be + * faster now. Added ".jpg" check for Content-Type guessing. + * + * Revision 1.39 2006/09/08 09:49:23 fabiankeil + * Deliver documents in the user-manual directory + * with "Content-Type text/css" if their filename + * ends with ".css". + * + * Revision 1.38 2006/09/06 18:45:03 fabiankeil + * Incorporate modified version of Roland Rosenfeld's patch to + * optionally access the user-manual via Privoxy. Closes patch 679075. + * + * Formatting changed to Privoxy style, added call to + * cgi_error_no_template if the requested file doesn't + * exist and modified check whether or not Privoxy itself + * should serve the manual. Should work cross-platform now. + * + * Revision 1.37 2006/07/18 14:48:45 david__schmidt + * Reorganizing the repository: swapping out what was HEAD (the old 3.1 branch) + * with what was really the latest development (the v_3_0_branch branch) + * + * Revision 1.35.2.7 2006/01/29 23:10:56 david__schmidt + * Multiple filter file support + * + * Revision 1.35.2.6 2005/07/04 03:13:43 david__schmidt + * Undo some damaging memory leak patches + * + * Revision 1.35.2.5 2005/05/07 21:50:55 david__schmidt + * A few memory leaks plugged (mostly on error paths) + * + * Revision 1.35.2.4 2005/04/04 02:21:24 david__schmidt + * Another instance of: + * Don't show "Edit" buttons #ifndef FEATURE_CGI_EDIT_ACTIONS + * Thanks to Magnus Holmgren for the patch + * + * Revision 1.35.2.3 2003/12/17 16:34:15 oes + * - Prevent line wrap beween "View/Edit" link buttons on status page + * - Some (mostly irrelevant) fixes for Out-of-mem-case handling + * + * Revision 1.35.2.2 2003/04/03 13:48:28 oes + * Don't show "Edit" buttons #ifndef FEATURE_CGI_EDIT_ACTIONS + * + * Revision 1.35.2.1 2002/07/04 15:02:38 oes + * Added ability to send redirects to send-banner CGI, so that it can completely mimic the image blocking action if called with type=auto + * + * Revision 1.35.2.1 2002/07/01 17:32:04 morcego + * Applying patch from Andreas as provided by Hal on the list. + * Message-ID: <20020701121218.V1606@feenix.burgiss.net> + * + * Revision 1.35 2002/05/12 21:44:44 jongfoster + * Adding amiga.[ch] revision information, if on an amiga. + * + * Revision 1.34 2002/04/30 12:06:12 oes + * Deleted unused code from default_cgi + * + * Revision 1.33 2002/04/30 11:14:52 oes + * Made csp the first parameter in *action_to_html + * + * Revision 1.32 2002/04/26 18:29:13 jongfoster + * Fixing this Visual C++ warning: + * cgisimple.c(775) : warning C4018: '<' : signed/unsigned mismatch + * + * Revision 1.31 2002/04/26 12:54:36 oes + * - Kill obsolete REDIRECT_URL code + * - Error handling fixes + * - Style sheet related HTML snipplet changes + * - cgi_show_url_info: + * - Matches now in table, actions on single lines, + * linked to help + * - standard.action suppressed + * - Buttons to View and Edit AFs + * + * Revision 1.30 2002/04/24 02:18:08 oes + * - show-status is now the starting point for editing + * the actions files, generate list of all AFs with buttons + * for viewing and editing, new look for file list (Jon: + * buttons now aligned ;-P ), view mode now supports multiple + * AFs, name changes, no view links for unspecified files, + * no edit link for standard.action. + * + * - Jon's multiple AF patch: cgi_show_url_info now uses all + * AFs and marks the output accordingly + * * Revision 1.29 2002/04/10 13:38:35 oes * load_template signature changed * @@ -188,8 +273,9 @@ static jb_err show_defines(struct map *exports); * * Function : cgi_default * - * Description : CGI function that is called if no action was given. - * Lists menu of available unhidden CGIs. + * 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...) @@ -200,57 +286,26 @@ static jb_err show_defines(struct map *exports); * * Returns : JB_ERR_OK on success * JB_ERR_MEMORY on out-of-memory - * (Problems other than out-of-memory should be - * handled by this routine - it should set the - * rsp appropriately and return "success") * *********************************************************************/ jb_err cgi_default(struct client_state *csp, struct http_response *rsp, const struct map *parameters) { - char *tmp; struct map *exports; assert(csp); assert(rsp); - assert(parameters); if (NULL == (exports = default_exports(csp, ""))) { return JB_ERR_MEMORY; } - /* If there were other parameters, export a dump as "cgi-parameters" */ - if (parameters->first) - { - tmp = strdup("
What made you think this cgi takes parameters?\n" - "Anyway, here they are, in case you're interested:
\n"); - string_join(&tmp, dump_map(parameters)); - if (tmp == NULL) - { - free_map(exports); - return JB_ERR_MEMORY; - } - if (map(exports, "cgi-parameters", 1, tmp, 0)) - { - return JB_ERR_MEMORY; - } - } - else - { - if (map(exports, "cgi-parameters", 1, "", 1)) - { - return JB_ERR_MEMORY; - } - } - return template_fill_for_cgi(csp, "default", exports, rsp); } - - /********************************************************************* * * Function : cgi_error_404 @@ -416,7 +471,8 @@ jb_err cgi_show_request(struct client_state *csp, * 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). + * (Only the first character really counts; b and t are + * equivalent). * * Returns : JB_ERR_OK on success * JB_ERR_MEMORY on out-of-memory error. @@ -428,20 +484,24 @@ jb_err cgi_send_banner(struct client_state *csp, { char imagetype = lookup(parameters, "type")[0]; - if (imagetype == 'a') /* auto */ + /* + * If type is auto, then determine the right thing + * to do from the set-image-blocker action + */ + if (imagetype == 'a') { - /* Default to pattern */ + /* + * Default to pattern + */ imagetype = 'p'; + #ifdef FEATURE_IMAGE_BLOCKING if ((csp->action->flags & ACTION_IMAGE_BLOCKER) != 0) { static const char prefix1[] = CGI_PREFIX "send-banner?type="; static const char prefix2[] = "http://" CGI_SITE_1_HOST "/send-banner?type="; + const char *p = csp->action->string[ACTION_STRING_IMAGE_BLOCKER]; - /* determine HOW images should be blocked */ - const char * p = csp->action->string[ACTION_STRING_IMAGE_BLOCKER]; - - /* and handle accordingly: */ if (p == NULL) { /* Use default - nothing to do here. */ @@ -454,6 +514,11 @@ jb_err cgi_send_banner(struct client_state *csp, { imagetype = 'p'; } + + /* + * If the action is to call this CGI, determine + * the argument: + */ else if (0 == strncmpic(p, prefix1, sizeof(prefix1) - 1)) { imagetype = p[sizeof(prefix1) - 1]; @@ -462,34 +527,63 @@ jb_err cgi_send_banner(struct client_state *csp, { imagetype = p[sizeof(prefix2) - 1]; } + + /* + * Everything else must (should) be a URL to + * redirect to. + */ + else + { + imagetype = 'r'; + } } #endif /* def FEATURE_IMAGE_BLOCKING */ } - if ((imagetype == 'b') || (imagetype == 't')) /* blank / transparent */ + /* + * 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') { - rsp->body = bindup(image_blank_data, image_blank_length); - rsp->content_length = image_blank_length; - + rsp->status = strdup("302 Local Redirect from Privoxy"); + if (rsp->status == NULL) + { + return JB_ERR_MEMORY; + } + if (enlist_unique_header(rsp->headers, "Location", + csp->action->string[ACTION_STRING_IMAGE_BLOCKER])) + { + return JB_ERR_MEMORY; + } } - else /* pattern */ + else { - rsp->body = bindup(image_pattern_data, image_pattern_length); - rsp->content_length = image_pattern_length; - } + if ((imagetype == 'b') || (imagetype == 't')) + { + rsp->body = bindup(image_blank_data, image_blank_length); + rsp->content_length = image_blank_length; + } + else + { + rsp->body = bindup(image_pattern_data, image_pattern_length); + rsp->content_length = image_pattern_length; + } - if (rsp->body == NULL) - { - return JB_ERR_MEMORY; - } + if (rsp->body == NULL) + { + return JB_ERR_MEMORY; + } + if (enlist(rsp->headers, "Content-Type: " BUILTIN_IMAGE_MIMETYPE)) + { + return JB_ERR_MEMORY; + } - if (enlist(rsp->headers, "Content-Type: " BUILTIN_IMAGE_MIMETYPE)) - { - return JB_ERR_MEMORY; + rsp->is_static = 1; } - rsp->is_static = 1; - return JB_ERR_OK; } @@ -585,6 +679,122 @@ jb_err cgi_send_stylesheet(struct client_state *csp, return JB_ERR_OK; } +/********************************************************************* + * + * Function : cgi_send_user_manual + * + * Description : CGI function that sends a file in the user + * manual directory. + * + * 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=name.html, the name of the HTML file + * (relative to user-manual from config) + * + * Returns : JB_ERR_OK on success + * JB_ERR_MEMORY on out-of-memory error. + * + *********************************************************************/ +jb_err cgi_send_user_manual(struct client_state *csp, + struct http_response *rsp, + const struct map *parameters) +{ + const char * filename; + char *full_path; + FILE *fp; + jb_err err = JB_ERR_OK; + size_t length; + + assert(csp); + assert(rsp); + assert(parameters); + + if (!parameters->first) + { + /* requested http://p.p/user-manual (without trailing slash) */ + return cgi_redirect(rsp, CGI_PREFIX "user-manual/"); + } + + get_string_param(parameters, "file", &filename); + /* Check paramter for hack attempts */ + if (filename && strchr(filename, '/')) + { + return JB_ERR_CGI_PARAMS; + } + if (filename && strstr(filename, "..")) + { + return JB_ERR_CGI_PARAMS; + } + + full_path = make_path(csp->config->usermanual, filename ? filename : "index.html"); + if (full_path == NULL) + { + return JB_ERR_MEMORY; + } + + /* Open user-manual file */ + if (NULL == (fp = fopen(full_path, "r"))) + { + log_error(LOG_LEVEL_ERROR, "Cannot open user-manual file %s: %E", full_path); + err = cgi_error_no_template(csp, rsp, full_path); + free(full_path); + return err; + } + + /* Get file length */ + fseek(fp, 0, SEEK_END); + length = ftell(fp); + fseek(fp, 0, SEEK_SET); + + /* Allocate memory and load the file directly into the body */ + rsp->body = (char *)malloc(length+1); + if (!rsp->body) + { + fclose(fp); + free(full_path); + return JB_ERR_MEMORY; + } + if (!fread(rsp->body, length, 1, fp)) + { + /* + * Why should this happen? If it does, we just log + * it and serve what we got, most likely padded with garbage. + */ + log_error(LOG_LEVEL_ERROR, "Couldn't completely read user-manual file %s.", full_path); + } + fclose(fp); + free(full_path); + + /* Privoxy only gets it right for non-binary content. */ + rsp->content_length = (int)length; + + /* Guess correct Content-Type based on the filename's ending */ + if (filename) + { + length = strlen(filename); + } + else + { + length = 0; + } + if((length>=4) && !strcmp(&filename[length-4], ".css")) + { + err = enlist(rsp->headers, "Content-Type: text/css"); + } + else if((length>=4) && !strcmp(&filename[length-4], ".jpg")) + { + err = enlist(rsp->headers, "Content-Type: image/jpeg"); + } + else + { + err = enlist(rsp->headers, "Content-Type: text/html"); + } + + return err; +} /********************************************************************* @@ -660,6 +870,7 @@ jb_err cgi_show_status(struct client_state *csp, { char *s = NULL; unsigned i; + int j; FILE * fp; char buf[BUFFER_SIZE]; @@ -672,7 +883,7 @@ jb_err cgi_show_status(struct client_state *csp, #endif /* ndef FEATURE_STATISTICS */ struct file_list * fl; struct url_actions * b; - jb_err err; + jb_err err = JB_ERR_OK; struct map *exports; @@ -688,7 +899,7 @@ jb_err cgi_show_status(struct client_state *csp, switch (*(lookup(parameters, "file"))) { case 'a': - if (!get_number_param(csp, parameters, "index", &i) && i < MAX_ACTION_FILES && csp->actions_list[i]) + if (!get_number_param(csp, parameters, "index", &i) && i < MAX_AF_FILES && csp->actions_list[i]) { filename = csp->actions_list[i]->filename; file_description = "Actions File"; @@ -696,9 +907,9 @@ jb_err cgi_show_status(struct client_state *csp, break; case 'f': - if (csp->rlist) + if (!get_number_param(csp, parameters, "index", &i) && i < MAX_AF_FILES && csp->rlist[i]) { - filename = csp->rlist->filename; + filename = csp->rlist[i]->filename; file_description = "Filter File"; } break; @@ -750,27 +961,23 @@ 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, html_encode(REDIRECT_URL), 0)) - { - free_map(exports); - return JB_ERR_MEMORY; - } - s = strdup(""); - for (i = 0; (s != NULL) && (i < Argc); i++) + for (j = 0; (s != NULL) && (j < Argc); j++) { - string_join (&s, html_encode(Argv[i])); - string_append(&s, " "); + if (!err) err = string_join (&s, html_encode(Argv[j])); + if (!err) err = string_append(&s, " "); } - if (map(exports, "invocation", 1, s, 0)) + if (!err) err = map(exports, "invocation", 1, s, 0); + + if (!err) err = map(exports, "options", 1, csp->config->proxy_args, 1); + if (!err) err = show_defines(exports); + + if (err) { free_map(exports); return JB_ERR_MEMORY; } - err = map(exports, "options", 1, csp->config->proxy_args, 1); - if (!err) err = show_defines(exports); - #ifdef FEATURE_STATISTICS local_urls_read = urls_read; local_urls_rejected = urls_rejected; @@ -817,20 +1024,22 @@ jb_err cgi_show_status(struct client_state *csp, * FIXME: Shouldn't include hardwired HTML here, use line template instead! */ s = strdup(""); - for (i = 0; i < MAX_ACTION_FILES; i++) + for (i = 0; i < MAX_AF_FILES; i++) { if (((fl = csp->actions_list[i]) != NULL) && ((b = fl->f) != NULL)) { if (!err) err = string_append(&s, "In file: ");
string_join (&matches, html_encode(csp->config->actions_file_short[i]));
- string_append(&matches, "\">File ");
+ snprintf(buf, 150, ".action ", i);
+ string_append(&matches, buf);
+ string_append(&matches, "View");
+#ifdef FEATURE_CGI_EDIT_ACTIONS
+ string_append(&matches, " config->actions_file_short[i]));
- string_append(&matches, " --- \n \n"); + string_append(&matches, "\">Edit"); +#endif + string_append(&matches, " | \n");
hits = 0;
b = b->next;
@@ -1088,12 +1325,11 @@ jb_err cgi_show_url_info(struct client_state *csp,
{
if (url_match(b->url, url_to_query))
{
- string_append(&matches, "{");
- string_join (&matches, html_encode_and_free_original(
- actions_to_text(b->action)));
+ string_append(&matches, "
---|
{");
+ string_join (&matches, actions_to_html(csp, b->action));
string_append(&matches, " } \n ");
string_join (&matches, html_encode(b->url->spec));
- string_append(&matches, " \n \n"); + string_append(&matches, " |
(no matches in this file) |