X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=cgisimple.c;h=078a0011d80ca399b2604cca9e212cec3ac027da;hp=8000af485d069fc64fd4d4895412f965e9e8efd3;hb=3ac2e455b47cce2028e1f8c7de72a77a15491691;hpb=ac5f0d2c606a432e9cf70c0f40a0e86d660c5551 diff --git a/cgisimple.c b/cgisimple.c index 8000af48..078a0011 100644 --- a/cgisimple.c +++ b/cgisimple.c @@ -1,4 +1,4 @@ -const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.137 2016/04/04 10:51:45 fabiankeil Exp $"; +const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.146 2017/02/20 13:45:14 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/cgisimple.c,v $ @@ -6,7 +6,7 @@ const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.137 2016/04/04 10:51:45 fabia * Purpose : Simple CGIs to get information about Privoxy's * status. * - * Copyright : Written by and Copyright (C) 2001-2016 the + * Copyright : Written by and Copyright (C) 2001-2017 the * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written @@ -310,7 +310,7 @@ static void cgi_create_client_tag_form(char *form, size_t size, } snprintf(form, size, - "
\n" + "\n" " \n" " \n" " \n" @@ -343,12 +343,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_tags = strdup_or_die(""); + char *client_tag_status; char buf[1000]; + time_t refresh_delay; assert(csp); assert(rsp); @@ -358,65 +355,40 @@ jb_err cgi_show_client_tags(struct client_state *csp, { return JB_ERR_MEMORY; } - - 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); - } - } + assert(csp->client_address != NULL); this_tag = csp->config->client_tags; if (this_tag->name == NULL) { - if (!err) err = string_append(&client_tags, "

No tags available.

\n"); + client_tag_status = strdup_or_die("

No tags available.

\n"); } else { - if (!err) - { - err = string_append(&client_tags, "\n" - "\n" - "\n"); - } + client_tag_status = strdup_or_die("
Tag nameCurrent stateChange stateDescription
\n" + "\n" + "\n"); while ((this_tag != NULL) && (this_tag->name != NULL)) { int tag_state; privoxy_mutex_lock(&client_tags_mutex); - tag_state = client_has_requested_tag(csp->ip_addr_str, this_tag->name); + tag_state = client_has_requested_tag(csp->client_address, this_tag->name); privoxy_mutex_unlock(&client_tags_mutex); - if (!err) err = string_append(&client_tags, "\n"); + if (!err) err = string_append(&client_tag_status, "\n"); if (err) { free_map(exports); @@ -424,16 +396,34 @@ jb_err cgi_show_client_tags(struct client_state *csp, } this_tag = this_tag->next; } - if (!err) err = string_append(&client_tags, "
Tag nameCurrent stateChange stateDescription
"); - if (!err) err = string_append(&client_tags, this_tag->name); - if (!err) err = string_append(&client_tags, ""); - if (!err) err = string_append(&client_tags, tag_state == 1 ? "Enabled" : "Disabled"); - if (!err) err = string_append(&client_tags, ""); + if (!err) err = string_append(&client_tag_status, "
"); + if (!err) err = string_append(&client_tag_status, this_tag->name); + if (!err) err = string_append(&client_tag_status, ""); + if (!err) err = string_append(&client_tag_status, tag_state == 1 ? "Enabled" : "Disabled"); + if (!err) err = string_append(&client_tag_status, ""); cgi_create_client_tag_form(buf, sizeof(buf), this_tag->name, !tag_state, 1); - if (!err) err = string_append(&client_tags, buf); + if (!err) err = string_append(&client_tag_status, buf); if (tag_state == 0) { cgi_create_client_tag_form(buf, sizeof(buf), this_tag->name, !tag_state, 0); - if (!err) err = string_append(&client_tags, buf); + if (!err) err = string_append(&client_tag_status, buf); } - if (!err) err = string_append(&client_tags, ""); - if (!err) err = string_append(&client_tags, this_tag->description); - if (!err) err = string_append(&client_tags, "
"); + if (!err) err = string_append(&client_tag_status, this_tag->description); + if (!err) err = string_append(&client_tag_status, "
\n"); + if (!err) err = string_append(&client_tag_status, "\n"); + } + refresh_delay = get_next_tag_timeout_for_client(csp->client_address); + if (refresh_delay != 0) + { + snprintf(buf, sizeof(buf), "%d", 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_tags, 0)) + if (map(exports, "client-tags", 1, client_tag_status, 0)) { free_map(exports); return JB_ERR_MEMORY; } - if (map(exports, "client-ip-addr", 1, csp->ip_addr_str, 1)) + if (map(exports, "client-ip-addr", 1, csp->client_address, 1)) { free_map(exports); return JB_ERR_MEMORY; @@ -441,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 */ @@ -1715,6 +1777,14 @@ static jb_err show_defines(struct map *exports) }; static const struct feature features[] = { + { + "FEATURE_64_BIT_TIME_T", +#if (SIZEOF_TIME_T == 8) + 1, +#else + 0, +#endif + }, { "FEATURE_ACCEPT_FILTER", #ifdef FEATURE_ACCEPT_FILTER @@ -1942,9 +2012,6 @@ static char *show_rcs(void) #endif /* def FEATURE_CGI_EDIT_ACTIONS */ SHOW_RCS(cgisimple_h_rcs) SHOW_RCS(cgisimple_rcs) -#ifdef __MINGW32__ - SHOW_RCS(cygwin_h_rcs) -#endif SHOW_RCS(deanimate_h_rcs) SHOW_RCS(deanimate_rcs) SHOW_RCS(encode_h_rcs)