X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=cgisimple.c;h=1cebfe6d13b044325374706e550b0b70855b8355;hp=08ec46f0c80199da708a50ba18dcc1d17a93be00;hb=1284f78d7c4454f212d1283695d76d78e23d6b4f;hpb=cb2756f19168af61ff455f9edfa2a15eea7cd038 diff --git a/cgisimple.c b/cgisimple.c index 08ec46f0..1cebfe6d 100644 --- a/cgisimple.c +++ b/cgisimple.c @@ -1,4 +1,4 @@ -const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.75 2008/04/27 13:52:52 fabiankeil Exp $"; +const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.88 2008/08/30 12:03:07 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/cgisimple.c,v $ @@ -36,6 +36,55 @@ const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.75 2008/04/27 13:52:52 fabian * * Revisions : * $Log: cgisimple.c,v $ + * Revision 1.88 2008/08/30 12:03:07 fabiankeil + * Remove FEATURE_COOKIE_JAR. + * + * Revision 1.87 2008/08/29 15:59:22 fabiankeil + * Fix two comments. + * + * Revision 1.86 2008/06/28 14:19:05 fabiankeil + * Protocol detection is done case-insensitive, fix assertion + * to do the same. Yay for Privoxy-Regression-Test and zzuf. + * + * Revision 1.85 2008/05/26 17:30:55 fabiankeil + * Provide an OpenSearch Description to access the + * show-url-info page through "search engine plugins". + * + * Revision 1.84 2008/05/26 16:16:55 fabiankeil + * Spell error correctly. + * + * Revision 1.83 2008/05/12 14:51:30 fabiankeil + * Don't complain about an invalid URL if show-url-info is requested + * without parameters. Regression introduced in 1.81 by yours truly. + * + * Revision 1.82 2008/05/10 20:01:47 fabiankeil + * Fix an assertion that could erroneously + * trigger in case of memory shortage. + * + * Revision 1.81 2008/05/05 09:54:39 fabiankeil + * In cgi_show_url_info(), make sure ftp URLs are + * declared invalid. Also simplify the code that adds + * "http://" if no protocol has been specified. + * + * Revision 1.80 2008/05/04 16:18:32 fabiankeil + * Provide parse_http_url() with a third parameter to specify + * whether or not URLs without protocol are acceptable. + * + * Revision 1.79 2008/05/04 13:30:56 fabiankeil + * Streamline parse_http_url()'s prototype. + * + * Revision 1.78 2008/05/03 16:50:11 fabiankeil + * Leverage content_filters_enabled() in cgi_show_url_info(). + * + * Revision 1.77 2008/05/02 09:47:48 fabiankeil + * In cgi_show_url_info, pass an initialized http structure + * to parse_http_url() as that will be required soonish and + * assert that https URLs are recognized correctly. + * + * Revision 1.76 2008/04/28 09:13:30 fabiankeil + * In load_file(), remember the error reason and fclose() + * and return later on instead of right away. + * * Revision 1.75 2008/04/27 13:52:52 fabiankeil * Move CGI file loading code into load_file() and * add checks for unexpected errors. @@ -946,6 +995,49 @@ jb_err cgi_send_stylesheet(struct client_state *csp, return JB_ERR_OK; } + + +/********************************************************************* + * + * Function : cgi_send_url_info_osd + * + * Description : CGI function that sends the OpenSearch Description + * template for the show-url-info page. It allows to + * access the page through "search engine plugins". + * + * 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_send_url_info_osd(struct client_state *csp, + struct http_response *rsp, + const struct map *parameters) +{ + jb_err err = JB_ERR_MEMORY; + struct map *exports = default_exports(csp, NULL); + + if (NULL != exports) + { + err = template_fill_for_cgi(csp, "url-info-osd.xml", exports, rsp); + if (JB_ERR_OK == err) + { + err = enlist(rsp->headers, + "Content-Type: application/opensearchdescription+xml"); + } + } + + return err; + +} + + /********************************************************************* * * Function : cgi_send_user_manual @@ -1386,22 +1478,16 @@ jb_err cgi_show_url_info(struct client_state *csp, url_param[0] = '\0'; } } - else if (url_param[0] != '\0') + else if ((url_param[0] != '\0') && (NULL == strstr(url_param, "://"))) { - /* - * Unknown prefix - assume http:// - */ - 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) + /* No prefix - assume http:// */ + char *url_param_prefixed = strdup("http://"); + + if (JB_ERR_OK != string_join(&url_param_prefixed, url_param)) { - free(url_param); free_map(exports); return JB_ERR_MEMORY; } - 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; } @@ -1460,7 +1546,9 @@ jb_err cgi_show_url_info(struct client_state *csp, return JB_ERR_MEMORY; } - err = parse_http_url(url_param, url_to_query, csp); + memset(url_to_query, '\0', sizeof(url_to_query)); + err = parse_http_url(url_param, url_to_query, REQUIRE_PROTOCOL); + assert((err != JB_ERR_OK) || (url_to_query->ssl == !strncmpic(url_param, "https://", 8))); free(url_param); @@ -1683,14 +1771,10 @@ jb_err cgi_show_url_info(struct client_state *csp, * If zlib support is available, if no content filters * are enabled or if the prevent-compression action is enabled, * suppress the "compression could prevent filtering" warning. - * - * XXX: Change content_filters_enabled()'s prototype so we can - * use it here. */ #ifndef FEATURE_ZLIB - if ((list_is_empty(action->multi[ACTION_MULTI_FILTER]) - && !(action->flags & ACTION_DEANIMATE)) - || (action->flags & ACTION_NO_COMPRESSION)) + if (!content_filters_enabled(action) || + (action->flags & ACTION_NO_COMPRESSION)) #endif { if (!err) err = map_block_killer(exports, "filters-might-be-ineffective"); @@ -1792,15 +1876,15 @@ static jb_err show_defines(struct map *exports) #ifdef FEATURE_CGI_EDIT_ACTIONS if (!err) err = map_conditional(exports, "FEATURE_CGI_EDIT_ACTIONS", 1); -#else /* ifndef FEATURE_COOKIE_JAR */ +#else /* ifndef FEATURE_CGI_EDIT_ACTIONS */ if (!err) err = map_conditional(exports, "FEATURE_CGI_EDIT_ACTIONS", 0); -#endif /* ndef FEATURE_COOKIE_JAR */ +#endif /* ndef FEATURE_CGI_EDIT_ACTIONS */ -#ifdef FEATURE_COOKIE_JAR - if (!err) err = map_conditional(exports, "FEATURE_COOKIE_JAR", 1); -#else /* ifndef FEATURE_COOKIE_JAR */ - if (!err) err = map_conditional(exports, "FEATURE_COOKIE_JAR", 0); -#endif /* ndef FEATURE_COOKIE_JAR */ +#ifdef FEATURE_CONNECTION_KEEP_ALIVE + if (!err) err = map_conditional(exports, "FEATURE_CONNECTION_KEEP_ALIVE", 1); +#else /* ifndef FEATURE_CGI_EDIT_ACTIONS */ + if (!err) err = map_conditional(exports, "FEATURE_CONNECTION_KEEP_ALIVE", 0); +#endif /* ndef FEATURE_CONNECTION_KEEP_ALIVE */ #ifdef FEATURE_FAST_REDIRECTS if (!err) err = map_conditional(exports, "FEATURE_FAST_REDIRECTS", 1); @@ -2131,7 +2215,7 @@ static jb_err load_file(const char *filename, char **buffer, size_t *length) if (fseek(fp, 0, SEEK_END)) { log_error(LOG_LEVEL_FATAL, - "Unexpected erro while fseek()ing to the end of %s: %E", + "Unexpected error while fseek()ing to the end of %s: %E", filename); } ret = ftell(fp);