X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=default.action.master;h=fef6f7b2a38afa91565ea3330df2dfb844fee80a;hp=e594159f3b0b1605f56fa4d06d0e4c442aab7efa;hb=89c571890a7f2ba82241d297abb5bdc462f21799;hpb=2e5779bff8ecebaa2b76dfa56cf7ab136fd26388 diff --git a/default.action.master b/default.action.master index e594159f..fef6f7b2 100644 --- a/default.action.master +++ b/default.action.master @@ -9,9 +9,9 @@ # # File : $Source: /cvsroot/ijbswa/current/default.action.master,v $ # -# $Id: default.action.master,v 1.147 2008/09/20 10:11:49 fabiankeil Exp $ +# $Id: default.action.master,v 1.161 2009/01/14 21:50:58 fabiankeil Exp $ # -# Requires : This version requires Privoxy v3.0.9 or later due to +# Requires : This version requires Privoxy v3.0.11 or later due to # syntax changes. # # Purpose : Default actions file, see @@ -19,7 +19,7 @@ # This file is subject to periodic updating. Local exceptions # and enhancements are better placed in user.action. # -# Copyright : Written by and Copyright (C) 2001-2008 the +# Copyright : Written by and Copyright (C) 2001-2009 the # Privoxy team. http://www.privoxy.org/ # # Note: Updated versions of this file will be made available from time @@ -551,15 +551,75 @@ myfilters = +filter{html-annoyances} +filter{js-annoyances} +filter{all-popups # allow-ads = -block -filter{banners-by-size} -filter{banners-by-link} -############################################################################# -# Defaults -############################################################################# +################ +# +# Cautious settings -- safe for all sites, but offer little privacy protection +# +{ \ ++change-x-forwarded-for{block} \ ++hide-from-header{block} \ ++set-image-blocker{pattern} \ +} +standard.Cautious + +################ +# +# Medium settings -- safe for most sites, with reasonable protection/damage tradeoff +# { \ +change-x-forwarded-for{block} \ ++deanimate-gifs{last} \ ++filter{refresh-tags} \ ++filter{img-reorder} \ ++filter{banners-by-size} \ ++filter{webbugs} \ ++filter{jumping-windows} \ ++filter{ie-exploits} \ +hide-from-header{block} \ ++hide-referrer{conditional-block} \ ++session-cookies-only \ +set-image-blocker{pattern} \ } -/ # Match all URLs +standard.Medium + +################ +# +# Advanced settings -- reasonable privacy protection but +# require some exceptions for trusted sites, most likely +# because of cookies or SSL. Also testing ground for +# new options. +# +# CAUTION: These settings can still be subverted by a +# misconfigured client that executes code from untrusted +# sources. +# +{ \ ++change-x-forwarded-for{block} \ ++client-header-tagger{css-requests} \ ++client-header-tagger{image-requests} \ ++crunch-if-none-match \ ++crunch-outgoing-cookies \ ++crunch-incoming-cookies \ ++deanimate-gifs{last} \ ++fast-redirects{check-decoded-url} \ ++filter{html-annoyances} \ ++filter{content-cookies} \ ++filter{refresh-tags} \ ++filter{img-reorder} \ ++filter{banners-by-size} \ ++filter{banners-by-link} \ ++filter{webbugs} \ ++filter{jumping-windows} \ ++filter{frameset-borders} \ ++filter{quicktime-kioskmode} \ ++hide-if-modified-since{-60} \ ++hide-from-header{block} \ ++hide-referrer{conditional-block} \ ++limit-connect{,} \ ++overwrite-last-modified{randomize} \ ++set-image-blocker{pattern} \ +} +standard.Advanced ############################################################################# # These extensions belong to images: @@ -674,6 +734,15 @@ support./(.*/)?track ############################################################################# # Site-specific block patterns; ############################################################################# +{+block{Domain parking site}} +#MASTER# BLOCK-REFERRER: http://www.inetcat.org +# Blocked URL = http://www.sedoparking.com/www.inetcat.org +.sedoparking.com/ +# Blocked URL = http://landing.trafficz.com/index.php?domain=www.inetcat.org +landing.trafficz.com/ +# Blocked URL = http://www.searchnut.com/?domain=www.inetcat.org +.searchnut.com/\?domain + {+block{Site-specific block pattern matches.}} #MASTER# BLOCK-REFERRER: http://www.brooksbrothers.com/ 10/18/06 #MASTER# BLOCK-REFERRER: http://www.autodesk.com/ @@ -818,7 +887,6 @@ static.lycos-europe.net # Blocked URL = http://clk.atdmt.com/ .atdmt.com/ - #---------------------------------------------------------------------------- # Misc Web-bugs, JS and just plain Junk. Images here aren't normal images. #---------------------------------------------------------------------------- @@ -1109,6 +1177,9 @@ img.directtrack.com #MASTER# BLOCK-REFERRER: http://www.thinkbroadband.com/news/3621-complaint-about-orange-broadband-advertising-upheld.html # URL = http://eas.apm.emediate.eu/media.5/1/1228/19193/ACT1215_120x600_v3.gif .emediate.eu/ +# URL = http://feedads.googleadservices.com/~a/dPlpGU767u4D4kVO8EGuUlnf1Q0/i +# URL = http://feedads.googleadservices.com/~at/EpX-FnAXxwdaBSq-GRze37-rG0M/i +.googleadservices.com/~ #---------------------------------------------------------------------------- # Cross-site user tracking @@ -1193,6 +1264,8 @@ rss.slashdot.org/~r/Slashdot/slashdot/~4/ # Blocked URL = http://feeds.feedburner.com/~r/PCLoadLetter/~4/270448381 #MASTER# REMAKRKS: This seem to be a common pattern for web bugs in feedburner feeds. feeds.feedburner.com/~r/.*/~4/ +# Blocked URL = http://feedproxy.google.com/~r/DilbertDailyStrip/~4/y_kXD1z1HO0 +feedproxy.google.com/~r/.*/~4/ # Blocked URL = http://feeds.feedburner.com/~a/DilbertDailyStrip?a=Ebzxel #MASTER# REMAKRKS: This looks like a pattern as well, maybe we should block feeds.feedburner.com/~a/ here. feeds.feedburner.com/~a/DilbertDailyStrip\? @@ -1461,6 +1534,9 @@ switch.atdmt.com/action/ .wikimedia.org/ # URL = http://en.wikipedia.org/wiki/Advertisement .wikipedia.org/ +#MASTER# REMARKS Actionsfile feedback item #2299717 2008-11-16 +# URL = http://en.wiktionary.org/wiki/advertisement +.wiktionary.org/ # URL = http://curl.haxx.se/docs/adv_20070710.html .haxx.se/docs/adv_ # URL = http://www.google.com/adsense/ @@ -1494,6 +1570,23 @@ fritz.box/ .adobe.com # URL = http://qa.debian.org/popcon.php qa.debian.org/popcon\.php +#MASTER# REMARKS: Support Requests item #2432535 2008-12-16 +# URL = http://www.mta.info/bandt/traffic/advmain.htm +.mta.info/.*advmain.htm$ +#MASTER# REMARKS: We also use this as a light character class test, therefore the additional URL directives. +# URL = http://www.proaurum.de/bannerA2/image/pro_master_r3_01_04.gif +# URL = http://www.proaurum.de/bannerA1/image/limitorder2.gif +# URL = http://www.proaurum.de/bannerA3/image/pro_master_r5_banken_01_01+.gif +# URL = http://www.proaurum.de/bannerB2/image/pro_banner_mitte.gif +# URL = http://www.proaurum.de/bannerB1_/image/pro_banner_links.gif +# URL = http://www.proaurum.de/bannerC1/image/partner1.png +.proaurum.de/banner[ABC]\d_?/ +# URL = http://www.goldmoney.com/en/images/home/banner_r4_c1.gif +.goldmoney.com/ +#MASTER# REMARKS: Actionsfile feedback item #2017126 2008-07-13 +#MASTER# REMARKS: The dutch newspaper site of Algemeen Dagblad (http://www.ad.nl) is blocked +# URL = http://www.ad.nl/ +.ad.nl/ ############################################################################# # Site-specific special rules: @@ -1661,6 +1754,12 @@ view.samurajdata.se/ps\.php\?url= #MASTER# REMARKS: While this is a redirect, the token isn't part of the URL redirected to. # URL = http://www.amazon.com/gp/redirect.html/ref=cm_plog_item_link/105-3659773-0844420?ie=UTF8&location=http%3A%2F%2Fjoltawards.com%2F2007%2F&token=A07736D870C02EF10CB13BCC8A33C302F689BBBA .amazon.com/gp/redirect.html/.*location.*&token +# URL = http://en.groundspring.org/EmailNow/pub.php?module=WebSignup&cmd=thankyou&gotoUrl=http%3A%2F%2Fwww.freebsdfoundation.org&gotoText=Return+to+Home+Page&listNames=The+FreeBSD+Foundation+Mailing+List +.groundspring.org/ +# URL = http://www1.landsend.de/pp/undefined/images/error.gif?onerr=true&ts=1227969386837&file=http%3A//s7.landsend.com/is-viewers/dhtml/include/sj_textloader.js%3Fver%3Dle.1&line=0&msg=Script%20error.&sid= +.landsend.de/ +# URL = http://www.youtube.com/swf/l.swf?swf=http%3A//s.ytimg.com/yt/swf/cps-vfl68942.swf&video_id=2cpd6rHIfyA&rel=1&showsearch=1&eurl=&iurl=http%3A//i3.ytimg.com/vi/2cpd6rHIfyA/hqdefault.jpg&sk=5E3I2RCcOLknk1qyI_JgVVnb8FKwgpHzC&use_get_video_info=1&load_modules=1&fs=1&hl=en +.youtube.com/swf/.*swf= #---------------------------------------------------------------------------- # No filtering for sourcecode or other automatically parsed content @@ -1702,6 +1801,9 @@ webmail. .wiki*. .*wiki. /.*wiki/ +#MASTER# REMARKS Actionsfile feedback item #2299717 2008-11-16 +# URL = http://en.wiktionary.org/ +.wiktionary.org/ #MASTER# REMARKS: protect some google projects from accidental JS/HTML tampering, etc maps.google. .google.com/(calendar|reader) @@ -1800,6 +1902,8 @@ javabog.dk/ijk/ .froscon.de/ # URL = http://www.fsfe.org/en/supporters .fsfe.org/ +# URL = http://www.couchsurfing.com/mapsurf.html +.couchsurfing.com/ {-filter{banners-by-link}} # Sticky Actions = -filter{banners-by-link}