X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=filters.c;h=c891f4f9f793218411beb3b0a57df788463afada;hp=8a83bbcad768dcc79a5c29e579b39421947734db;hb=f01eaeb9da2b04ba020c5630fb5ae9fb9d8e12f5;hpb=452b882d3844f7d6ba93155010aea2c406161f8e diff --git a/filters.c b/filters.c index 8a83bbca..c891f4f9 100644 --- a/filters.c +++ b/filters.c @@ -1,4 +1,3 @@ -const char filters_rcs[] = "$Id: filters.c,v 1.199 2016/01/16 12:33:35 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/filters.c,v $ @@ -6,7 +5,7 @@ const char filters_rcs[] = "$Id: filters.c,v 1.199 2016/01/16 12:33:35 fabiankei * Purpose : Declares functions to parse/crunch headers and pages. * * Copyright : Written by and Copyright (C) 2001-2016 the - * Privoxy team. http://www.privoxy.org/ + * Privoxy team. https://www.privoxy.org/ * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -70,17 +69,23 @@ const char filters_rcs[] = "$Id: filters.c,v 1.199 2016/01/16 12:33:35 fabiankei #include "deanimate.h" #include "urlmatch.h" #include "loaders.h" +#ifdef FEATURE_CLIENT_TAGS +#include "client-tags.h" +#endif #ifdef _WIN32 #include "win32.h" #endif -const char filters_h_rcs[] = FILTERS_H_VERSION; - typedef char *(*filter_function_ptr)(); static filter_function_ptr get_filter_function(const struct client_state *csp); -static jb_err remove_chunked_transfer_coding(char *buffer, size_t *size); static jb_err prepare_for_filtering(struct client_state *csp); +static void apply_url_actions(struct current_action_spec *action, + struct http_request *http, +#ifdef FEATURE_CLIENT_TAGS + const struct list *client_tags, +#endif + struct url_actions *b); #ifdef FEATURE_ACL #ifdef HAVE_RFC2553 @@ -97,17 +102,15 @@ static jb_err prepare_for_filtering(struct client_state *csp); * 3 : len = length of IP address in octets * 4 : port = port number in network order; * - * Returns : 0 = no errror; -1 otherwise. + * Returns : void * *********************************************************************/ -static int sockaddr_storage_to_ip(const struct sockaddr_storage *addr, - uint8_t **ip, unsigned int *len, - in_port_t **port) +static void sockaddr_storage_to_ip(const struct sockaddr_storage *addr, + uint8_t **ip, unsigned int *len, + in_port_t **port) { - if (NULL == addr) - { - return(-1); - } + assert(NULL != addr); + assert(addr->ss_family == AF_INET || addr->ss_family == AF_INET6); switch (addr->ss_family) { @@ -142,12 +145,7 @@ static int sockaddr_storage_to_ip(const struct sockaddr_storage *addr, } break; - default: - /* Unsupported address family */ - return(-1); } - - return(0); } @@ -208,7 +206,7 @@ static int match_sockaddr(const struct sockaddr_storage *network, return 0; } - /* TODO: Optimize by checking by words insted of octets */ + /* TODO: Optimize by checking by words instead of octets */ for (i = 0; (i < addr_len) && netmask_addr[i]; i++) { if ((network_addr[i] & netmask_addr[i]) != @@ -447,10 +445,7 @@ int acl_addr(const char *aspec, struct access_control_addr *aca) } aca->mask.ss_family = aca->addr.ss_family; - if (sockaddr_storage_to_ip(&aca->mask, &mask_data, &addr_len, &mask_port)) - { - return(-1); - } + sockaddr_storage_to_ip(&aca->mask, &mask_data, &addr_len, &mask_port); if (p) { @@ -510,7 +505,7 @@ int acl_addr(const char *aspec, struct access_control_addr *aca) * * Description : Check to see if CONNECT requests to the destination * port of this request are forbidden. The check is - * independend of the actual request method. + * independent of the actual request method. * * Parameters : * 1 : csp = Current client state (buffers, headers, etc...) @@ -926,6 +921,7 @@ pcrs_job *compile_dynamic_pcrs_job_list(const struct client_state *csp, const st {"path", csp->http->path, 1}, {"host", csp->http->host, 1}, {"origin", csp->ip_addr_str, 1}, + {"listen-address", csp->listen_addr_str, 1}, {NULL, NULL, 1} }; @@ -1059,7 +1055,7 @@ char *get_last_url(char *subject, const char *redirect_mode) } if (0 == strcmpic(redirect_mode, "check-decoded-url") && strchr(subject, '%')) - { + { char *url_segment = NULL; char **url_segments; size_t max_segments; @@ -1318,42 +1314,18 @@ struct http_response *redirect_url(struct client_state *csp) * * Function : is_imageurl * - * Description : Given a URL, decide whether it is an image or not, - * using either the info from a previous +image action - * or, #ifdef FEATURE_IMAGE_DETECT_MSIE, and the browser - * is MSIE and not on a Mac, tell from the browser's accept - * header. + * Description : Given a URL, decide whether it should be treated + * as image URL or not. * * Parameters : * 1 : csp = Current client state (buffers, headers, etc...) * - * Returns : True (nonzero) if URL is an image, false (0) + * Returns : True (nonzero) if URL is an image URL, false (0) * otherwise * *********************************************************************/ int is_imageurl(const struct client_state *csp) { -#ifdef FEATURE_IMAGE_DETECT_MSIE - char *tmp; - - tmp = get_header_value(csp->headers, "User-Agent:"); - if (tmp && strstr(tmp, "MSIE") && !strstr(tmp, "Mac_")) - { - tmp = get_header_value(csp->headers, "Accept:"); - if (tmp && strstr(tmp, "image/gif")) - { - /* Client will accept HTML. If this seems counterintuitive, - * blame Microsoft. - */ - return(0); - } - else - { - return(1); - } - } -#endif /* def FEATURE_IMAGE_DETECT_MSIE */ - return ((csp->action->flags & ACTION_IMAGE) != 0); } @@ -1762,6 +1734,7 @@ static void set_privoxy_variables(const struct client_state *csp) { "PRIVOXY_PATH", csp->http->path }, { "PRIVOXY_HOST", csp->http->host }, { "PRIVOXY_ORIGIN", csp->ip_addr_str }, + { "PRIVOXY_LISTEN_ADDRESS", csp->listen_addr_str }, }; for (i = 0; i < SZ(env); i++) @@ -1946,7 +1919,11 @@ static char *execute_external_filter(const struct client_state *csp, * or NULL in case something went wrong. * *********************************************************************/ +#ifdef FUZZ +char *gif_deanimate_response(struct client_state *csp) +#else static char *gif_deanimate_response(struct client_state *csp) +#endif { struct binbuffer *in, *out; char *p; @@ -2044,13 +2021,23 @@ static filter_function_ptr get_filter_function(const struct client_state *csp) * JB_ERR_PARSE otherwise * *********************************************************************/ +#ifdef FUZZ +extern jb_err remove_chunked_transfer_coding(char *buffer, size_t *size) +#else static jb_err remove_chunked_transfer_coding(char *buffer, size_t *size) +#endif { size_t newsize = 0; unsigned int chunksize = 0; char *from_p, *to_p; const char *end_of_buffer = buffer + *size; + if (*size == 0) + { + log_error(LOG_LEVEL_FATAL, "Invalid chunked input. Buffer is empty."); + return JB_ERR_PARSE; + } + assert(buffer); from_p = to_p = buffer; @@ -2313,7 +2300,20 @@ void get_url_actions(struct client_state *csp, struct http_request *http) struct url_actions *b; int i; - init_current_action(csp->action); +#ifdef FEATURE_HTTPS_INSPECTION + if (!csp->http->client_ssl) +#endif + { + /* + * When filtering TLS traffic this function gets called a + * second time after the encrypted headers have been received. + * + * Only initialize the first time. The second time we apply + * the newly set actions on top of the ones that were set + * the first time. + */ + init_current_action(csp->action); + } for (i = 0; i < MAX_AF_FILES; i++) { @@ -2322,13 +2322,16 @@ void get_url_actions(struct client_state *csp, struct http_request *http) return; } +#ifdef FEATURE_CLIENT_TAGS + apply_url_actions(csp->action, http, csp->client_tags, b); +#else apply_url_actions(csp->action, http, b); +#endif } return; } - /********************************************************************* * * Function : apply_url_actions @@ -2338,14 +2341,18 @@ void get_url_actions(struct client_state *csp, struct http_request *http) * Parameters : * 1 : action = Destination. * 2 : http = Current URL - * 3 : b = list of URL actions to apply + * 3 : client_tags = list of client tags + * 4 : b = list of URL actions to apply * * Returns : N/A * *********************************************************************/ -void apply_url_actions(struct current_action_spec *action, - struct http_request *http, - struct url_actions *b) +static void apply_url_actions(struct current_action_spec *action, + struct http_request *http, +#ifdef FEATURE_CLIENT_TAGS + const struct list *client_tags, +#endif + struct url_actions *b) { if (b == NULL) { @@ -2359,6 +2366,12 @@ void apply_url_actions(struct current_action_spec *action, { merge_current_action(action, b->action); } +#ifdef FEATURE_CLIENT_TAGS + if (client_tag_match(b->url, client_tags)) + { + merge_current_action(action, b->action); + } +#endif } } @@ -2466,10 +2479,11 @@ static const struct forward_spec *get_forward_override_settings(struct client_st if (NULL != socks_proxy) { - /* Parse the SOCKS proxy host[:port] */ + /* Parse the SOCKS proxy [user:pass@]host[:port] */ fwd->gateway_port = 1080; parse_forwarder_address(socks_proxy, - &fwd->gateway_host, &fwd->gateway_port); + &fwd->gateway_host, &fwd->gateway_port, + &fwd->auth_username, &fwd->auth_password); http_parent = vec[2]; } @@ -2487,7 +2501,8 @@ static const struct forward_spec *get_forward_override_settings(struct client_st { fwd->forward_port = 8000; parse_forwarder_address(http_parent, - &fwd->forward_host, &fwd->forward_port); + &fwd->forward_host, &fwd->forward_port, + NULL, NULL); } assert (NULL != fwd);