X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=default.action.master;h=b7dcfc7a18c006fb92fdaff7723a960e97577eb1;hb=c195f95c950b2b89905fce58b4eb560d817ed371;hp=89f8caee7850ed1fdf938e7f6830657e5cb25774;hpb=4b83d15107e2e05e1f6388adc83c878825216a5a;p=privoxy.git diff --git a/default.action.master b/default.action.master index 89f8caee..b7dcfc7a 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.64 2007/03/06 19:04:40 proactivesvcs Exp $ +# $Id: default.action.master,v 1.76 2007/05/17 15:37:00 fabiankeil Exp $ # # Requires : This version requires Privoxy v3.0.7 or later due to # syntax changes. @@ -202,6 +202,14 @@ # Block this URL. Privoxy will ignore this URL completely, and not request # it. # +# +client-header-filter{name} +# All client headers to which this action applies are filtered on-the-fly +# through the specified regular expression based substitutions. +# +# Client-header filters predefined in the supplied default.filter include: +# +# hide-tor-exit-notation: Removes the Tor exit node notation in Host and Referer headers +# # +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. @@ -265,7 +273,7 @@ # be seen with View Source), not the headers. Repeat for multiple filters. # Use with caution: filters can be very intrusive. # -# Filters predefined in the supplied default.action include: +# Filters predefined in the supplied default.filter include: # # js-annoyances: Get rid of particularly annoying JavaScript abuse # js-events: Kill all JS event bindings (Radically destructive! Use only on real suckers) @@ -292,18 +300,7 @@ # yahoo: Removes text ads and other Yahoo specific improvements # msn: Removes text ads and other MSN specific improvements # blogspot: Cleans up Blogspot blogs -# html-to-xml: Header filter to change the Content-Type from html to xml -# xml-to-html: Header filter to change the Content-Type from xml to html # no-ping: Removes non-standard ping attributes from anchor and area tags -# hide-tor-exit-notation: Header filter to remove the Tor exit node notation in Host and Referer headers -# -# +filter-client-headers -# By default, filters only apply to the document content itself. This will -# extend those filters to include the client's headers as well. -# -# +filter-server-headers -# By default, filters only apply to the document content itself. This will -# extend those filters to include the server's headers as well. # # +force-text-mode # Declares a document as plain text, even if the "Content-Type:" isn't detected @@ -371,21 +368,6 @@ # +inspect-jpegs # Scan jpeg headers for malformed comment blocks and correct them. # -# +set-image-blocker{blank} -# +set-image-blocker{pattern} -# +set-image-blocker{} with being any valid image URL -# Decides what to do with URLs that end up tagged with {+block +handle-as-image}. -# There are 4 options: -# * "-set-image-blocker" will send a HTML "blocked" page, usually -# resulting in a "broken image" icon. -# * "+set-image-blocker{blank}" will send a 1x1 transparent image -# * "+set-image-blocker{pattern}" will send a 4x4 grey/white pattern -# which is less intrusive than the logo but easier to recognize -# than the transparent one. -# * "+set-image-blocker{}" will send a HTTP temporary redirect -# to the specified image URL. -# -# # +limit-connect{portlist} # The CONNECT methods exists in HTTP to allow access to secure websites # (https:// URLs) through proxies. It works very simply: The proxy @@ -428,13 +410,36 @@ # and +gif-deanimate will not work on compressed data. Will slow down # connections to those websites, though. # -# +prevent-keeping-cookies +# +server-header-filter{name} +# All server headers to which this action applies are filtered on-the-fly +# through the specified regular expression based substitutions. +# +# Server-header filters predefined in the supplied default.filter include: +# +# html-to-xml: Changes the Content-Type header from html to xml +# xml-to-html: Changes the Content-Type header from xml to html +# # +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, # but won't break sites which require cookies so that you can log in # or for transactions. # +# +set-image-blocker{blank} +# +set-image-blocker{pattern} +# +set-image-blocker{} with being any valid image URL +# Decides what to do with URLs that end up tagged with {+block +handle-as-image}. +# There are 4 options: +# * "-set-image-blocker" will send a HTML "blocked" page, usually +# resulting in a "broken image" icon. +# * "+set-image-blocker{blank}" will send a 1x1 transparent image +# * "+set-image-blocker{pattern}" will send a 4x4 grey/white pattern +# which is less intrusive than the logo but easier to recognize +# than the transparent one. +# * "+set-image-blocker{}" will send a HTTP temporary redirect +# to the specified image URL. +# +# # +crunch-outgoing-cookies # Prevent the website from reading cookies # @@ -447,6 +452,7 @@ # equivalent. # # +redirect{} +# +redirect{} # Convinces the browser that the requested document has been moved to # another location and the browser should get it from the specified # URL. @@ -536,6 +542,7 @@ allow-ads = -block -filter{banners-by-size} -filter{banners-by-link} { \ -add-header \ -block \ +-client-header-filter{hide-tor-exit-notation} \ -content-type-overwrite \ -crunch-client-header \ -crunch-if-none-match \ @@ -570,12 +577,7 @@ allow-ads = -block -filter{banners-by-size} -filter{banners-by-link} -filter{yahoo} \ -filter{msn} \ -filter{blogspot} \ --filter{xml-to-html} \ --filter{html-to-xml} \ -filter{no-ping} \ --filter{hide-tor-exit-notation} \ --filter-client-headers \ --filter-server-headers \ -force-text-mode \ -handle-as-empty-document \ -handle-as-image \ @@ -594,6 +596,8 @@ allow-ads = -block -filter{banners-by-size} -filter{banners-by-link} -redirect \ -send-vanilla-wafer \ -send-wafer \ +-server-header-filter{xml-to-html} \ +-server-header-filter{html-to-xml} \ -session-cookies-only \ +set-image-blocker{pattern} \ -treat-forbidden-connects-like-blocks \ @@ -673,7 +677,7 @@ countr*. ############################################################################# {-block} #MASTER# DONT-VERIFY (generic) -/.*ad(sl|v(i[cs]|o|an|ertencia|ent|.*search)) # advice/advisories/advan*/advertencia (spanish) +/.*ad(sl|v(i[cs]|o|an|ertencia|ent|.*search|erse)) # advice/advisories/advan*/advertencia (spanish) adverse /.*(lo|thre|he|d|gr|l|ro|re|squ|class(ified)?)ads /.*account support./(.*/)?track @@ -811,6 +815,9 @@ ad.theadhost.com MASTER# BLOCK-REFERRER: via Yahoo groups MASTER# REMARKS: Actionsfile tracker 1645513 2007-01-26 .adinterax.com/(?!(.*)\.(js|gif|jpg)) +MASTER# BLOCK-REFERRER: http://www.weilpod.com +MASTER# REMARKS: Actionsfile feedback item #1710951 2007-05-02 +img.bluehost.com #---------------------------------------------------------------------------- # Misc Web-bugs, JS and just plain Junk. Images here aren't normal images. @@ -968,6 +975,7 @@ bs*.einets.com #MASTER# BLOCK-REFERRER: http://maps.yahoo.com/ #MASTER# REMARKS: Banner farms; just exclude their corp. info [a-vx-z]*.atdmt.com/ +view.atdmt.com/ #MASTER# BLOCK-REFERRER: http://www.exactaudiocopy.de/ 09/11/06 #MASTER# BLOCK-REFERRER: http://stanford.facebook.com/home.php .fastclick.net @@ -1006,7 +1014,8 @@ jmcms.cydoor.com/ #MASTER# BLOCK-REFERRER: http://discussion.brighthand.com/forumdisplay.php?s=fee44a5b2a6fc2e9e79d6472bc8fbe94&forumid=197 10/19/06 *[0-9].tribalfusion.com/ #MASTER# REMARKS: Actions file tracker 1547656 09/02/06 -img.mediaplex.com +#MASTER# REMARKS: Update pattern: Actionsfile feedback item #1698822, was opened at 2007-04-11 to catch https://secure.img-cdn.mediaplex.com/0.... +img*.mediaplex.com #MASTER# BLOCK-REFERRER: http://www.tomshardware.com/ 09/28/06 #MASTER# REMARKS: There is adfarm and altfarm.mediaplex a*farm.mediaplex.com @@ -1124,6 +1133,11 @@ insightxe./data/ #MASTER# BLOCK-REFERRER: http://www.unitedairlines.com #MASTER# REMARKS: Actionsfile feedback item #1650797 2007-02-05 .insightfirst.com +#MASTER# BLOCK-REFERRER: http://rss.slashdot.org/Slashdot/slashdot +#MASTER# PROBLEM URL: rss.slashdot.org/~a/Slashdot/slashdot?i=ofbWqX +rss.slashdot.org/~a/Slashdot/slashdot\? +#MASTER# PROBLEM URL: rss.slashdot.org/~r/Slashdot/slashdot/~4/102113044 +rss.slashdot.org/~r/Slashdot/slashdot/~4/ #---------------------------------------------------------------------------- # Specific counters (see above for generic patterns) @@ -1333,6 +1347,24 @@ edge.macworld.com #MASTER# UNBLOCK-REFERRER: http://mozilla.hongo.wide.ad.jp/pub/mozilla.org//thunderbird/releases/ #MASTER# REMARKS: Actionsfile feedback item #1672918 2007-03-03 .ad.*/pub/mozilla.org/ +#MASTER# UNBLOCK-REFERRER: http://lads.myspace.com/mini/mini.swf?b=NDgwNzU1ODE=&o=NjQwNzIzMA==&d=MTE3NDI4ODcwNg==&i=MA==&a=VHJ1ZQ== +#MASTER# UNBLOCK-REFERRER: http://profile.myspace.com/index.cfm?fuseaction=user.viewprofile&friendid=5282733 +#MASTER# UNBLOCK-REFERRER: http://lads.myspace.com/videos/vplayer.swf +#MASTER# REMARKS: MySpace videos caught by .*ads. The above profile.myspace.com link grabs the vplayer.swf file (which does not work when directly fetched) +lads.myspace.com +#MASTER# REMARKS: 20070402 Adam Piggott first-party tracking. 20070411 Moved from generic unblockers by path to site-specific unblockers. +#MASTER# UNBLOCK-REFERRER: http://www.shockwave.com/servlet/DownloadEcommTracker?sku=fizzball-pc&promoCode=SiteShockwaveLandingPage +.shockwave.com/servlet/DownloadEcommTracker +#MASTER# UNBLOCK-REFERRER: http://www.fish4.co.uk/iad/lettings/advert?adId=12389712&src=nestoria +#MASTER# REMARKS 20070411 Adam Piggott fish4.co.uk is a popular UK advertising site for cars, properties and jobs and uses ad/advert all over the place, understandably. +.fish4.co.uk/.*ad +#MASTER# REMARKS Actionsfile feedback item #1700037 2007-04-13 HB +#MASTER# UNBLOCK-REFERRER: http://www.mp3.com.au/popup/popup.asp?id=110433 +.mp3.com.au/.*popup +#MASTER# REMARKS Actionsfile feedback #1700915 2007-04-15 +#MASTER# UNBLOCK-REFERRER: http://www.svd.se/ego/339/http://www.e24.se/dynamiskt/reklam_media/did_15092793.asp +#MASTER# UNBLOCK-REFERRER: http://www.e24.se/dynamiskt/reklam_media/did_15092793.asp +/(.*/)?dynamiskt/reklam_media/did_ ############################################################################# # Site-specific special rules: @@ -1472,6 +1504,12 @@ www.translate.ru/url/ schneegans.de/ #MASTER# PROBLEM-URL: http://config.privoxy.org/edit-actions-submit?f=user ... &redirect_mode=http%3A%2F%2Fwww.privoxy.org%2F config.privoxy.org/ +#MASTER# PROBLEM-URL: http://users.wsj.com/lmda/do/checkLogin?mg=evo-wsj&url=http%3A%2F%2Fonline.wsj.com%2Farticle%2FSB117313867582027623.html +.wsj.com/lmda/do/checkLogin +#MASTER# PROBLEM-URL: http://del.icio.us/url/check\?url=http%3A%2F%2Fwww.privoxy.org +#MASTER# REMARKS: As we already have five other PROBLEM-URLs that contain '?url=', +#MASTER# REMARKS: it might make sense to allow '/.*?url=' in general +del.icio.us/ #---------------------------------------------------------------------------- # No filtering for sourcecode or other automatically parsed content @@ -1822,6 +1860,13 @@ www.skweezer.net/bloglines {+redirect{http://config.privoxy.org/}} .privoxy.org/config +#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} +p.p/ +config.privoxy.org/ + #MASTER# REMARKS: Yahoo logout URLs need special treatment, #MASTER# REMARKS: the URL after "done=" is no fast-redirect. 2007-01-19 fk #MASTER# REMARKS: Reported in support request #1635354. @@ -1830,3 +1875,24 @@ www.skweezer.net/bloglines .yahoo./.*http://login.yahoo.com/config/login.*http:// #MASTER# set vi:nowrap + +#---------------------------------------------------------------------------- +# Sections that modify the action settings based on tags. +#---------------------------------------------------------------------------- + +############################################################################# +# Depends on +client-header-tagger{image-requests} +############################################################################# +{-handle-as-empty-document \ + +handle-as-image \ +} +TAG:^IMAGE-REQUEST$ + +############################################################################# +# Depends on +client-header-tagger{css-requests} +############################################################################# +{+handle-as-empty-document \ + -handle-as-image \ +} +TAG:^CSS-REQUEST$ +