X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=filters.h;h=dd729cf0cc9e9d4744db178af1b47df4a8d9cdbf;hb=6190b0ff666de18129c8c197a4a769fe7c14d622;hp=75da5b1c5973fe63845430eeacc458cee378198f;hpb=ecf27184014de3628fa2aa8ae19722b2806d94e6;p=privoxy.git diff --git a/filters.h b/filters.h index 75da5b1c..dd729cf0 100644 --- a/filters.h +++ b/filters.h @@ -1,6 +1,6 @@ #ifndef FILTERS_H_INCLUDED #define FILTERS_H_INCLUDED -#define FILTERS_H_VERSION "$Id: filters.h,v 1.19 2002/03/26 22:29:54 swa Exp $" +#define FILTERS_H_VERSION "$Id: filters.h,v 1.26 2007/03/13 11:28:43 fabiankeil Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/filters.h,v $ @@ -12,7 +12,7 @@ * `ij_untrusted_url', `intercept_url', `re_process_buffer', * `show_proxy_args', and `trust_url' * - * Copyright : Written by and Copyright (C) 2001 the SourceForge + * Copyright : Written by and Copyright (C) 2001, 2004 the SourceForge * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written @@ -39,6 +39,45 @@ * * Revisions : * $Log: filters.h,v $ + * Revision 1.26 2007/03/13 11:28:43 fabiankeil + * - Fix port handling in acl_addr() and use a temporary acl spec + * copy so error messages don't contain a truncated version. + * - Log size of iob before and after decompression. + * + * Revision 1.25 2007/01/12 15:36:44 fabiankeil + * Mark *csp as immutable for is_untrusted_url() + * and is_imageurl(). Closes FR 1237736. + * + * Revision 1.24 2006/12/29 18:30:46 fabiankeil + * Fixed gcc43 conversion warnings, + * changed sprintf calls to snprintf. + * + * Revision 1.23 2006/11/28 15:19:43 fabiankeil + * Implemented +redirect{s@foo@bar@} to generate + * a redirect based on a rewritten version of the + * original URL. + * + * Revision 1.22 2006/07/18 14:48:46 david__schmidt + * Reorganizing the repository: swapping out what was HEAD (the old 3.1 branch) + * with what was really the latest development (the v_3_0_branch branch) + * + * Revision 1.20.2.2 2004/10/03 12:53:32 david__schmidt + * Add the ability to check jpeg images for invalid + * lengths of comment blocks. Defensive strategy + * against the exploit: + * Microsoft Security Bulletin MS04-028 + * Buffer Overrun in JPEG Processing (GDI+) Could + * Allow Code Execution (833987) + * Enabled with +inspect-jpegs in actions files. + * + * Revision 1.20.2.1 2002/09/25 14:51:51 oes + * Added basic support for OPTIONS and TRACE HTTP methods: + * New function direct_response which handles OPTIONS and + * TRACE requests whose Max-Forwards header field is zero. + * + * Revision 1.20 2002/04/02 14:56:16 oes + * Bugfix: is_untrusted_url() and trust_url() now depend on FEATURE_TRUST, not FEATURE_COOKIE_JAR + * * Revision 1.19 2002/03/26 22:29:54 swa * we have a new homepage! * @@ -213,7 +252,7 @@ struct url_spec; */ #ifdef FEATURE_ACL extern int block_acl(struct access_control_addr *dst, struct client_state *csp); -extern int acl_addr(char *aspec, struct access_control_addr *aca); +extern int acl_addr(const char *aspec, struct access_control_addr *aca); #endif /* def FEATURE_ACL */ extern int match_portlist(const char *portlist, int port); @@ -230,10 +269,10 @@ extern struct http_response *trust_url(struct client_state *csp); * Request inspectors */ #ifdef FEATURE_TRUST -extern int is_untrusted_url(struct client_state *csp); +extern int is_untrusted_url(const struct client_state *csp); #endif /* def FEATURE_TRUST */ #ifdef FEATURE_IMAGE_BLOCKING -extern int is_imageurl(struct client_state *csp); +extern int is_imageurl(const struct client_state *csp); #endif /* def FEATURE_IMAGE_BLOCKING */ /* @@ -254,7 +293,19 @@ extern const struct forward_spec *forward_url(struct http_request *http, struct */ extern char *pcrs_filter_response(struct client_state *csp); extern char *gif_deanimate_response(struct client_state *csp); -extern int remove_chunked_transfer_coding(char *buffer, const size_t size); +extern char *jpeg_inspect_response(struct client_state *csp); +extern size_t remove_chunked_transfer_coding(char *buffer, const size_t size); +extern char *execute_single_pcrs_command(char *subject, const char *pcrs_command, int *hits); +extern char *rewrite_url(char *old_url, const char *pcrs_command); +extern char *get_last_url(char *subject, const char *redirect_mode); + +extern pcrs_job *compile_dynamic_pcrs_job_list(const struct client_state *csp, const struct re_filterfile_spec *b); + +/* + * Handling Max-Forwards: + */ +extern struct http_response *direct_response( struct client_state *csp); + /* * Solaris fix: