X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=default.filter;h=46408c08bb0cfd64221a13cc3b8039bb3ccea5cb;hp=e861098b4728cda59d06a9a34525658a61dbce78;hb=777f23fd554b0811d16bc2323ced6fe9dc0cff72;hpb=2e343b18ca042f08ec6c298c968f5dac9a8e8d6c diff --git a/default.filter b/default.filter index e861098b..46408c08 100644 --- a/default.filter +++ b/default.filter @@ -1,44 +1,42 @@ -# ******************************************************************** +################################################################################# # # File : $Source: /cvsroot/ijbswa/current/default.filter,v $ # -# $Id: default.filter,v 1.36 2007/02/05 16:47:31 fabiankeil Exp $ +# $Id: default.filter,v 1.91 2014/06/20 09:46:13 fabiankeil Exp $ # # Purpose : Rules to process the content of web pages # -# Copyright : Written by and Copyright (C) 2001 - 2007 the +# Copyright : Written by and Copyright (C) 2001-2014 the # Privoxy team. http://www.privoxy.org/ # -# We value your feedback. However, to provide you with the best support, -# please note: -# -# * Use the support forum to get help: -# http://sourceforge.net/tracker/?group_id=11118&atid=211118 -# * Submit bugs only thru our bug forum: -# http://sourceforge.net/tracker/?group_id=11118&atid=111118 -# Make sure that the bug has not already been submitted. Please try -# to verify that it is a Privoxy bug, and not a browser or site -# bug first. If you are using your own custom configuration, please -# try the stock configs to see if the problem is a configuration -# related bug. And if not using the latest development snapshot, -# please try the latest one. Or even better, CVS sources. -# * Submit feature requests only thru our feature request forum: -# http://sourceforge.net/tracker/?atid=361118&group_id=11118&func=browse -# -# For any other issues, feel free to use the mailing lists: -# http://sourceforge.net/mail/?group_id=11118 -# -# Anyone interested in actively participating in development and related -# discussions can join the appropriate mailing list here: -# http://sourceforge.net/mail/?group_id=11118. Archives are available -# here too. -# +# This program is free software; you can redistribute it +# and/or modify it under the terms of the GNU General +# Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at +# your option) any later version. +# +# This program is distributed in the hope that it will +# be useful, but WITHOUT ANY WARRANTY; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public +# License for more details. +# +# The GNU General Public License should be included with +# this file. If not, you can view it at +# http://www.gnu.org/copyleft/gpl.html +# or write to the Free Software Foundation, Inc., 59 +# Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# ################################################################################# # # Syntax: # -# Filters start with a line "FILTER: name description". They are then referrable -# from the actionsfile with +filter{name} +# Generally filters start with a line like "FILTER: name description". +# They are then referrable from the actionsfile with +filter{name} +# +# FILTER marks a filter as content filter, other filter +# types are CLIENT-HEADER-FILTER, CLIENT-HEADER-TAGGER, +# SERVER-HEADER-FILTER and SERVER-HEADER-TAGGER. # # Inside the filters, write one Perl-Style substitution (job) per line. # Jobs that precede the first FILTER: line are ignored. @@ -46,43 +44,56 @@ # For Details see the pcrs manpage contained in this distribution. # (and the perlre, perlop and pcre manpages) # -# Note that you are free to choose the delimter as you see fit. +# Note that you are free to choose the delimiter as you see fit. # -# Note2: In addidion to the Perl options gimsx, the following nonstandard +# Note2: In addition to the Perl options gimsx, the following nonstandard # options are supported: # # 'U' turns the default to ungreedy matching. Add ? to quantifiers to # switch back to greedy. +# # 'T' (trivial) prevents parsing for backreferences in the substitute. # Use if you want to include text like '$&' in your substitute without # quoting. +# +# 'D' (Dynamic) allows the use of variables. Supported variables are: +# $host, $origin (the IP address the request came from), $path and $url. +# +# Note that '$' is a bad choice as delimiter for dynamic filters as you +# might end up with unintended variables if you use a variable name +# directly after the delimiter. Variables will be resolved without +# escaping anything, therefore you also have to be careful not to chose +# delimiters that appear in the replacement text. For example '<' should +# be save, while '?' will sooner or later cause conflicts with $url. # ################################################################################# ################################################################################# # -# js-annoyances: Get rid of particularly annoying JavaScript abuse +# js-annoyances: Get rid of particularly annoying JavaScript abuse. # ################################################################################# -FILTER: js-annoyances Get rid of particularly annoying JavaScript abuse +FILTER: js-annoyances Get rid of particularly annoying JavaScript abuse. # Note: Most of these jobs would be safer if restricted to a # +isU -s+([^\w\s.]\s*)((window|this|parent)\.)?open\s*\(+$1PrivoxyWindowOpen(+ig +s@([^\w\s.]\s*)((?:map)?(window|this|parent)\.?)?open\s*\(@$1PrivoxyWindowOpen(@ig s+([^'"]\s*)(?!\s*(\\n|'|"))+$1+iU ################################################################################## # -# all-popups: Kill all popups in JavaScript and HTML +# all-popups: Kill all popups in JavaScript and HTML. # ################################################################################# -FILTER: all-popups Kill all popups in JavaScript and HTML - -s/((\W\s*)(window|this|parent)\.)open\s*\\?\(/$1concat(/ig # JavaScript -s/\starget\s*=\s*(['"]?)_?(blank|new)\1?/ notarget/ig # HTML +FILTER: all-popups Kill all popups in JavaScript and HTML. +s@((\W\s*)(?:map)?(window|this|parent)\.?)open\s*\\?\(@$1concat(@ig # JavaScript +#s/\starget\s*=\s*(['"]?)_?(blank|new)\1?/ notarget/ig # HTML +s/\starget\s*=\s*(['"]?)_?(blank|new)\1?/ /ig # (X)HTML ################################################################################## # -# img-reorder: Reorder attributes in tags to make the banners-by-* filters more effective +# img-reorder: Reorder attributes in tags to make the banners-by-* filters more effective. # ################################################################################# -FILTER: img-reorder Reorder attributes in tags to make the banners-by-* filters more effective +FILTER: img-reorder Reorder attributes in tags to make the banners-by-* filters more effective. # In the first step src is moved to the start, then width is moved to the second -# place to guarantee an order of src, width, height. +# place to guarantee an order of src, width, height. Also does some white-space +# normalization. +# # This makes banners-by-size more effective and allows both banners-by-size # and banners-by-link to preserve the original image URL in the title attribute. -s|]*) src\s*=\s*(['"])([^>\\\2]+)\2|]*) src\s*=\s*([^'">\\\s]+)|]*)\ssrc\s*=\s*(['"])([^>'" ]+)\2|]*)\ssrc\s*=\s*([^'">\\\s]+)|]+height)\s*=\s*|$1=|sig -s|\\\\2]*\2\|[^'">\\\s]+?))([^>]*)\s+width\s*=\s*(["']?)(\d+?)\4|'" ]*\2\|[^'">\\\s]+?))([^>]*)\s+width\s*=\s*((["']?)\d+?\5)(?=[\s>])|\\\\2]*\2\|[^'">\\\s]+?))([^>]*)\s+width\s*=\s*(["']?)(\ # Note2: Use img-reorder before this filter to ensure maximum matching success # ################################################################################# -FILTER: banners-by-size Kill banners by size +FILTER: banners-by-size Kill banners by size. # 88*31 s@\\\1\s]+)\1)?[^>]*?(width=(['"]?)88\4)[^>]*?(height=(['"]?)31\6)[^>]*?(?=/?>)@\ @@ -265,10 +279,10 @@ s@\\\1\s]+)\1)?[^>]*?(width=(['"]?)336\4)[^>]*?(h ################################################################################# # -# banners-by-link: Kill banners by their links to known clicktrackers (Experimental) +# banners-by-link: Kill banners by their links to known clicktrackers (Experimental). # ################################################################################# -FILTER: banners-by-link Kill banners by their links to known clicktrackers +FILTER: banners-by-link Kill banners by their links to known clicktrackers. # Common case with width and height attributes: # @@ -276,33 +290,34 @@ s@\1\s]*?(?:\ adclick # See www.dn.se \ | advert # see dict.leo.org \ | atwola\.com/(?:link|redir) # see www.cnn.com \ -| /jump/ # redirs for doublecklick.net ads \ -| tracker | counter # common \ +| doubleclick\.net/jump/ # redirs for doublecklick.net ads \ +| counter # common \ +| (?\1\s]*)\1[^>]*>\s*\\\3\s]+)\3)?[^>]*((?:width|height)\s*=\s*(['"]?)\d+?\6)[^>]*((?:width|height)\s*=\s*(['"]?)\d+?\8)[^>]*?(?=/?>)\ @\1\s]*?(?:ad(?:click|vert)|atwola\.com/(?:link|redir)|doubleclick\.net/jump/|tracker|counter|adlog\.pl)[^>\1\s]*)\1[^>]*>\s*\\\3\s]+)\3)?[^>]*?(?=/?>)@\1\s]*?(?:ad(?:click|vert)|atwola\.com/(?:link|redir)|doubleclick\.net/jump/|(?\1\s]*)\1[^>]*>\s*\\\3\s]+)\3)?[^>]*?(?=/?>)@]*\s(?:width|height)\s*=\s*['"]?[01](?=\D)[^>]*\s(?:width|height)\s*=\s*['"]?[01](?=\D)[^>]*?>@@siUg ################################################################################# # -# tiny-textforms: Extend those tiny textareas up to 40x80 and kill the hard wrap +# tiny-textforms: Extend those tiny textareas up to 40x80 and kill the hard wrap. # ################################################################################# -FILTER: tiny-textforms Extend those tiny textareas up to 40x80 and kill the hard wrap +FILTER: tiny-textforms Extend those tiny textareas up to 40x80 and kill the hard wrap. s/(]*?)(?:\s*(?:rows|cols)=(['"]?)\d+\2)+/$1 rows=$2\40$2 cols=$2\80$2/ig s/(]*?)wrap=(['"]?)hard\2/$1/ig @@ -310,19 +325,19 @@ s/(]*?)wrap=(['"]?)hard\2/$1/ig ################################################################################# # -# jumping-windows: Prevent windows from resizing and moving themselves +# jumping-windows: Prevent windows from resizing and moving themselves. # ################################################################################# -FILTER: jumping-windows Prevent windows from resizing and moving themselves +FILTER: jumping-windows Prevent windows from resizing and moving themselves. s/(?<=[\W])(?:window|this|self)\.(?:move|resize)(?:to|by)\(/''.concat(/ig ################################################################################# # -# frameset-borders: Give frames a border, make them resizable and scrollable +# frameset-borders: Give frames a border, make them resizable and scrollable. # ################################################################################# -FILTER: frameset-borders Give frames a border and make them resizable +FILTER: frameset-borders Give frames a border and make them resizable. s/(]*)framespacing=(['"]?)(no|0)\2/$1/igU s/(]*)frameborder=(['"]?)(no|0)\2/$1/igU @@ -332,6 +347,15 @@ s/(]*)frameborder=(['"]?)(no|0)\2/$1/igU s/(]*)scrolling=(['"]?)(no|0)\2/$1/igU +################################################################################# +# +# iframes: Remove all detected iframes. Should only be enabled for +# individual sites after testing that the iframes are optional. +# +################################################################################# +FILTER: iframes Removes all detected iframes. Should only be enabled for individual sites. +s@@@Uisg + ################################################################################# # @@ -343,7 +367,7 @@ s/(]*)scrolling=(['"]?)(no|0)\2/$1/igU # John Walker -- January 1998, http://www.fourmilab.ch/webtools/demoroniser # ################################################################################# -FILTER: demoronizer Fix MS's non-standard use of standard charsets +FILTER: demoronizer Fix MS's non-standard use of standard charsets. s/(&\#[0-2]\d\d)\s/$1; /g # per Robert Lynch: http://slate.msn.com//?id=2067547, just a guess. @@ -372,11 +396,11 @@ s/\x9B/>/g # 155 ################################################################################# # -# shockwave-flash: Kill embedded Shockwave Flash objects +# shockwave-flash: Kill embedded Shockwave Flash objects. # Note: Better just block "/.*\.swf$"! # ################################################################################# -FILTER: shockwave-flash Kill embedded Shockwave Flash objects +FILTER: shockwave-flash Kill embedded Shockwave Flash objects. s|]*macromedia.*||sigU s|]*(application/x-shockwave-flash\|\.swf).*>(.*)?||sigU @@ -384,10 +408,10 @@ s|]*(application/x-shockwave-flash\|\.swf).*>(.*)?|