X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=cgisimple.c;h=21a9872a542db94fbfa2d887d856adc4c4ff69fa;hp=701d3d8144ce0410d9a2b60bf66e8416e4ac566a;hb=ea3ca56adb3901e74bb9e93f00299b5adbc471f2;hpb=4b3c9b925e5be187be35cb31f797dcd34ee2d255 diff --git a/cgisimple.c b/cgisimple.c index 701d3d81..21a9872a 100644 --- a/cgisimple.c +++ b/cgisimple.c @@ -1,4 +1,4 @@ -const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.25 2002/04/03 22:28:03 gliptak Exp $"; +const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.29 2002/04/10 13:38:35 oes Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/cgisimple.c,v $ @@ -36,6 +36,19 @@ const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.25 2002/04/03 22:28:03 glipta * * Revisions : * $Log: cgisimple.c,v $ + * Revision 1.29 2002/04/10 13:38:35 oes + * load_template signature changed + * + * Revision 1.28 2002/04/07 15:42:12 jongfoster + * Fixing send-banner?type=auto when the image-blocker is + * a redirect to send-banner + * + * Revision 1.27 2002/04/05 15:50:48 oes + * added send-stylesheet CGI + * + * Revision 1.26 2002/04/04 00:36:36 gliptak + * always use pcre for matching + * * Revision 1.25 2002/04/03 22:28:03 gliptak * Removed references to gnu_regex * @@ -162,6 +175,7 @@ const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.25 2002/04/03 22:28:03 glipta #include "loadcfg.h" #include "parsers.h" #include "urlmatch.h" +#include "errlog.h" const char cgisimple_h_rcs[] = CGISIMPLE_H_VERSION; @@ -421,18 +435,33 @@ jb_err cgi_send_banner(struct client_state *csp, #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="; + /* 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"))) + if (p == NULL) + { + /* Use default - nothing to do here. */ + } + else if (0 == strcmpic(p, "blank")) { imagetype = 'b'; } - else if ((p != NULL) && (0 == strcmpic(p, "pattern"))) + else if (0 == strcmpic(p, "pattern")) { imagetype = 'p'; } + else if (0 == strncmpic(p, prefix1, sizeof(prefix1) - 1)) + { + imagetype = p[sizeof(prefix1) - 1]; + } + else if (0 == strncmpic(p, prefix2, sizeof(prefix2) - 1)) + { + imagetype = p[sizeof(prefix2) - 1]; + } } #endif /* def FEATURE_IMAGE_BLOCKING */ } @@ -484,8 +513,8 @@ jb_err cgi_send_banner(struct client_state *csp, * *********************************************************************/ jb_err cgi_transparent_image(struct client_state *csp, - struct http_response *rsp, - const struct map *parameters) + struct http_response *rsp, + const struct map *parameters) { rsp->body = bindup(image_blank_data, image_blank_length); rsp->content_length = image_blank_length; @@ -507,6 +536,57 @@ jb_err cgi_transparent_image(struct client_state *csp, } +/********************************************************************* + * + * Function : cgi_send_stylesheet + * + * Description : CGI function that sends a css stylesheet found + * in the cgi-style.css template + * + * 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_stylesheet(struct client_state *csp, + struct http_response *rsp, + const struct map *parameters) +{ + jb_err err; + + assert(csp); + assert(rsp); + + err = template_load(csp, &rsp->body, "cgi-style.css", 0); + + if (err == JB_ERR_FILE) + { + /* + * No way to tell user; send empty stylesheet + */ + log_error(LOG_LEVEL_ERROR, "Could not find cgi-style.css template"); + } + else if (err) + { + return err; /* JB_ERR_MEMORY */ + } + + if (enlist(rsp->headers, "Content-Type: text/css")) + { + return JB_ERR_MEMORY; + } + + return JB_ERR_OK; + +} + + /********************************************************************* * * Function : cgi_show_version @@ -579,7 +659,7 @@ jb_err cgi_show_status(struct client_state *csp, const struct map *parameters) { char *s = NULL; - int i; + unsigned i; FILE * fp; char buf[BUFFER_SIZE]; @@ -590,6 +670,8 @@ jb_err cgi_show_status(struct client_state *csp, int local_urls_read; int local_urls_rejected; #endif /* ndef FEATURE_STATISTICS */ + struct file_list * fl; + struct url_actions * b; jb_err err; struct map *exports; @@ -605,19 +687,19 @@ jb_err cgi_show_status(struct client_state *csp, switch (*(lookup(parameters, "file"))) { - case 'p': - if (csp->actions_list) + case 'a': + if (!get_number_param(csp, parameters, "index", &i) && i < MAX_ACTION_FILES && csp->actions_list[i]) { - filename = csp->actions_list->filename; - file_description = "Actions List"; + filename = csp->actions_list[i]->filename; + file_description = "Actions File"; } break; - case 'r': + case 'f': if (csp->rlist) { filename = csp->rlist->filename; - file_description = "Regex Filter List"; + file_description = "Filter File"; } break; @@ -626,7 +708,7 @@ jb_err cgi_show_status(struct client_state *csp, if (csp->tlist) { filename = csp->tlist->filename; - file_description = "Trust List"; + file_description = "Trust File"; } break; #endif /* def FEATURE_TRUST */ @@ -655,7 +737,6 @@ jb_err cgi_show_status(struct client_state *csp, while ((s != NULL) && fgets(buf, sizeof(buf), fp)) { string_join (&s, html_encode(buf)); - string_append(&s, "
"); } fclose(fp); @@ -728,14 +809,39 @@ jb_err cgi_show_status(struct client_state *csp, #else /* ndef FEATURE_STATISTICS */ err = err || map_block_killer(exports, "statistics"); #endif /* ndef FEATURE_STATISTICS */ + + /* + * List all action files in use, together with view and edit links, + * except for standard.action, which should only be viewable. (Not + * enforced in the editor itself) + * FIXME: Shouldn't include hardwired HTML here, use line template instead! + */ + s = strdup(""); + for (i = 0; i < MAX_ACTION_FILES; i++) + { + if (((fl = csp->actions_list[i]) != NULL) && ((b = fl->f) != NULL)) + { + if (!err) err = string_append(&s, ""); + if (!err) err = string_join(&s, html_encode(csp->actions_list[i]->filename)); + snprintf(buf, 100, "View ", i); + if (!err) err = string_append(&s, buf); + + if (NULL == strstr(csp->actions_list[i]->filename, "standard.action") && NULL != csp->config->actions_file_short[i]) + { + snprintf(buf, 100, "Edit", csp->config->actions_file_short[i]); + if (!err) err = string_append(&s, buf); + } - if (csp->actions_list) + if (!err) err = string_append(&s, "\n"); + } + } + if (*s != '\0') { - if (!err) err = map(exports, "actions-filename", 1, html_encode(csp->actions_list->filename), 0); + if (!err) err = map(exports, "actions-filenames", 1, s, 0); } else { - if (!err) err = map(exports, "actions-filename", 1, "None specified", 1); + if (!err) err = map(exports, "actions-filenames", 1, "None specified", 1); } if (csp->rlist) @@ -745,6 +851,7 @@ jb_err cgi_show_status(struct client_state *csp, else { if (!err) err = map(exports, "re-filter-filename", 1, "None specified", 1); + if (!err) err = map_block_killer(exports, "have-filterfile"); } #ifdef FEATURE_TRUST @@ -755,6 +862,7 @@ jb_err cgi_show_status(struct client_state *csp, else { if (!err) err = map(exports, "trust-filename", 1, "None specified", 1); + if (!err) err = map_block_killer(exports, "have-trustfile"); } #else if (!err) err = map_block_killer(exports, "trust-support"); @@ -893,6 +1001,7 @@ jb_err cgi_show_url_info(struct client_state *csp, struct url_actions *b; struct http_request url_to_query[1]; struct current_action_spec action[1]; + int i; if (map(exports, "url", 1, html_encode(url_param), 0)) { @@ -912,22 +1021,6 @@ jb_err cgi_show_url_info(struct client_state *csp, return JB_ERR_MEMORY; } - if (((fl = csp->actions_list) == NULL) || ((b = fl->f) == NULL)) - { - err = map(exports, "matches", 1, "none" , 1); - if (!err) err = map(exports, "final", 1, lookup(exports, "default"), 1); - - free_current_action(action); - free(url_param); - - if (err) - { - free_map(exports); - return JB_ERR_MEMORY; - } - - return template_fill_for_cgi(csp, "show-url-info", exports, rsp); - } err = parse_http_url(url_param, url_to_query, csp); @@ -972,26 +1065,51 @@ jb_err cgi_show_url_info(struct client_state *csp, matches = strdup(""); - for (b = b->next; (b != NULL) && (matches != NULL); b = b->next) + for (i = 0; i < MAX_ACTION_FILES; i++) { - if (url_match(b->url, url_to_query)) + b = NULL; + hits = 1; + if ((fl = csp->actions_list[i]) != 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)) + if ((b = fl->f) != NULL) { - freez(matches); - free_http_request(url_to_query); - free_current_action(action); - free_map(exports); - return JB_ERR_MEMORY; + string_append(&matches, "--- config->actions_file_short[i])); + string_append(&matches, "\">File "); + string_join (&matches, html_encode(csp->config->actions_file_short[i])); + string_append(&matches, " ---
\n
\n"); + + hits = 0; + b = b->next; } - hits++; + } + + for (; (b != NULL) && (matches != NULL); b = b->next) + { + 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, " }
\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_current_action(action); + free_map(exports); + return JB_ERR_MEMORY; + } + hits++; + } + } + + if (!hits) + { + string_append(&matches, "(no matches in this file)\n
\n"); } } @@ -1004,11 +1122,6 @@ jb_err cgi_show_url_info(struct client_state *csp, return JB_ERR_MEMORY; } - if (!hits) - { - free(matches); - matches = strdup("none"); - } if (map(exports, "matches", 1, matches , 0)) { free_current_action(action);