X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=default.action.master;h=905382f2803d3d67c379676ea52f98c6488cb5f7;hp=3fe442f8a0804f9b672f4bd57fb1619c2979443e;hb=0ce6a5475d51837725eaa15111ff3e01ecf0ea2b;hpb=eab2924599328c2c9d9d2bd7fc13d87f67e03d74 diff --git a/default.action.master b/default.action.master index 3fe442f8..905382f2 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.101 2007/11/13 02:26:59 hal9 Exp $ +# $Id: default.action.master,v 1.117 2008/03/21 13:22:20 fabiankeil Exp $ # -# Requires : This version requires Privoxy v3.0.7 or later due to +# Requires : This version requires Privoxy v3.0.9 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 - 2007 the +# Copyright : Written by and Copyright (C) 2001-2008 the # Privoxy team. http://www.privoxy.org/ # # Note: Updated versions of this file will be made available from time @@ -168,7 +168,7 @@ # # There are 3 kinds of actions: # -# Boolean (e.g. "block"): +# Boolean (e.g. "handle-as-image"): # +name # enable # -name # disable # @@ -198,9 +198,9 @@ # Adds the specified HTTP header, which is not checked for validity. # You may specify this many times to specify many headers. # -# +block -# Block this URL. Privoxy will ignore this URL completely, and not request -# it. +# +block{reason} +# Block this URL. Instead of forwarding the request, Privoxy will +# send a "block" page containing the specified reason. # # +client-header-filter{name} # All client headers to which this action applies are filtered on-the-fly @@ -211,7 +211,7 @@ # 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 +# Tag 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 @@ -313,6 +313,14 @@ # Declares a document as plain text, even if the "Content-Type:" isn't detected # as such. # +# +forward-override{forward .} +# +forward-override{forward 127.0.0.1:8123} +# +forward-override{forward-socks4a 127.0.0.1:9050 .} +# +forward-override{forward-socks4a 127.0.0.1:9050 proxy.example.org:8000} +# +forward-override{forward-socks5 127.0.0.1:9050 .} +# +forward-override{forward-socks5 127.0.0.1:9050 proxy.example.org:8000} +# This action overrules the forward directives in the configuration file. +# # +handle-as-empty-document # This action alone doesn't do anything noticeable. It just marks URLs. If # the block action also applies, the presence or absence of this mark @@ -331,7 +339,7 @@ # prefer to view inside the browser, for example. # # +hide-forwarded-for-headers -# Block any existing X-Forwarded-for header, and do not add a new one. +# Block any existing X-Forwarded-for header. # # +hide-from-header{block} # +hide-from-header{spam@sittingduck.xqq} @@ -483,17 +491,6 @@ # This allows you to add an arbitrary cookie. Specify it multiple # times in order to add several cookies. # -# +treat-forbidden-connects-like-blocks -# If this action is enabled, Privoxy no longer makes a difference between -# forbidden connects and ordinary blocks. -# -# By default Privoxy answers forbidden "Connect" requests with a short -# error message inside the headers. If the browser doesn't display headers -# (most don't), you just see an empty page. With this action enabled, -# Privoxy displays the message that is used for ordinary blocks instead. If -# you decide to make an exception for the page in question, you can do so -# by following the "See why" link. -# ############################################################################# ############################################################################# @@ -502,7 +499,7 @@ {{settings}} ############################################################################# #MASTER# COMMENT: The minimum Privoxy version: -for-privoxy-version=3.0.7 +for-privoxy-version=3.0.9 ############################################################################# # Aliases @@ -533,7 +530,7 @@ for-privoxy-version=3.0.7 -crunch-all-cookies = -crunch-incoming-cookies -crunch-outgoing-cookies allow-all-cookies = -crunch-all-cookies -session-cookies-only allow-popups = -filter{all-popups} -kill-popups -filter{unsolicited-popups} -+block-as-image = +block +handle-as-image ++block-as-image = +block{Blocked image request.} +handle-as-image -block-as-image = -block # These aliases define combinations of actions @@ -545,7 +542,7 @@ shop = -crunch-all-cookies allow-popups # Your favourite blend of filters: # myfilters = +filter{html-annoyances} +filter{js-annoyances} +filter{all-popups}\ - +filter{webbugs} +filter{nimda} +filter{banners-by-size} #+filter{fun} + +filter{webbugs} +filter{banners-by-size} # Allow ads for selected useful free sites: # @@ -577,12 +574,18 @@ allow-ads = -block -filter{banners-by-size} -filter{banners-by-link} ############################################################################# # Generic block patterns by host: ############################################################################# -{+block} +{+block{Host matches generic block pattern.}} #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/ +# Blocked URL = http://alternativos.iw-advertising.com/ .*advert*. *banner*. count*. @@ -607,6 +610,8 @@ adob*. adrenaline. adtp*. adv[oia]*. +#MASTER# REMARKS: Added 2008-02-08 HB +adventure*. .*road*. .olympiad*. .*load*. @@ -617,9 +622,11 @@ countr*. ############################################################################# # Generic block patterns by path: ############################################################################# -{+block} +{+block{Path matches generic block pattern.}} #MASTER# DONT-VERIFY (generic) /(.*/)?ad(\?|/|s|v|_?(image|se?rv|box)|cycle|rotate|mentor|click|f[ra]m|script|stream|fetch|log|space) +# Blocked URL = http://www.example.org/adimage +# Blocked URL = http://www.example.org/adspace /phpads(new)?/ /(.*/)?(ad|all|nn|db|promo(tion)?)?[-_]?banner /(.*/)?(publicite|werbung|reklaa?m|annonse|maino(kset|nta|s)?/) @@ -657,7 +664,7 @@ support./(.*/)?track ############################################################################# # Catch-all for false-positives that are just TOO obvious to let go ############################################################################# -{+block} +{+block{Catch-all block for false-positives.}} #MASTER# PROBLEM URL: http://ads.facebook.com/ads/spreadshirt/banner120x600.jpg #MASTER# REMARKS: Going for adsrv, adserve, adserver*. .ads[erv][rv]*. @@ -671,12 +678,17 @@ support./(.*/)?track ############################################################################# # Site-specific block patterns; ############################################################################# +{+block{Site-specific block pattern matches.}} #MASTER# BLOCK-REFERRER: http://www.brooksbrothers.com/ 10/18/06 #MASTER# BLOCK-REFERRER: http://www.autodesk.com/ +# Blocked URL = http://www.hitbox.com/foobar .hitbox.com #MASTER# BLOCK-REFERRER: http://www.the-gadgeteer.com/palmos.html 10/18/06 +# Blocked URL = http://www..the-gadgeteer.com/cgi-bin/getimage.cgi/ .the-gadgeteer.com/cgi-bin/getimage.cgi/ #MASTER# BLOCK-REFERRER: http://dest.travelocity.com/DestGuides/geo_frontdoor/0,,TRAVELOCITY,00.html?HPTRACK=icon_dest +# Blocked URL = http://dest.travelocity.com/website/destinations/images/partner_frommers.gif +# Blocked URL = http://dest.travelocity.com/website/destinations/images/travelex_logo.gif dest.travelocity.com/website/destinations/images/partner_frommers.gif dest.travelocity.com/website/destinations/images/travelex_logo.gif #MASTER# BLOCK-REFERRER: http://us.imdb.com/Title?0110912 10/18/06 @@ -685,6 +697,7 @@ dest.travelocity.com/website/destinations/images/travelex_logo.gif i.imdb.com/Photos/CMSIcons/(?!buttons|emoticons) rcm.amazon.com #MASTER# BLOCK-REFERRER: http://www.nytimes.com/ 10/18/06 +# Blocked URL = http://www.nytimes.com/adx/foo .nytimes.com/adx/ #MASTER# BLOCK-REFERRER: http://www.sharereactor.com/ 10/19/06 #MASTER# BLOCK-REFERRER: http://www.popupad.net/ @@ -793,7 +806,7 @@ linuxinsider.com/images/sda/ #---------------------------------------------------------------------------- # Misc Web-bugs, JS and just plain Junk. Images here aren't normal images. #---------------------------------------------------------------------------- -{+block +handle-as-empty-document -handle-as-image} +{+block{Might be a web-bug.} +handle-as-empty-document -handle-as-image} #MASTER# REMARKS: signature for user tracking nytimes, cnn.com,latimes.com and many others. 10/06/06 /b/ss/.+ #MASTER# BLOCK-REFERRER: http://www.thesun.co.uk/article/0,,11071-10784,00.html @@ -828,6 +841,8 @@ tracking. #stats.surfaid.ihost.com/(crc/)?images/(bounce/)?uc.GIF #MASTER# BLOCK-REFERRER: http://www.ibm.com 10/09/06 #MASTER# REMARKS: Similar hostname and paths appear in multiple locations. +# Blocked URL = http://stats.surfaid.ihost.com/crc/images/bounce/uc.GIF +# Blocked URL = http://stats.surfaid.ihost.com/rc/images/bounce/uc.GIF stats./c?rc/.*/uc.gif #MASTER# BLOCK-REFERRER: http://priceline.com 10/20/06 #MASTER# REMARKS: User tracking, webbug stuff @@ -880,8 +895,10 @@ stats.reinvigorate.net/ # JavaScripts and Texts for ad and popup generation #---------------------------------------------------------------------------- #MASTER# BLOCK-REFERRER: http://www.chip.de/artikel/c_artikelunterseite_10423683.html +# Blocked URL = http://pagead.googlesyndication.example.com/foo/bar/baz.js pagead*.googlesyndication./.*\.js #MASTER# REMARKS: broadening scope from a.tfag.de/js.ng/ 10/23/06 +# Blocked URL = http://a.tfag.de/js.ng/ /js\.ng/ #MASTER# BLOCK-REFERRER: http://www.britannica.com/ 10/23/06 /popunder @@ -904,8 +921,7 @@ jlinks.industrybrains.com/ #MASTER# REMARKS: Actionsfile feedback item #1736794 2007-06-13 js.adsonar. #MASTER# BLOCK-REFERRER: http://news.zdnet.co.uk/software/0,1000000121,39209666,00.htm -#MASTER# REMARKS: Actionsfile feedback item #1736879 2007-06-13, sponsored -links. 2007-08-02, more hosts using this scheme, broadening scope. +#MASTER# REMARKS: Actionsfile feedback item #1736879 2007-06-13, sponsored links. 2007-08-02, more hosts using this scheme, broadening scope. #bwp.zdnet. bwp. @@ -932,6 +948,7 @@ bwp. #MASTER# COMMENT: banner at top of page http://server2.as5000.com/AS5000/adserver/click?ID=ADST-00015&C=0&T=1169332403 /(.*/)?adserver/image #MASTER# COMMENT: Also from wunderground.com: http://icons-aa.wunderground.com/ads/images/TripAdvisor-Blinky.gif 2007-01-20 +# Blocked URL = http://icons-aa.wunderground.com/ads/images/TripAdvisor-Blinky.gif /(.*/)?ads/images/ ############################################################################# @@ -943,6 +960,8 @@ bwp. #MASTER# BLOCK-REFERRER: http://www.cnn.com/ #MASTER# BLOCK-REFERRER: http://www.aol.com/ #MASTER# COMMENT: There are at least ar.atwola and pr.atwola. 10/01/06 +# Blocked URL = http://ar.atwola.com/ +# Blocked URL = http://pr.atwola.com/ ?r.atwola.com #MASTER# BLOCK-REFERRER: http://www.altavista.com/ #MASTER# BLOCK-REFERRER: http://www.tecchannel.de/ @@ -1007,7 +1026,8 @@ jmcms.cydoor.com/ *[0-9].tribalfusion.com/ #MASTER# REMARKS: Actions file tracker 1547656 09/02/06 #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 +# Blocked URL = https://secure.img-cdn.mediaplex.com/0/7454/43775/YA3149_17566_728x90_FCR_07.gif +.img*.mediaplex.com #MASTER# BLOCK-REFERRER: http://www.tomshardware.com/ 09/28/06 #MASTER# REMARKS: There is adfarm and altfarm.mediaplex #MASTER# REMARKS: 20070711 Actionsfile feedback #1749013 /ad/fm/ appended, as click-throughs were being blocked. Could only find adverts being served from /ad/fm/ @@ -1129,9 +1149,14 @@ insightxe./data/ .insightfirst.com #MASTER# BLOCK-REFERRER: http://rss.slashdot.org/Slashdot/slashdot #MASTER# PROBLEM URL: rss.slashdot.org/~a/Slashdot/slashdot?i=ofbWqX +# Blocked URL = http://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 +# Blocked URL = http://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) @@ -1143,9 +1168,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: @@ -1303,7 +1325,7 @@ cels.org/.*track #MASTER# UNBLOCK-REFERRER: http://www.nic.ad.jp/ See http://jprs.co.jp/en/jpdomain.html 09/11/06 #MASTER# REMARKS: 2007-10-04, increase scope per Actionsfile feedback item #1807613 #.nic.ad.jp -.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 @@ -1374,6 +1396,17 @@ switch.atdmt.com/action/ #MASTER# UNBLOCK-REFERRER: redirect from http://go.microsoft.com/fwlink?linkid=51093 #MASTER# REMARKS: Actionsfile feedback item #1757121 2007-07-19 .microsoft.com/.*/adschema/ +#MASTER# UNBLOCK-REFERRER: http://upload.wikimedia.org/wikipedia/en/a/ad/Picturecarnegie.jpg +.wikimedia.org/ +#MASTER# UNBLOCK-REFERRER: http://en.wikipedia.org/wiki/Advertisement +.wikipedia.org/ +#MASTER# PROBLEM URL: http://curl.haxx.se/docs/adv_20070710.html +.haxx.se/docs/adv_ +#MASTER# PROBLEM URL: http://www.google.com/adsense/ +www.google.com/adsense/ +#MASTER# PROBLEM URL: http://www.encyclopediadramatica.com/Advertisement +#MASTER# PROBLEM URL: http://images.encyclopediadramatica.com/images/b/b5/Advertising-Dierentuin.jpg +.encyclopediadramatica.com/ ############################################################################# # Site-specific special rules: @@ -1529,6 +1562,13 @@ del.icio.us/ access.adobe.com/access/getStatus.do\?jobid=&srcPdfUrl= #MASTER# PROBLEM-URL: http://view.samurajdata.se/ps.php?url=http%3A%2F%2Fcups.cs.cmu.edu%2Fsoups%2F2007%2Fproceedings%2Fp41_clark.pdf&submit=View%21 view.samurajdata.se/ps\.php\?url= +#MASTER# PROBLEM-URL: http://www.blogger.com/navbar.g?targetBlogID=8919860543765866292&blogName=Kickin%27+the+Darkness&publishMode=PUBLISH_MODE_HOSTED&navbarType=BLUE&layoutType=LAYOUTS&homepageUrl=http%3A%2F%2Fblog.kickin-the-darkness.com%2F&searchRoot=http%3A%2F%2Fblog.kickin-the-darkness.com%2Fsearch +.blogger.com/navbar\.g +#MASTER# PROBLEM-URL: http://editors.dmoz.org/editors/editurl.cgi?url=http%3a//www.example.de/&cat=World/Deutsch/Computer/Hardware/Speichermedien +.dmoz.org/editors/editurl\.cgi +#MASTER# PROBLEM-URL: http://offer.ebay.de/ws/eBayISAPI.dll?stockphotourl=http%3A%2F%2Fi16.ebayimg.com%2F02%2Fc%2F02%2F88%2F21%2F5b_6.JPG&MfcISAPICommand=BinConfirm&fb=1&co_partnerid=&item=123456789112&quantity=1&input_bin= +#MASTER# PROBLEM-URL: http://offer.ebay.de/ws/eBayISAPI.dll?maxbid=15%2C01&MfcISAPICommand=MakeBid&fromPage=284&stockphotourl=http%3A%2F%2Fi14.ebayimg.com%2F02%2Fc%2F00%2Fe9%2Fe1%2F2a_6.JPG&fb=2&co_partnerid=&item=123456789112&input_bid= +.ebay.de/ws/eBayISAPI\.dll\? #---------------------------------------------------------------------------- # No filtering for sourcecode or other automatically parsed content @@ -1617,47 +1657,6 @@ bugs. #MASTER# REMARKS: Actionsfile tracker 1555909 09/17/06, various problems with cpu and logging in. quoka.de -#---------------------------------------------------------------------------- -# These sites suffer from a bug in PHP < 4.2.3 (ob_gzhandler broken; -# workaround is to use zlib.output_compression): -# (Section obsolete as of Privoxy 3.0.3, which has workaround) -#---------------------------------------------------------------------------- -#{-prevent-compression} -# Surely this is rectified by now 09/16/06 ??? -#MASTER# PROBLEM-URL: http://www.powie.de/ -#www.powie.de -#MASTER# PROBLEM-URL: http://www.phpcenter.de/ -#www.phpcenter.de -#MASTER# PROBLEM-URL: http://www.timeanddate.com -#www.timeanddate.com -#MASTER# PROBLEM-URL: http://www.pclinuxonline.com/ -#MASTER# PROBLEM-URL: http://pclinuxonline.com/ -#.pclinuxonline.com -#MASTER# PROBLEM-URL: http://www.dungeoncrawl.org/ -#.dungeoncrawl.org -#MASTER# PROBLEM-URL: http://www.digitalspy.co.uk/ -#www.digitalspy.co.uk -#MASTER# PROBLEM-URL: http://www.audio-illumination.org/forums/ -#www.audio-illumination.org/forums/ -#MASTER# PROBLEM-URL: http://www.catchword.com/ -#www.catchword.com -#MASTER# PROBLEM-URL: http://www.ubernet.org -#www.ubernet.org -#MASTER# PROBLEM-URL: http://www.ooodocs.org/ -#www.ooodocs.org -#MASTER# PROBLEM-URL: http://www.ntcompatible.com/ -#www.ntcompatible.com -#MASTER# PROBLEM-URL: http://www.winehq.com/ -#.winehq.com -#MASTER# PROBLEM-URL: http://www.dotcomtod.de/ -#.dotcomtod.de/ -#MASTER# PROBLEM-URL: http://www.tweakers.net -#.tweakers.net -#MASTER# PROBLEM-URL: http://www.troublesathome.nl -#.troublesathome.nl -#MASTER# PROBLEM-URL: http://www.art.softshape.com -#.art.softshape.com - #---------------------------------------------------------------------------- # Innocent images in standard banner sizes found here: #---------------------------------------------------------------------------- @@ -1700,6 +1699,12 @@ www.xach.com/gimp/ javabog.dk/ijk/ #MASTER# REMARK: Per Debian bug report #319025 09/09/06 .w3.org +#MASTER# PROBLEM-URL: http://www.encyclopediadramatica.com/New_Zealand_Fail_Guy +.encyclopediadramatica.com/ + +{-filter{banners-by-link}} +#MASTER# PROBLEM-URL: http://www.encyclopediadramatica.com/Advertisement +.encyclopediadramatica.com/ #---------------------------------------------------------------------------- # These don't work without the referrer information: @@ -1831,7 +1836,7 @@ dw.com.com/ .bloglines.com/r\? www.skweezer.net/bloglines -{+block} +{+block{Looks like an anti-leech trigger URL.}} #MASTER# COMMENTS: This section not checked 10/17/06 HB. Still out there? #MASTER# PROBLEM-URL: http://www.anti-leech.com/theft_example.html #MASTER# REMARKS: Lame attempt at banning ad-blockers. Used by other websites as well.