X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=cgisimple.c;h=0077e7c48149324278dd955bc3ab50586ef2940f;hb=ff5334a2770ef889e336d8088fa1f53f154e11a9;hp=8acfc1e2b6b31bf67324b1d86ec02084d6352606;hpb=97dcdede1c96c857ea36b5f5a9873c302d021a7d;p=privoxy.git diff --git a/cgisimple.c b/cgisimple.c index 8acfc1e2..0077e7c4 100644 --- a/cgisimple.c +++ b/cgisimple.c @@ -1,4 +1,3 @@ -const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.141 2016/05/08 10:46:29 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/cgisimple.c,v $ @@ -6,8 +5,8 @@ const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.141 2016/05/08 10:46:29 fabia * Purpose : Simple CGIs to get information about Privoxy's * status. * - * Copyright : Written by and Copyright (C) 2001-2016 the - * Privoxy team. http://www.privoxy.org/ + * Copyright : Written by and Copyright (C) 2001-2020 the + * Privoxy team. https://www.privoxy.org/ * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -64,9 +63,6 @@ const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.141 2016/05/08 10:46:29 fabia #include "client-tags.h" #endif -const char cgisimple_h_rcs[] = CGISIMPLE_H_VERSION; - -static char *show_rcs(void); static jb_err show_defines(struct map *exports); static jb_err cgi_show_file(struct client_state *csp, struct http_response *rsp, @@ -310,9 +306,9 @@ static void cgi_create_client_tag_form(char *form, size_t size, } snprintf(form, size, - "
", tag, toggle_state, !expires, button_name); @@ -343,12 +339,9 @@ jb_err cgi_show_client_tags(struct client_state *csp, struct map *exports; struct client_tag_spec *this_tag; jb_err err = JB_ERR_OK; - const char *toggled_tag; - const char *toggle_state; - const char *tag_expires; - time_t time_to_live; char *client_tag_status; char buf[1000]; + time_t refresh_delay; assert(csp); assert(rsp); @@ -359,28 +352,7 @@ jb_err cgi_show_client_tags(struct client_state *csp, return JB_ERR_MEMORY; } assert(csp->client_address != NULL); - toggled_tag = lookup(parameters, "tag"); - if (*toggled_tag != '\0') - { - tag_expires = lookup(parameters, "expires"); - if (*tag_expires == '0') - { - time_to_live = 0; - } - else - { - time_to_live = csp->config->client_tag_lifetime; - } - toggle_state = lookup(parameters, "toggle-state"); - if (*toggle_state == '1') - { - enable_client_specific_tag(csp, toggled_tag, time_to_live); - } - else - { - disable_client_specific_tag(csp, toggled_tag); - } - } + this_tag = csp->config->client_tags; if (this_tag->name == NULL) { @@ -415,12 +387,34 @@ jb_err cgi_show_client_tags(struct client_state *csp, if (!err) err = string_append(&client_tag_status, "\n"); if (err) { - free_map(exports); - return JB_ERR_MEMORY; + break; } this_tag = this_tag->next; } if (!err) err = string_append(&client_tag_status, "\n"); + if (err) + { + free_map(exports); + return JB_ERR_MEMORY; + } + } + refresh_delay = get_next_tag_timeout_for_client(csp->client_address); + if (refresh_delay != 0) + { + snprintf(buf, sizeof(buf), "%u", csp->config->client_tag_lifetime); + if (map(exports, "refresh-delay", 1, buf, 1)) + { + free_map(exports); + return JB_ERR_MEMORY; + } + } + else + { + err = map_block_killer(exports, "tags-expire"); + if (err != JB_ERR_OK) + { + return err; + } } if (map(exports, "client-tags", 1, client_tag_status, 0)) @@ -437,6 +431,78 @@ jb_err cgi_show_client_tags(struct client_state *csp, return template_fill_for_cgi(csp, "client-tags", exports, rsp); } + + +/********************************************************************* + * + * Function : cgi_toggle_client_tag + * + * Description : Toggles a client tag and redirects to the show-tags + * page + * + * 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 + * 1 : tag = Name of the tag to enable or disable + * 2 : toggle-state = How to toggle the tag (0/1) + * 3 : expires = Set to 1 if the tag should be enabled + * temporarily, otherwise set to 0 + * + * Returns : JB_ERR_OK on success + * JB_ERR_MEMORY on out-of-memory error. + * + *********************************************************************/ +jb_err cgi_toggle_client_tag(struct client_state *csp, + struct http_response *rsp, + const struct map *parameters) +{ + const char *toggled_tag; + const char *toggle_state; + const char *tag_expires; + time_t time_to_live; + + assert(csp); + assert(rsp); + assert(parameters); + + toggled_tag = lookup(parameters, "tag"); + if (*toggled_tag == '\0') + { + log_error(LOG_LEVEL_ERROR, "Received tag toggle request without tag"); + } + else + { + tag_expires = lookup(parameters, "expires"); + if (*tag_expires == '0') + { + time_to_live = 0; + } + else + { + time_to_live = csp->config->client_tag_lifetime; + } + toggle_state = lookup(parameters, "toggle-state"); + if (*toggle_state == '1') + { + enable_client_specific_tag(csp, toggled_tag, time_to_live); + } + else + { + disable_client_specific_tag(csp, toggled_tag); + } + } + rsp->status = strdup_or_die("302 Done dealing with toggle request"); + if (enlist_unique_header(rsp->headers, + "Location", CGI_PREFIX "client-tags")) + { + return JB_ERR_MEMORY; + } + return JB_ERR_OK; + +} #endif /* def FEATURE_CLIENT_TAGS */ @@ -965,47 +1031,140 @@ jb_err cgi_send_user_manual(struct client_state *csp, } +#ifdef FEATURE_EXTENDED_STATISTICS /********************************************************************* * - * Function : cgi_show_version + * Function : get_block_reason_statistics_table * - * Description : CGI function that returns a a web page describing the - * file versions of Privoxy. + * Description : Produces the block reason statistic table content. * * 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. + * Returns : Pointer to the HTML statistic table content or + * NULL on out of memory * *********************************************************************/ -jb_err cgi_show_version(struct client_state *csp, - struct http_response *rsp, - const struct map *parameters) +static char *get_block_reason_statistics_table(const struct client_state *csp) { - struct map *exports; + char buf[BUFFER_SIZE]; + char *statistics; + int i; + struct file_list *fl; + jb_err err = JB_ERR_OK; - assert(csp); - assert(rsp); - assert(parameters); + statistics = strdup_or_die(""); - if (NULL == (exports = default_exports(csp, "show-version"))) + /* Run through all action files. */ + for (i = 0; i < MAX_AF_FILES; i++) { - return JB_ERR_MEMORY; + struct url_actions *b; + struct action_spec *last_action = NULL; + + if (((fl = csp->actions_list[i]) == NULL) || ((b = fl->f) == NULL)) + { + /* Skip empty files */ + continue; + } + + /* Go through all the actions. */ + for (b = b->next; NULL != b; b = b->next) + { + if (last_action == b->action) + { + continue; + } + if ((b->action->add & ACTION_BLOCK)) + { + unsigned long long count; + const char *block_reason = b->action->string[ACTION_STRING_BLOCK]; + const char *encoded_block_reason = html_encode(block_reason); + + if (encoded_block_reason == NULL) + { + freez(statistics); + return NULL; + } + get_block_reason_count(block_reason, &count); + snprintf(buf, sizeof(buf), + "