X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=default.action.master;h=33b3942a88ed34d0e171cdcf72eeea5501b7153c;hb=974d4188b8c1309c867ff42230f8580da8b5c334;hp=bf16e4d0af8e5feb4b118535eb72072c111f5251;hpb=bcc8382b7c15b3e1b400a34c89ee5f84e3f8f38c;p=privoxy.git diff --git a/default.action.master b/default.action.master index bf16e4d0..33b3942a 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.80 2007/06/15 11:01:27 hal9 Exp $ +# $Id: default.action.master,v 1.94 2007/10/05 02:02:05 hal9 Exp $ # # Requires : This version requires Privoxy v3.0.7 or later due to # syntax changes. @@ -540,67 +540,9 @@ allow-ads = -block -filter{banners-by-size} -filter{banners-by-link} # Defaults ############################################################################# { \ --add-header \ --block \ --client-header-filter{hide-tor-exit-notation} \ --content-type-overwrite \ --crunch-client-header \ --crunch-if-none-match \ --crunch-outgoing-cookies \ --crunch-incoming-cookies \ --crunch-server-header \ --deanimate-gifs \ --downgrade-http-version \ --fast-redirects \ --filter{js-annoyances} \ --filter{js-events} \ --filter{html-annoyances} \ --filter{content-cookies} \ --filter{refresh-tags} \ --filter{unsolicited-popups} \ --filter{all-popups} \ --filter{img-reorder} \ --filter{banners-by-size} \ --filter{banners-by-link} \ --filter{webbugs} \ --filter{tiny-textforms} \ --filter{jumping-windows} \ --filter{frameset-borders} \ --filter{demoronizer} \ --filter{shockwave-flash} \ --filter{quicktime-kioskmode} \ --filter{fun} \ --filter{crude-parental} \ --filter{ie-exploits} \ --filter{site-specifics} \ --filter{google} \ --filter{yahoo} \ --filter{msn} \ --filter{blogspot} \ --filter{no-ping} \ --force-text-mode \ --handle-as-empty-document \ --handle-as-image \ --hide-accept-language \ --hide-content-disposition \ --hide-if-modified-since \ +hide-forwarded-for-headers \ +hide-from-header{block} \ --hide-referrer \ --hide-user-agent \ --inspect-jpegs \ --kill-popups \ --limit-connect \ --prevent-compression \ --overwrite-last-modified \ --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 \ } / # Match all URLs @@ -708,7 +650,8 @@ support./(.*/)?track /(.*/)?ad(se?rv|click|stream|image|log|farm|script) #MASTER# PROBLEM URL: http://www.torrentportal.com/topad.html #MASTER# REMARKS: Action tracker 1637648 and a bit of imagination. Added 2007-01-20. -/.*(top|bottom|left|right)_?ad +#MASTER# REMARKS: Added "text" 20070730 as per http://www.pcworld.com/textad?Keywords=System Resources Tune-Up.&type=pcworld_downloads_search&count=3&ord=906010128&serveUrl=http%3A%2F%2Fwww.pcworld.com%2Fdownloads%2Ffile%2Ffid%2C7661-order%2C1-page%2C1-c%2Csystemresourcestuneup%2Fdescription.html Adam Piggott +/.*(top|bottom|left|right|text)_?ad ############################################################################# # Site-specific block patterns; @@ -752,6 +695,9 @@ rcm.amazon.com .intellitxt.com #MASTER# REMARKS: per Actions File tracker: #1597893 11/17/06, similar to intellitxt .kontera.com +#MASTER# REMARKS: 2007-08-17 HB, similar to intellitxt +#MASTER# BLOCK-REFERRER: http://www.webhostingtalk.com/archive/index.php/t-533369.html +.tribalfusion.com/ctxt #MASTER# REMARKS: Video advertizer, owned by doubleclick.net. #MASTER# BLOCK-REFERRER: http://www.ign.com/ 09/17/06 .klipmart.com @@ -821,6 +767,13 @@ img.bluehost.com #MASTER# BLOCK-REFERRER: http://www.linuxinsider.com/story/57759.html #MASTER# REMARKS: Actionsfile feedback item #1736213 at 2007-06-12 linuxinsider.com/images/sda/ +#MASTER# REMARKS: 20070711 Adam Piggott Actionsfile feedback #1700692 +#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. @@ -923,8 +876,9 @@ jlinks.industrybrains.com/ 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 -bwp.zdnet. +links. 2007-08-02, more hosts using this scheme, broadening scope. +#bwp.zdnet. +bwp. ############################################################################# # Generic block-as-image patterns: @@ -985,7 +939,6 @@ 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 @@ -1028,11 +981,10 @@ jmcms.cydoor.com/ 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 +#MASTER# REMARKS: 20070711 Actionsfile feedback #1749013 /ad/fm/ appended, as click-throughs were being blocked. Could only find adverts being served from /ad/fm/ +a*farm.mediaplex.com/ad/fm/ #MASTER# REMARKS: Support request 1312362 09/08/06 #MASTER# DUPLICATED: adserver.itsfogo.com -#MASTER# BLOCK-REFERRER: http://www.multiproxy.org/anon_proxy.htm 09/10/06 -view.atdmt.com #MASTER# REMARKS: Actionsfile feedback 09/11/06 http://matrix.mediavantage.de/mx.one? p=210&pa=1060&pb=1906&pd=10944&aid=399&x=120&y=240&ts=2005.06.27.21.38.08 #MASTER# BLOCK-REFERRER: http://www.heise.de/newsticker/meldung/61067 matrix.mediavantage. @@ -1203,7 +1155,10 @@ smartad.*.*.* /RealMedia/ads/ #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 +#MASTER# BLOCK-REFERRER: http://www.webster.com/dictionary/revering +.google.com/afsonline + ############################################################################# # Site-specific unblockers: ############################################################################# @@ -1315,7 +1270,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 +.ad.jp #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 @@ -1329,8 +1286,9 @@ cels.org/.*track .freebsd.org .fsf.org .gnu.org -#MASTER# REMARKS: SF tracker 09/15/06 -adiumx.com +#MASTER# REMARKS: SF tracker 09/15/06, and #1750779 2007-07-09 +#MASTER# REMARKS: New home? http://adiumx.cachefly.net/Adium_1.0.5.dmg +adium*.*. #MASTER# UNBLOCK-REFERRER: http://google.com 10/01/06 #MASTER# REMARKS: This allows many (but not all) Google "Sponsored Links" to function. #MASTER# REMARKS: Presumably if someone clicks these they want to go there. @@ -1369,15 +1327,22 @@ lads.myspace.com #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. +#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# 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_ +#MASTER# REMARKS 20070710 Actionsfile feedback #1751020 +switch.atdmt.com/action/ +#MASTER# UNBLOCK-REFERRER: http://www.parcelforce.com/portal/pw/track?catId=7500082 +.parcelforce.com/.*track +#MASTER# UNBLOCK-REFERRER: redirect from http://go.microsoft.com/fwlink?linkid=51093 +#MASTER# REMARKS: Actionsfile feedback item #1757121 2007-07-19 +.microsoft.com/.*/adschema/ ############################################################################# # Site-specific special rules: @@ -1481,6 +1446,9 @@ www.ukc.ac.uk/cgi-bin/wac\.cgi\? #MASTER# REMARKS: Logout fails if we fast-redirect to the URL after "done=". #MASTER# REMARKS: Reported in support request #1635354. .yahoo.com/.*done=http +#MASTER# PROBLEM-URL: http://us.rd.yahoo.com/reg/login1/lisu/login/uk/ym/*http://edit.europe.yahoo.com/c onfig/login?.tries=1&.src=ym&.md5=&.hash=&.js=1&.last=&...kP=Y&.done=http://mail .yahoo.com&.pd=ym_ver=0&c=&login=XXX&passwd=XXX&.persistent =&.hash=1&.md5=1 +#MASTER# REMARKS: Reported in support request #1802365. +.rd.yahoo.com/reg/login1/ #MASTER# PROBLEM-URL: http://validator.w3.org/check .w3.org #MASTER# PROBLEM-URL: http://www.ask.com/ @@ -1495,11 +1463,10 @@ login.passport.com/logout\.(asp|srf)\? #MASTER# PROBLEM-URL: http://www.fileplanet.com download.com.com/redir\? www.fileplanet.com/redir\.asp\? -#MASTER# PROBLEM-URL: http://web.archive.org/web/19970715180251/http://www.gmd.de/ -web.archive.org #MASTER# PROBLEM-URL: http://cyber.law.harvard.edu/filtering/china/test/ .edu #MASTER# PROBLEM-URL: http://web.archive.org +#MASTER# PROBLEM-URL: http://web.archive.org/web/19970715180251/http://www.gmd.de/ .archive.org #MASTER# PROBLEM-URL: http://www.guenstiger.de/gt/link.asp?url=http://www.edv-supermarkt.de&source=produkt=238284&USID=00086443917155&hnr=2199&pnr=238284&ppr=158,00 www.guenstiger.de @@ -1523,6 +1490,14 @@ config.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/ +#MASTER# PROBLEM-URL: http://calgary.ctv.ca/servlet/RTGAMArticleHTMLTemplate/B/20070615/goexpo?brand=generic&hub=&tf=CFCNPlus/generic/hubs/frontpage.html&cf=CFCNPlus/generic/hubs/frontpage.cfg&slug=goexpo&date=20070615&archive=CFCNPlus&ad_page_name=&nav=home&subnav=fullstory&site_cfcn=http://calgary.ctv.ca +.ctv.ca/.*&site_cfcn=http:// +#MASTER# PROBLEM-URL: http://memberservices.informit.com/checkLogin.ashx?partner=8&r=http%3a%2f%2fwww.informit.com%2farticles%2farticle.asp%3fp%3d766375%26seqNum%3d1 +.informit.com/.*&r=http%3a%2f%2f +#MASTER# PROBLEM-URL: http://access.adobe.com/access/getStatus.do?jobid=&srcPdfUrl=http://cups.cs.cmu.edu/soups/2007/proceedings/p41_clark.pdf&convertTo=html&visuallyImpaired=preferhtml&preferHTMLReason=&platform=&comments=&starttime=1187362172109 +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= #---------------------------------------------------------------------------- # No filtering for sourcecode or other automatically parsed content @@ -1823,10 +1798,6 @@ blogs.msdn.com blogs.msdn.com {+fast-redirects{check-decoded-url} -block} -#MASTER# COMMENTS: Is this still in use? 2007-01-19 fk -#MASTER# REMARKS: Remark used to be "Basically all of Yahoo's outbound links" which is no longer true. -#MASTER# PROBLEM-URL: http://uk.rd.yahoo.com/M=200059723.200849546.202365062.200414073/D=ukhmpg/S=15426100:TEAR/A=200396897/R=1119/id=img1_nocap_dial/*http://ad.uk.doubleclick.net/clk;5982435;8261020;g?http://www.lunnpoly.com -.*rd.yahoo.com/ #MASTER# REMARKS: Yahoo search results. Added 2007-01-19 fk #MASTER# REDIRECT-REFERRER: http://search.yahoo.com/search?p=privoxy #MASTER# PROBLEM-URL: http://rds.yahoo.com/_ylt=A0geuryczbBF._YAEmxXNyoA;_ylu=X3oDMTB2b2gzdDdtBGNvbG8DZQRsA1dTMQRwb3MDMQRzZWMDc3IEdnRpZAM-/SIG=11b3qg40n/EXP=1169301276/**http%3a//www.privoxy.org/