X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=default.action.master;h=33b3942a88ed34d0e171cdcf72eeea5501b7153c;hp=0daafcd8488817233439179561d766dd69c260bc;hb=278b8bf5b0d1250132773bd10ffbca07c067b845;hpb=baef84060d831b42d53a34704961c0376885149e diff --git a/default.action.master b/default.action.master index 0daafcd8..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.68 2007/03/20 15:40:00 fabiankeil 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 @@ -812,9 +758,22 @@ ad.theadhost.com #MASTER# REMARKS: Domain squatting onload pop-ups #MASTER# BLOCK-REFERRER: http://www.memtest.com/ /(t|search)\.php\?uid=ws[a-z0-9]+\.[a-z0-9]+ -MASTER# BLOCK-REFERRER: via Yahoo groups -MASTER# REMARKS: Actionsfile tracker 1645513 2007-01-26 +#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 +#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. @@ -889,7 +848,7 @@ spa.snap.com/ dw.com.com/clear/ #---------------------------------------------------------------------------- -# JavaScripts for ad and popup generation +# JavaScripts and Texts for ad and popup generation #---------------------------------------------------------------------------- #MASTER# BLOCK-REFERRER: http://www.chip.de/artikel/c_artikelunterseite_10423683.html pagead*.googlesyndication./.*\.js @@ -906,12 +865,20 @@ scripts.chitika.net/.*\.js #MASTER# REMARKS: Actionsfile tracker #1674363 2007-03-05, text ads #MASTER# BLOCK-REFERRER: http://www.securityfocus.com/archive/1/461489/30/0/threaded jlinks.industrybrains.com/ -MASTER# BLOCK-REFERRER: via Yahoo groups -MASTER# REMARKS: Actionsfile tracker 1645513 2007-01-26 +#MASTER# BLOCK-REFERRER: via Yahoo groups +#MASTER# REMARKS: Actionsfile tracker 1645513 2007-01-26 .adinterax.com/.*\.js #MASTER# BLOCK-REFERRER: http://dictionary.reference.com/search?q=privacy&db=* -MASTER# REMARKS: Actionsfile tracker 1650798 2007-02-02 +#MASTER# REMARKS: Actionsfile tracker 1650798 2007-02-02 .googleadservices.com/gampad/.*\.js +#MASTER# BLOCK-REFERRER: http://www.linuxworld.com/news/2007/061307-brian-aker-interview.html +#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. +#bwp.zdnet. +bwp. ############################################################################# # Generic block-as-image patterns: @@ -972,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 @@ -1011,14 +977,14 @@ 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 +#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. @@ -1059,9 +1025,12 @@ scripts.chitika.net/.*\.(gif|png|jpg) #MASTER# BLOCK-REFERRER: http://www.multimap.com/ (sporadic) #MASTER# REMARKS: Actionsfile feedback item #1665682 2007-02-21 .akamai.net/.*\.adtech\.de/.*\.(gif|png) -MASTER# BLOCK-REFERRER: via Yahoo groups -MASTER# REMARKS: Actionsfile tracker 1645513 2007-01-26 +#MASTER# BLOCK-REFERRER: via Yahoo groups +#MASTER# REMARKS: Actionsfile tracker 1645513 2007-01-26 .adinterax.com/.*\.(gif|jpg) +#MASTER# BLOCK-REFERRER: http://www.wotzon.com/profilepage.html?comp_id=1002310&CatID=2 +#MASTER# REMARKS: Ad generator per Actionsfile feedback item #1749870 2007-07-08 +img.directtrack.com #---------------------------------------------------------------------------- # Cross-site user tracking @@ -1186,16 +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} - -############################################################################# -# Generic -overwrite-last-modified patterns for URLs that look -# as if they belong to files that are often fetched through download -# managers. Randomizing the Last-Modfied date causes problems with -# interrupted downloads. -############################################################################# -{-overwrite-last-modified} -/.*\.(tar|gz|b?zip2?|t[gb]z|iso|dmg|avi|m(p4|4v)|mpe?g)$ - +#MASTER# REMARKS: Actionsfile feedback item #1764161 2007-07-31 +#MASTER# BLOCK-REFERRER: http://www.webster.com/dictionary/revering +.google.com/afsonline + ############################################################################# # Site-specific unblockers: ############################################################################# @@ -1307,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 @@ -1321,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. @@ -1357,6 +1323,26 @@ edge.macworld.com #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_ +#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: @@ -1460,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/ @@ -1474,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 @@ -1498,6 +1486,18 @@ schneegans.de/ 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/ +#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 @@ -1798,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/ @@ -1848,6 +1844,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. @@ -1856,3 +1859,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$ +