X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=filters.h;h=f11f0a32da965b935f72751c1d5110eefb3988b7;hp=80b390c4dff7191eb3bac030850f2c70324bc246;hb=f9888d9c1d0b5b4e082718508532ddaf2ba8759c;hpb=4e320928f3143d290a84f35fb27edc743485baec diff --git a/filters.h b/filters.h index 80b390c4..f11f0a32 100644 --- a/filters.h +++ b/filters.h @@ -1,6 +1,6 @@ -#ifndef _FILTERS_H -#define _FILTERS_H -#define FILTERS_H_VERSION "$Id: filters.h,v 1.8 2001/06/03 19:12:00 oes Exp $" +#ifndef FILTERS_H_INCLUDED +#define FILTERS_H_INCLUDED +#define FILTERS_H_VERSION "$Id: filters.h,v 1.25 2007/01/12 15:36:44 fabiankeil Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/filters.h,v $ @@ -8,13 +8,12 @@ * Purpose : Declares functions to parse/crunch headers and pages. * Functions declared include: * `acl_addr', `add_stats', `block_acl', `block_imageurl', - * `block_url', `url_actions', `domaincmp', `dsplit', - * `filter_popups', `forward_url' + * `block_url', `url_actions', `filter_popups', `forward_url' * `ij_untrusted_url', `intercept_url', `re_process_buffer', * `show_proxy_args', and `trust_url' * - * Copyright : Written by and Copyright (C) 2001 the SourceForge - * IJBSWA team. http://ijbswa.sourceforge.net + * Copyright : Written by and Copyright (C) 2001, 2004 the SourceForge + * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -40,62 +39,82 @@ * * Revisions : * $Log: filters.h,v $ - * Revision 1.8 2001/06/03 19:12:00 oes - * extracted-CGI relevant stuff - * - * Revision 1.8 2001/06/03 11:03:48 oes - * Makefile/in - * - * introduced cgi.c - * - * actions.c: - * - * adapted to new enlist_unique arg format + * Revision 1.25 2007/01/12 15:36:44 fabiankeil + * Mark *csp as immutable for is_untrusted_url() + * and is_imageurl(). Closes FR 1237736. * - * conf loadcfg.c + * Revision 1.24 2006/12/29 18:30:46 fabiankeil + * Fixed gcc43 conversion warnings, + * changed sprintf calls to snprintf. * - * introduced confdir option + * 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. * - * filters.c filtrers.h + * 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) * - * extracted-CGI relevant stuff + * 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. * - * jbsockets.c + * 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. * - * filled comment + * 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 * - * jcc.c + * Revision 1.19 2002/03/26 22:29:54 swa + * we have a new homepage! * - * support for new cgi mechansim + * Revision 1.18 2002/03/25 22:12:45 oes + * Added fix for undefined INADDR_NONE on Solaris by Bart Schelstraete * - * list.c list.h + * Revision 1.17 2002/03/24 13:25:43 swa + * name change related issues * - * functions for new list type: "map" - * extended enlist_unique + * Revision 1.16 2002/01/17 21:01:02 jongfoster + * Moving all our URL and URL pattern parsing code to urlmatch.c. * - * miscutil.c .h - * introduced bindup() + * Revision 1.15 2001/10/10 16:44:16 oes + * Added match_portlist function * - * parsers.c parsers.h + * Revision 1.14 2001/10/07 15:41:40 oes + * Added prototype for remove_chunked_transfer_coding * - * deleted const struct interceptors + * Revision 1.13 2001/07/30 22:08:36 jongfoster + * Tidying up #defines: + * - All feature #defines are now of the form FEATURE_xxx + * - Permanently turned off WIN_GUI_EDIT + * - Permanently turned on WEBDAV and SPLIT_PROXY_ARGS * - * pcrs.c - * added FIXME + * Revision 1.12 2001/07/29 19:01:11 jongfoster + * Changed _FILENAME_H to FILENAME_H_INCLUDED. + * Added forward declarations for needed structures. * - * project.h + * Revision 1.11 2001/07/13 14:00:18 oes + * - Introduced gif_deanimate_response + * - Renamed re_process_buffer to pcrs_filter_response + * - Removed all #ifdef PCRS * - * added struct map - * added struct http_response - * changes struct interceptors to struct cgi_dispatcher - * moved HTML stuff to cgi.h + * Revision 1.10 2001/06/29 13:29:01 oes + * Cleaned up and updated to reflect the changesin + * filters.c * - * re_filterfile: + * Revision 1.9 2001/06/07 23:10:53 jongfoster + * Replacing struct gateway with struct forward_spec * - * changed - * - * showargs.c - * NO TIME LEFT + * Revision 1.8 2001/06/03 19:12:00 oes + * extracted-CGI relevant stuff * * Revision 1.7 2001/05/31 21:21:30 jongfoster * Permissionsfile / actions file changes: @@ -213,35 +232,84 @@ extern "C" { #endif -#ifdef ACL_FILES + +struct access_control_addr; +struct client_state; +struct http_request; +struct http_response; +struct current_action_spec; +struct url_actions; +struct url_spec; + + +/* + * ACL checking + */ +#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); -#endif /* def ACL_FILES */ +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); + +/* + * Interceptors + */ +extern struct http_response *block_url(struct client_state *csp); +extern struct http_response *redirect_url(struct client_state *csp); +#ifdef FEATURE_TRUST +extern struct http_response *trust_url(struct client_state *csp); +#endif /* def FEATURE_TRUST */ -extern char *block_url(struct http_request *http, struct client_state *csp); -#ifdef TRUST_FILES -extern char *trust_url(struct http_request *http, struct client_state *csp); -#endif /* def TRUST_FILES */ -#ifdef IMAGE_BLOCKING -extern int block_imageurl(struct http_request *http, struct client_state *csp); -#endif /* def IMAGE_BLOCKING */ +/* + * Request inspectors + */ +#ifdef FEATURE_TRUST +extern int is_untrusted_url(const struct client_state *csp); +#endif /* def FEATURE_TRUST */ +#ifdef FEATURE_IMAGE_BLOCKING +extern int is_imageurl(const struct client_state *csp); +#endif /* def FEATURE_IMAGE_BLOCKING */ +/* + * Determining applicable actions + */ extern void url_actions(struct http_request *http, struct client_state *csp); extern void apply_url_actions(struct current_action_spec *action, struct http_request *http, struct url_actions *b); - +/* + * Determining parent proxies + */ extern const struct forward_spec *forward_url(struct http_request *http, struct client_state *csp); -extern struct url_spec dsplit(char *domain); -extern int domaincmp(struct url_spec *pattern, struct url_spec *fqdn); +/* + * Content modification + */ +extern char *pcrs_filter_response(struct client_state *csp); +extern char *gif_deanimate_response(struct client_state *csp); +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); + +/* + * Handling Max-Forwards: + */ +extern struct http_response *direct_response( struct client_state *csp); + -#ifdef PCRS -extern char *re_process_buffer(struct client_state *csp); -#endif /* def PCRS */ +/* + * Solaris fix: + */ +#ifndef INADDR_NONE +#define INADDR_NONE -1 +#endif -/* Revision control strings from this header and associated .c file */ +/* + * Revision control strings from this header and associated .c file + */ extern const char filters_rcs[]; extern const char filters_h_rcs[]; @@ -249,7 +317,7 @@ extern const char filters_h_rcs[]; } /* extern "C" */ #endif -#endif /* ndef _FILTERS_H */ +#endif /* ndef FILTERS_H_INCLUDED */ /* Local Variables: