X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=default.action.master;h=fcd3e8409abc348dc3d8e70492320d8f9d0ad202;hp=dd992faf15e58f1caa060aad4c1855ed59c5a225;hb=806ef4d428babf1580bf8ea21e742740f4f4ebbd;hpb=05b7e519dde60cf84f3d713ba6782687c805d9e9 diff --git a/default.action.master b/default.action.master index dd992faf..fcd3e840 100644 --- a/default.action.master +++ b/default.action.master @@ -9,7 +9,7 @@ # # File : $Source: /cvsroot/ijbswa/current/default.action.master,v $ # -# $Id: default.action.master,v 1.92 2007/09/09 15:10:51 fabiankeil Exp $ +# $Id: default.action.master,v 1.103 2007/12/13 00:38:01 hal9 Exp $ # # Requires : This version requires Privoxy v3.0.7 or later due to # syntax changes. @@ -122,7 +122,7 @@ # Additionally, there are wildcards that you can use in the domain names # themselves. They work pretty similar to shell wildcards: "*" stands for # zero or more arbitrary characters, "?" stands for one, and you can define -# charachter classes in square brackets and they can be freely mixed: +# character classes in square brackets and they can be freely mixed: # # ad*.example.com # matches adserver.example.com, ads.example.com, etc but not sfads.example.com @@ -158,7 +158,7 @@ # will match only documents whose path starts with PaTtErN in exactly this # capitalization. # -# Partially case-sensetive and partially case-insensitive patterns are +# Partially case-sensitive and partially case-insensitive patterns are # possible, but the rules about splitting them up are extremely complex # - see the PCRE documentation for more information. # @@ -210,6 +210,13 @@ # # hide-tor-exit-notation: Removes the Tor exit node notation in Host and Referer headers # +# +client-header-tagger{string} +# Block requests based on their headers. Client headers to which this +# action applies are filtered on-the-fly through the specified regular +# expression based substitutions, the result is used as a tag. +# Client-header taggers are the first actions that are executed and their +# tags can be used to control every other action. +# # +content-type-overwrite # Replaces the "Content-Type:" HTTP server header, so that unwanted # download menus will not pop up, or changes the browser's rendering mode. @@ -252,10 +259,10 @@ # http://some.place/some_script?http://some.where-else # # Sometimes, there are even multiple consecutive redirects encoded -# in the URL. These redirections via scripts make your web browing +# in the URL. These redirections via scripts make your web browsing # more traceable, since the server from which you follow such a link # can see where you go to. Apart from that, valuable bandwidth and -# time is wasted, while your browser aks the server for one redirect +# time is wasted, while your browser asks the server for one redirect # after the other. Plus, it feeds the advertisers. # # The +fast-redirects{check-decoded-url} option enables interception of @@ -419,6 +426,14 @@ # html-to-xml: Changes the Content-Type header from html to xml # xml-to-html: Changes the Content-Type header from xml to html # +# +server-header-tagger{content-type} +# Server headers to which this action applies are filtered on-the-fly +# through the specified regular expression based substitutions, the result +# is used as a tag. Server-header taggers are executed before all other +# header actions that modify server headers. Their tags can be used to +# control all of the other server-header actions, the content filters and +# the crunch actions (redirect and block). +# # +session-cookies-only # If the website sets cookies, make sure they are erased when you exit # and restart your web browser. This makes profiling cookies useless, @@ -566,7 +581,12 @@ allow-ads = -block -filter{banners-by-size} -filter{banners-by-link} #MASTER# DONT-VERIFY (generic) ad*. .*ads. -.ad. +#MASTER# REMARKS: removed .ad. 2007-12-18 HB +#MASTER# REMARKS: Modifications per Actionsfile feedback item #1807613 +.ad.?. +.ad.[a-ik-z][a-oq-z]. +.ad.jp.*. +.ad.???*. #MASTER# PROBLEM URL: http://alternativos.iw-advertising.com/ .*advert*. *banner*. @@ -771,6 +791,9 @@ linuxinsider.com/images/sda/ #MASTER# REMARKS: Tracking JavaScript #MASTER# BLOCK-REFERRER: http://www.hants.gov.uk/record-office/ [a-z].clickdensity.com +#MASTER# REMARKS: Obnoxious "widget" adverts +#MASTER# BLOCK-REFERRER: http://www.quickonlinetips.com/archives/2007/08/nokia-offers-free-bl-5c-battery-replacement-for-overheating/ +.widgetbucks.com #---------------------------------------------------------------------------- # Misc Web-bugs, JS and just plain Junk. Images here aren't normal images. @@ -842,7 +865,21 @@ stats./.*\.gif\? #MASTER# COMMENT: JS pop-ups spa.snap.com/ #MASTER# BLOCK-REFERRER: http://www.gamefaqs.com/computer/doswin/game/914819.html 12/18/06 -dw.com.com/clear/ +#MASTER# COMMENT: user tracking, and run-away assorted 'junk' +#MASTER# BLOCK-REFERRER: http://formwood.com 2007-11-12 +.insitemetrics.com/ +#MASTER# COMMENT: user tracking, and assorted 'junk' +#MASTER# BLOCK-REFERRER: http://blogblog.com 2007-11-12 +.extreme-dm.com/ +#MASTER# COMMENT: user tracking, and assorted 'junk' +#MASTER# BLOCK-REFERRER: http://www.schillmania.com 2007-11-12 +stats.reinvigorate.net/ +#MASTER# COMMENT: user tracking, and assorted 'junk' +#MASTER# BLOCK-REFERRER: http://wordpress.com 2007-11-12 +.getclicky.com/ +#MASTER# COMMENT: user tracking, and assorted 'junk' +#MASTER# BLOCK-REFERRER: http://infoworld.com 2007-11-12 +.quantserve.com #---------------------------------------------------------------------------- # JavaScripts and Texts for ad and popup generation @@ -1100,6 +1137,9 @@ insightxe./data/ rss.slashdot.org/~a/Slashdot/slashdot\? #MASTER# PROBLEM URL: rss.slashdot.org/~r/Slashdot/slashdot/~4/102113044 rss.slashdot.org/~r/Slashdot/slashdot/~4/ +#MASTER# BLOCK-REFERRER: http://www.isys.ucl.ac.be/bchi/research/Kwaresmi.htm +#MASTER# REMAKRKS: Actionsfile feedback item #1849627 2007-12-12 +[a-z][0-9].nedstatbasic.net/ #---------------------------------------------------------------------------- # Specific counters (see above for generic patterns) @@ -1111,9 +1151,6 @@ s*.sitemeter.com/(meter|js/counter.js) fastcounter.bcentral.com/ #MASTER# BLOCK-REFERRER: http://osnews.com/ 10/19/06 bilbo.counted.com/ -#MASTER# BLOCK-REFERRER: http://enciclopedia.us.es/ -#MASTER# REMAKRKS: Not found, but leaving 10/19/06 -#[a-z][0-9].nedstatbasic.net/ #---------------------------------------------------------------------------- # On-site ads and other single sources: @@ -1150,6 +1187,8 @@ smartad.*.*.* #MASTER# BLOCK-REFERRER: http://www.heise.de/ 10/08/06 #MASTER# BLOCK-REFERRER: http://www.spiegel.de/ /RealMedia/ads/ +#MASTER# REMARKS: Variation 2007-11-12 +/RealMediaAds/ #MASTER# BLOCK-REFERRER: http://www.powerdvd.com 12/28/06 per SF tracker /top\.php\?d=.*\.[a-z]{2,5} #MASTER# REMARKS: Actionsfile feedback item #1764161 2007-07-31 @@ -1267,7 +1306,9 @@ adbusters.org/ #MASTER# UNBLOCK-REFERRER: http://www.cels.org/db/keep-track.pl?cat:1 09/11/06 cels.org/.*track #MASTER# UNBLOCK-REFERRER: http://www.nic.ad.jp/ See http://jprs.co.jp/en/jpdomain.html 09/11/06 -.nic.ad.jp +#MASTER# REMARKS: 2007-10-04, increase scope per Actionsfile feedback item #1807613 +#.nic.ad.jp +#MASTER# REMARKS removed .ad.jp per Actionsfile feedback item #1807613 #MASTER# UNBLOCK-REFERRER: http://www.flickr.com/photo_zoom.gne?id=32594118&size=l 09/11/06 #MASTER# REMARKS: creativecommons.org worthwhile organization 09/11/06 /(.*/)?somerights20.gif @@ -1703,22 +1744,11 @@ schneegans.de/sv/\?url=referer #MASTER# REMARKS: 09/12/06 Art site, and ad-free .rubberslug.com -#---------------------------------------------------------------------------- -# These sites are so abusive that we need to kill all JS event bindings (and -# probably a break a lot along the way) -#---------------------------------------------------------------------------- -#MASTER# REMARKS: Surely this has changed. Commenting out 10/15/06 HB -#{+filter{js-radical}} -##MASTER# PROBLEM-URL: http://www.planetspiele.de/ -#.planetspiele.de -#216.12.219.40 - #---------------------------------------------------------------------------- # The "site-specifics" filter has special cures for problems found here: #---------------------------------------------------------------------------- #MASTER# REMARKS: This section NOT checked 10/15/06 HB. -{+filter{site-specifics} +prevent-compression} -#MASTER# REMARKS: +prevent-compression in case its off as a default setting. +{+filter{site-specifics}} #MASTER# PROBLEM-URL: http://www.spiegel.de/static/js/flash-plugin.js .spiegel.de/static/js/flash-plugin\.js #MASTER# PROBLEM-URL: http://www.quelle-bausparkasse.de/ @@ -1815,7 +1845,7 @@ www.skweezer.net/bloglines { +prevent-compression } .compusa.com/ -{+filter{tiny-textforms} +prevent-compression} +{+filter{tiny-textforms}} .sourceforge.net/tracker {+downgrade-http-version} @@ -1823,13 +1853,6 @@ www.skweezer.net/bloglines #MASTER# REMARKS: This is work-around for CUPS http configuration. :631 -#MASTER# REMARKS: What is this? Something special? -#{ -crunch-outgoing-cookies \ -# -crunch-incoming-cookies \ -# +session-cookies-only \ -#} -#www.versiontracker.com/ - #MASTER# REMARKS: If Privoxy is disabled, requests for config.privoxy.org/ #MASTER# REMARKS: reach privoxy.org and are redirected to privoxy.org/config. #MASTER# REMARKS: The instructions tell the user to reload the page with @@ -1841,8 +1864,10 @@ www.skweezer.net/bloglines #MASTER# REMARKS: Privoxy's "unsafe" CGI pages check the referrer #MASTER# REMARKS: to make sure the user reached them intentionally. -#MASTER# REMARKS: If the referrer is blocked, CGI editing is impossible. -{-hide-referrer} +#MASTER# REMARKS: Disabling hide-referrer so there's a referrer left to check. +#MASTER# REMARKS: Disabling fast-redirects because if CGI crunching gets +#MASTER# REMARKS: enabled it could be leveraged to fool the referrer check. +{-hide-referrer -fast-redirects} p.p/ config.privoxy.org/