X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=default.action.master;h=a9e839f969255dab030dd5dedfe11987b78d77b9;hp=bfc55b67a3b1527752253067f9d142b330f6acf9;hb=ab3584c4af45fe7ead47acc48ad16748073266b2;hpb=d0014f78905227f7ecab77f65d453fd24f4e9ecf diff --git a/default.action.master b/default.action.master index bfc55b67..a9e839f9 100644 --- a/default.action.master +++ b/default.action.master @@ -11,7 +11,7 @@ # # File : $Source: /cvsroot/ijbswa/current/default.action.master,v $ # -# $Id: default.action.master,v 1.284 2013/02/28 17:27:42 fabiankeil Exp $ +# $Id: default.action.master,v 1.307 2014/07/14 13:01:02 fabiankeil Exp $ # # Requires : This version requires Privoxy v3.0.11 or later due to # syntax changes. @@ -202,11 +202,13 @@ # # image-requests: Tags detected image requests as "IMAGE-REQUEST". # css-requests: Tags detected CSS requests as "CSS-REQUEST". +# range-requests: Tags range requests as "RANGE-REQUEST". # client-ip-address: Tags the request with the client's IP address. # http-method: Tags the request with its HTTP method. # allow-post: Tags POST requests as "ALLOWED-POST". # complete-url: Tags the request with the whole request URL. # user-agent: Tags the request with the complete User-Agent header. +# referer: Tags the request with the complete Referer header. # privoxy-control: Creates tags with the content of X-Privoxy-Control headers. # # +content-type-overwrite @@ -275,10 +277,10 @@ # Filters predefined in the supplied default.filter include: # # js-annoyances: Get rid of particularly annoying JavaScript abuse. -# js-events: Kill all JS event bindings and timers (Radically destructive! Only for extra nasty sites). +# js-events: Kill JavaScript event bindings and timers (Radically destructive! Only for extra nasty sites). # html-annoyances: Get rid of particularly annoying HTML abuse. # content-cookies: Kill cookies that come in the HTML or JS content. -# refresh-tags: Kill automatic refresh tags (for dial-on-demand setups). +# refresh-tags: Kill automatic refresh tags if refresh time is larger than 9 seconds. # unsolicited-popups: Disable only unsolicited pop-up windows. # all-popups: Kill all popups in JavaScript and HTML. # img-reorder: Reorder attributes in tags to make the banners-by-* filters more effective. @@ -288,6 +290,7 @@ # tiny-textforms: Extend those tiny textareas up to 40x80 and kill the hard wrap. # jumping-windows: Prevent windows from resizing and moving themselves. # frameset-borders: Give frames a border and make them resizable. +# iframes: Removes all detected iframes. Should only be enabled for individual sites. # demoronizer: Fix MS's non-standard use of standard charsets. # shockwave-flash: Kill embedded Shockwave Flash objects. # quicktime-kioskmode: Make Quicktime movies saveable. @@ -642,8 +645,6 @@ ad*. *banner*. count*. *counter. -#MASTER# PROBLEM URL: http://www.newegg.com -promotions. #MASTER# BLOCK-REFERRER: http://tech.cybernetnews.com/ # Blocked URL = http://metrics.performancing.com/ metrics. @@ -679,9 +680,9 @@ linuxcounter.net/ # Generic block patterns by path: ############################################################################# {+block{Path matches generic block pattern.}} -/(.*/)?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 +/(.*/)?ad(\?|/|s|v|_?(image|se?rv|box)|cycle|rotate|mentor|click|f[ra]m|script|stream|fetch|log|space) /phpads(new)?/ /(.*/)?(ad|all|nn|db|promo(tion)?)?[-_]?banner /(.*/)?(publicite|werbung|rekla(me|am)|annonse|maino(kset|nta|s)?/) @@ -694,6 +695,10 @@ linuxcounter.net/ /openx/www/delivery/ # Blocked URL = http://mem.brandreachsys.com/www/delivery/lg.php?bannerid=13783&campaignid=0&zoneid=550&cb=f22df9acaa /.*bannerid= +# MASTER# BLOCK-REFERRER: http://www.augsburger-allgemeine.de/donauwoerth/Grosseinsatz-Polizist-schiesst-um-sich-Er-hat-mehrere-Waffen-id30561822.html +# Blocked URL = http://bilder.augsburger-allgemeine.de/img/incoming/orig30444932/2560007661/DigiAd-Zeopexx-03072014.gif +# Blocked URL = http://bilder.augsburger-allgemeine.de/img/incoming/orig30463337/9180008457/DigiAd-AugenblickOptik-04072014.gif +/.*DigiAd ############################################################################# # Generic unblockers by path: @@ -841,8 +846,6 @@ js.adlink.net/ #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# BLOCK-REFERRER: http://www.pcmag.com/ 11/22/06 per SF Tracker # 1601148 -/js/slider\.js #MASTER# BLOCK-REFERRER: http://floodle.net 2007-01-21 SF tracker scripts.chitika.net/.*\.js #MASTER# BLOCK-REFERRER: via Yahoo groups @@ -881,6 +884,9 @@ pool.*.adhese.com/ #MASTER# BLOCK-REFERRER: http://www.tradera.com/ # Blocked URL = http://oskar.tradera.com/script.js oskar.tradera.com/ +#MASTER# BLOCK-REFERRER: http://www12.zippyshare.com/v/64444425/file.html +# Blocked URL = http://www.adcash.com/script/java.php?option=rotateur&rotateur=146355 +.adcash.com/script/ {+block{Might be a web-bug.} -handle-as-empty-document +handle-as-image} #MASTER# BLOCK-REFERRER: http://versiontracker.com and many others. 10/20/06 @@ -1119,6 +1125,9 @@ cltomedia.info/delivery/ #MASTER# BLOCK-REFERRER: http://thepiratebay.se/ # Blocked URL = http://cdn2.adexprt.com/clkads/sky2.html .adexprt.com/ +# Blocked URL = http://data.gosquared.com/pv?a=GSN-311503-M&cs=UTF-8&cd=24&fl=11.7%20r700&je=0&la=de-de&sw=1280&sh=1024&dm=adn.speedtest.net&pa=%2F&pt=Speedtest.net%20-%20Der%20Globale%20Breitband-Geschwindigkeitstest&pr=http%3A&po=-&pl=0&tl=82&ri=1&ru=http%3A%2F%2Fadn.speedtest.net%2F&ui=1876309225&re=1&vi=1&pv=5&lv=1369129426&vw=1280&vh=878&dw=1263&dh=1325&st=0&sl=0&tv=4.0 +data.gosquared.com/ + #---------------------------------------------------------------------------- # JavaScripts and Texts for ad and popup generation @@ -1859,7 +1868,9 @@ adjamblog.files.wordpress.com/ websupport.wdc.com/ #MASTER# UNBLOCK-REFERRER: http://conradelektronik.m13.mailplus.nl/genericservice/code/servlet/React?encId=xSgAxBFNnFrne8j&actId=357685&command=openhtml # URL = http://content.conrad.se/newsletter/banners/OFFER_750987_exk.jpg -.conrad.se/newsletter/banners/ +#MASTER# UNBLOCK-REFERRER: http://nyhetsbrev.conrad.se/form.do?agnCI=25&agnFN=fullview&agnUID=A.C.E4N.Bv_m.EnED.EDtQoE_5_4bI7xQlTGfxSA +# URL = http://media.conrad.se/newsletter/banner7/endoskop_123344.jpg +.conrad.se/newsletter/ #MASTER# REMARKS: Actionsfile feedback item #3413827 2011-09-25 12:11 #MASTER# REMARKS: This domain hosts JS, images and CSS upon which hotmail.com depends .wlxrs.com/ @@ -1869,6 +1880,29 @@ websupport.wdc.com/ # URL = http://www.smugmug.com/community/ADVrider # URL = http://www.siteinfotool.com/advrider.com /.*ADVrider +#MASTER# UNBLOCK-REFERRER: http://www.speedtest.net/ +#MASTER# REMARKS: Support request #3612908 2013-05-08 07:31:46 PDT +#MASTER# REMARKS: Appears to be a content delivery subdomain for the parent domain +# URL = http://adn.speedtest.net +adn.speedtest.net +# URL = http://adressbuch.bundestag.de/adressbuch/ +.bundestag.de/ +# URL = http://www.rote-hilfe.de/images/banners/mitglied_werden_banner156.png +.rote-hilfe.de/ +# URL = http://cs.stackexchange.com/posts/popup/close/suggest-originals/16678?_=1383517814677 +.stackexchange.com/(.*/)?popup +# URL = http://cs.stackoverflow.com/posts/popup/close/suggest-originals/16678?_=1383517814677 +.stackoverflow.com/(.*/)?popup +# URL = http://cs.serverfault.com/posts/popup/close/suggest-originals/16678?_=1383517814677 +.serverfault.com/(.*/)?popup +# URL = http://cs.superuser.com/posts/popup/close/suggest-originals/16678?_=1383517814677 +.superuser.com/(.*/)?popup +#MASTER# UNBLOCK-REFERRER: http://cologne.stopwatchingus.info/demo-12-april.html +# URL = http://cologne.stopwatchingus.info/images/banner/Demo-Koeln-12-04-14-Banner.png +# URL = http://cologne.stopwatchingus.info/images/banner/Demo-Koeln-12-04-14-Banner2.png +# URL = http://cologne.stopwatchingus.info/images/banner/Demo-12-April.jpg +.stopwatchingus.info/ + ############################################################################# # Site-specific special rules: @@ -2041,6 +2075,12 @@ webcache.googleusercontent.com/ .googleapis.com/ # URL = http://www.google.com.au/sorry/?continue=http://www.google.com.au/search%3Fhl%3Den%26tbo%3Dd%26output%3Dsearch%26sclient%3Dpsy-ab%26q%3Dnew%2Bcars%26btnG%3D .google./sorry/\?continue?= +# URL = http://www.microsofttranslator.com/bv.aspx?from=ru&to=en&a=http://ru.wikipedia.org/wiki/Privoxy +.microsofttranslator.com/ +# URL = http://www.facebook.com/plugins/like.php?locale=de_DE&href=http%3A%2F%2Fwww.spiegel.de%2Fpolitik%2Fausland%2Fnsa-und-britischer-geheimdienst-knacken-systematisch-verschluesselung-a-920710.html&layout=standard&show_faces=false&width=480&action=recommend&font=verdana&colorscheme=light&height=22 +.facebook.com/plugins/like.php +# URL = http://creativecommons.org/choose/zero/confirm?license-class=zero&name=...&actor_href=http%3A%2F%2Fexample.org%2F&work_title=...&work_jurisdiction=DE&confirm=confirm&understand=confirm&lang=de&field1=weiter +creativecommons.org/ {+redirect{s@.*url=@http://@} -block} # Sticky Actions = +redirect -block @@ -2202,6 +2242,10 @@ javabog.dk/ijk/ .couchsurfing.org/ # URL = http://www.thinkgeek.com/tshirts-apparel/unisex/generic/ .thinkgeek.com/ +# URL = http://www.dgb-tagungszentren.de/hattingen/unsere-extras +.dgb-tagungszentren.de/ +# URL = http://creativecommons.org/licenses/ +creativecommons.org/ {-filter{banners-by-link}} # Sticky Actions = -filter{banners-by-link} @@ -2421,6 +2465,13 @@ config.privoxy.org/ # Redirect Destination = http://login.yahoo.com/config/login?logout=1&.done=http://mail.yahoo.com&.src=ym&.intl=us .yahoo./.*http://login.yahoo.com/config/login.*http:// +#MASTER# PROBLEM-URL: http://www.washingtonpost.com/news/volokh-conspiracy/wp/2014/07/09/missouri-voters-will-consider-strengthening-state-constitutional-right-to-bear-arms/ +{-fast-redirects +redirect{s@.*(http://[^&]+\.jpg).*$@$1@i}} +# Sticky Actions = -fast-redirects +redirect +# Redirected URL = http://www.washingtonpost.com/wp-apps/imrs.php?src=http://img.washingtonpost.com/news/volokh-conspiracy/wp-content/uploads/sites/14/2014/07/Volk1.jpg&w=480 +# Redirect Destination = http://img.washingtonpost.com/news/volokh-conspiracy/wp-content/uploads/sites/14/2014/07/Volk1.jpg +.washingtonpost.com/wp-apps/imrs\.php\?src= + #MASTER# REMARKS: The next two sections are to get flickr's Ajax interface working #MASTER# REMARKS: with default pre-settings. For more aggressive defaults they additionally #MASTER# REMARKS: need -crunch-incoming-cookies and -crunch-outgoing-cookies. @@ -2459,4 +2510,31 @@ TAG:^IMAGE-REQUEST$ } TAG:^CSS-REQUEST$ +############################################################################# +# Depends on +client-header-tagger{content-type} +############################################################################# +{-filter{html-annoyances} \ + -filter{content-cookies} \ + -filter{refresh-tags} \ + -filter{img-reorder} \ + -filter{banners-by-size} \ + -filter{banners-by-link} \ + -filter{webbugs} \ + -filter{tiny-textforms} \ + -filter{frameset-borders} \ + -filter{iframes} \ + -filter{demoronizer} \ + -filter{shockwave-flash} \ + -filter{quicktime-kioskmode} \ + -filter{fun} \ + -filter{crude-parental} \ + -filter{site-specifics} \ + -filter{no-ping} \ + -filter{google} \ + -filter{yahoo} \ + -filter{msn} \ + -filter{blogspot} \ +} +TAG:^(application|text)/(x-)?javascript$ + #MASTER# set vi:nowrap