X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=cgisimple.c;h=1ed27e9834d896d475d14db1f3573729aec606e9;hb=bcc8382b7c15b3e1b400a34c89ee5f84e3f8f38c;hp=64fd90dce8be855b20d331a1ae73f4377f957053;hpb=4dc78efef707ae654ed69a373c609727bc0ac8b9;p=privoxy.git diff --git a/cgisimple.c b/cgisimple.c index 64fd90dc..1ed27e98 100644 --- a/cgisimple.c +++ b/cgisimple.c @@ -1,4 +1,4 @@ -const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.50 2007/01/23 15:51:17 fabiankeil Exp $"; +const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.56 2007/05/21 10:50:35 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/cgisimple.c,v $ @@ -36,6 +36,34 @@ const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.50 2007/01/23 15:51:17 fabian * * Revisions : * $Log: cgisimple.c,v $ + * Revision 1.56 2007/05/21 10:50:35 fabiankeil + * - Use strlcpy() instead of strcpy(). + * - Stop treating actions files special. Expect a complete file name + * (with or without path) like it's done for the rest of the files. + * Closes FR#588084. + * - Don't rerun sed() in cgi_show_request(). + * + * Revision 1.55 2007/04/13 13:36:46 fabiankeil + * Reference action files in CGI URLs by id instead + * of using the first part of the file name. + * Fixes BR 1694250 and BR 1590556. + * + * Revision 1.54 2007/04/09 18:11:35 fabiankeil + * Don't mistake VC++'s _snprintf() for a snprintf() replacement. + * + * Revision 1.53 2007/04/08 13:21:04 fabiankeil + * Reference action files in CGI URLs by id instead + * of using the first part of the file name. + * Fixes BR 1694250 and BR 1590556. + * + * Revision 1.52 2007/02/13 15:10:26 fabiankeil + * Apparently fopen()ing in "binary" mode doesn't require + * #ifdefs, it's already done without them in cgiedit.c. + * + * Revision 1.51 2007/02/10 16:55:22 fabiankeil + * - Show forwarding settings on the show-url-info page + * - Fix some HTML syntax errors. + * * Revision 1.50 2007/01/23 15:51:17 fabiankeil * Add favicon delivery functions. * @@ -296,10 +324,6 @@ const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.50 2007/01/23 15:51:17 fabian #include #endif /* def HAVE_ACCESS */ -#ifdef _WIN32 -#define snprintf _snprintf -#endif /* def _WIN32 */ - #include "project.h" #include "cgi.h" #include "cgisimple.h" @@ -532,8 +556,7 @@ jb_err cgi_show_request(struct client_state *csp, return JB_ERR_MEMORY; } - if (map(exports, "processed-request", 1, html_encode_and_free_original( - sed(client_patterns, add_client_headers, csp)), 0)) + if (map(exports, "processed-request", 1, html_encode(list_to_text(csp->headers)), 0)) { free_map(exports); return JB_ERR_MEMORY; @@ -905,15 +928,7 @@ jb_err cgi_send_user_manual(struct client_state *csp, } /* Open user-manual file */ -#ifdef WIN32 - /* - * XXX: Do we support other operating systems that - * require special treatment to fopen in binary mode? - */ if (NULL == (fp = fopen(full_path, "rb"))) -#else - if (NULL == (fp = fopen(full_path, "r"))) -#endif /* def WIN32 */ { log_error(LOG_LEVEL_ERROR, "Cannot open user-manual file %s: %E", full_path); err = cgi_error_no_template(csp, rsp, full_path); @@ -937,7 +952,7 @@ jb_err cgi_send_user_manual(struct client_state *csp, if (!fread(rsp->body, length, 1, fp)) { /* - * This happens if we didn't fopen in binary mode. + * May happen if the file size changes between fseek() and fread(). * If it does, we just log it and serve what we got. */ log_error(LOG_LEVEL_ERROR, "Couldn't completely read user-manual file %s.", full_path); @@ -1204,7 +1219,8 @@ jb_err cgi_show_status(struct client_state *csp, { if (!err) err = string_append(&s, ""); if (!err) err = string_join(&s, html_encode(csp->actions_list[i]->filename)); - snprintf(buf, 100, "View", i); + snprintf(buf, sizeof(buf), + "View", i); if (!err) err = string_append(&s, buf); #ifdef FEATURE_CGI_EDIT_ACTIONS @@ -1214,8 +1230,7 @@ jb_err cgi_show_status(struct client_state *csp, if (access(csp->config->actions_file[i], W_OK) == 0) { #endif /* def HAVE_ACCESS */ - snprintf(buf, 100, "  Edit", - csp->config->actions_file_short[i]); + snprintf(buf, sizeof(buf), "  Edit", i); if (!err) err = string_append(&s, buf); #ifdef HAVE_ACCESS } @@ -1378,15 +1393,16 @@ jb_err cgi_show_url_info(struct client_state *csp, /* * Unknown prefix - assume http:// */ - char * url_param_prefixed = malloc(7 + 1 + strlen(url_param)); + const size_t url_param_prefixed_size = 7 + 1 + strlen(url_param); + char * url_param_prefixed = malloc(url_param_prefixed_size); if (NULL == url_param_prefixed) { free(url_param); free_map(exports); return JB_ERR_MEMORY; } - strcpy(url_param_prefixed, "http://"); - strcpy(url_param_prefixed + 7, url_param); + strlcpy(url_param_prefixed, "http://", url_param_prefixed_size); + strlcat(url_param_prefixed, url_param, url_param_prefixed_size); free(url_param); url_param = url_param_prefixed; } @@ -1495,7 +1511,7 @@ jb_err cgi_show_url_info(struct client_state *csp, for (i = 0; i < MAX_AF_FILES; i++) { if (NULL == csp->config->actions_file_short[i] - || !strcmp(csp->config->actions_file_short[i], "standard")) continue; + || !strcmp(csp->config->actions_file_short[i], "standard.action")) continue; b = NULL; hits = 1; @@ -1506,13 +1522,13 @@ jb_err cgi_show_url_info(struct client_state *csp, /* FIXME: Hardcoded HTML! */ string_append(&matches, "In file: "); string_join (&matches, html_encode(csp->config->actions_file_short[i])); - snprintf(buf, 150, ".action ", i); + snprintf(buf, sizeof(buf), " ", 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, "\">Edit"); + snprintf(buf, sizeof(buf), " ", i); + string_append(&matches, buf); + string_append(&matches, "Edit"); #endif string_append(&matches, "\n"); @@ -1550,6 +1566,19 @@ jb_err cgi_show_url_info(struct client_state *csp, } string_append(&matches, "\n"); + /* + * XXX: Kludge to make sure the "Forward settings" section + * shows what forward-override{} would do with the requested URL. + * No one really cares how the CGI request would be forwarded + * if it wasn't intercepted as CGI request in the first place. + * + * From here on the action bitmask will no longer reflect + * the real url (http://config.privoxy.org/show-url-info?url=.*), + * but luckily it's no longer required later on anyway. + */ + free_current_action(csp->action); + url_actions(url_to_query, csp); + /* * Fill in forwarding settings. * @@ -1561,7 +1590,7 @@ jb_err cgi_show_url_info(struct client_state *csp, * * XXX: Parts of this code could be reused for the * "forwarding-failed" template which currently doesn't - * display the proxy port and an eventuell second forwarder. + * display the proxy port and an eventual second forwarder. */ { const struct forward_spec * fwd = forward_url(url_to_query, csp);