X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=permissionsfile;h=0687f74ef8ec239357408cb2aae089fc81164274;hp=0e030645209eb752a4b4a3c941a748e532466896;hb=2f9a5f159c1c380f61cfb9a7b747b386155bd1d3;hpb=12f52e6af55d51d4b268af7956d97c772eebbb5c

diff --git a/permissionsfile b/permissionsfile
index 0e030645..0687f74e 100755
--- a/permissionsfile
+++ b/permissionsfile
@@ -1,36 +1,50 @@
-# Sample permissions file for the Internet Junkbuster 2.9.4
+#############################################################################
+# Sample actions file for the Internet Junkbuster 2.9.4
 #
 # For information, see http://ijbswa.sourceforge.net/
-
-# Valid permissions are:
 #
+# $Id$
 #
-# +block
-#    Block this URL
+#############################################################################
+# Syntax
+#############################################################################
+# This file lists the actions to be applied to a request.
+# There are 3 kinds of action:
 #
-# +image
-#    Treat this URL as an image.  This only matters if it's also blocked, in
-#    which case a "blocked" image rather than a HTML page will be sent.
+# Boolean (e.g. "block"):
+#   +name  # enable
+#   -name  # disable
 #
-# +cookies-read
-#    Allow the website to read cookies
+# Parameterized (e.g. "hide-user-agent"):
+#   +name{param}  # enable and set parameter to "param"
+#   -name         # disable
 #
-# +cookies-set
-#    Allow the website to set cookies
+# Multi-value (e.g. "add-header", "wafer"):
+#   +name{param}  # enable and add parameter "param"
+#   -name{param}  # remove the parameter "param"
+#   -name         # disable totally
 #
-# +filter
-#    Filter the website through the re_filterfile
+# The default (if you don't specify anything in this file) is not to take
+# any actions - i.e completely disabled, so JunkBuster will just be a
+# normal, non-blocking, non-anonymizing proxy.  You must specifically
+# enable the privacy and blocking features you need (although the 
+# provided default actions file will do that for you).
 #
-# +popup
-# +popups
-#    Allow the website to use window.open()
+# Later actions always override earlier ones.  For multi-valued actions,
+# the actions are applied in the order they are specified.
 #
-# +referer
-# +referrer
-#    Send the "Referer:" (sic) header to the web site
+#############################################################################
+# Valid actions are:
+#############################################################################
 #
-# +fast-redirects
+# +add-header{Name: value}
+#    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
+#
+# +fast-redirects
 #    Many sites, like yahoo.com, don't just link to other sites.
 #    Instead, they will link to some script on their own server,
 #    giving the destination as a parameter, which will then redirect
@@ -46,15 +60,77 @@
 #    time is wasted, while your browser aks the server for one redirect
 #    after the other. Plus, it feeds the advertisers.
 #
-#    The fast-redirects option enables interception of these requests
+#    The +fast-redirects option enables interception of these requests
 #    by junkbuster, who will cut off all but the last valid URL in the
 #    request and send a local redirect back to your browser without
 #    contacting the remote site.
 #
+# +filter
+#    Filter the website through the re_filterfile
+#    FIXME: The syntax should be +filter{filename}
+#
+# +hide-forwarded
+#    Block any existing X-Forwarded-for header, and do not add a new one.
+#
+# +hide-from{block}
+# +hide-from{spam@sittingduck.xqq}
+#    If the browser sends a "From:" header containing your e-mail address, 
+#    either completely removes the header ("block"), or change it to the
+#    specified e-mail address.
+#
+# +hide-referer{block}
+# +hide-referer{forge}
+# +hide-referer{http://nowhere.com}
+#    Don't send the "Referer:" (sic) header to the web site.  You can
+#    block it, forge a URL to the same server as the request (which is
+#    preferred because some sites will not send images otherwise) or
+#    set it to a constant string.
+#
+# +hide-referrer{...}
+#    Alternative spelling of +hide-referer.  Has the same parameters,
+#    and can be freely mixed with, "+hide-referer".  ("referrer" is the 
+#    correct English spelling, however the HTTP specification has a 
+#    bug - it requires it to be spelt "referer").
+#
+# +hide-user-agent{browser-type}
+#    Change the "User-Agent:" header so web servers can't tell your
+#    browser type.  (Breaks many web sites).  Specify the user-agent
+#    value you want - e.g., to pretend to be using Netscape on Linux:
+#      +hide-user-agent{Mozilla (X11; I; Linux 2.0.32 i586)}
+#    Or to identify yourself explicitly as a JunkBuster user:
+#      +hide-user-agent{JunkBuster/1.0}
+#    (Don't change the version number from 1.0 - after all, why tell them?)
+#
+# +image
+#    Treat this URL as an image.  This only matters if it's also blocked, in
+#    which case a "blocked" image rather than a HTML page will be sent.
+#    (According to the tinygif setting in the config file).
+#
+# +no-cookies-read
+#    Prevent the website from reading cookies
+#
+# +no-cookies-set
+#    Prevent the website from setting cookies
 #
-# All of these permissions also have a "-permission" setting to turn
-# them off - e.g. "-block" allows you to unblock a previously blocked site.
+# +no-popup
+# +no-popups
+#    Filter the website through a built-in filter to disable
+#    window.open() etc.  The two alternative spellings are
+#    equivalent.
 #
+# +vanilla-wafer
+#    This action only applies if you are using a jarfile.  It sends a
+#    cookie to every site stating that you do not accept any copyright
+#    on cookies sent to you, and asking them not to track you.  Of
+#    course, this is a (relatively) unique header they could use to 
+#    track you.
+#
+# +wafer{name=value}
+#    This allows you to add an arbitrary cookie.  Specify it multiple
+#    times in order to add several cookies.
+#
+#############################################################################
+
 
 
 #############################################################################
@@ -64,58 +140,77 @@
 #############################################################################
 #
 # You can define a short form for a list of permissions - e.g., instead
-# of "+cookies-set +cookies-read -filter -fast-redirects", you can
+# of "-no-cookies-set -no-cookies-read -filter -fast-redirects", you can
 # just write "shop".  This is called an alias.
 #
-# Currently, an alias can contain any character except space, tab, or '='.
+# Currently, an alias can contain any character except space, tab, '=', '{'
+# or '}'.
 # But please use only 'a'-'z', '0'-'9', '+', and '-'.
 #
 # Alias names are not case sensitive.
 #
 # Aliases beginning with '+' or '-' may be used for system permission names 
 # in future releases - so try to avoid alias names like this.  (e.g. 
-# "+cookies" below is not a good name)
+# "+no-cookies" below is not a good name)
 #
 # Aliases must be defined before they are used.
 # 
-+cookies    = +cookies-set +cookies-read
--cookies    = -cookies-set -cookies-read
-fragile     = -block +cookies -filter -fast-redirects +referer +popups
-shop        = +cookies -filter -fast-redirects
+
+# Useful aliases
++no-cookies = +no-cookies-set +no-cookies-read
+-no-cookies = -no-cookies-set -no-cookies-read
+fragile     = -block -no-cookies -filter -fast-redirects -hide-referer -no-popups
+shop        = -no-cookies -filter -fast-redirects
 +imageblock = +block +image
 
 #For people who don't like to type too much:  ;-)
-c0 = -cookies
-c1 = +cookies
-c2 = +cookies-set -cookies-read
-c3 = -cookies-set +cookies-read
+c0 = +no-cookies
+c1 = -no-cookies
+c2 = -no-cookies-set +no-cookies-read
+c3 = +no-cookies-set -no-cookies-read
 #... etc.  Customize to your heart's content.
 
 #############################################################################
 # Defaults
 #############################################################################
-{-block -image -cookies +filter +fast-redirects -referer -popups}
+#FIXME: Line continuation is broken - can't split a line at whitespace.
+{ -\
+block +\
+fast-redirects +\
+filter +\
+hide-forwarded +\
+hide-from{block} +\
+hide-referer{forge} -\
+hide-user-agent -\
+image +\
+no-cookies-read +\
+no-cookies-set +\
+no-popups +\
+vanilla-wafer \
+}
 / # Match all URLs
 
 #############################################################################
-# Not yet implemented
+# A useful site for testing - shows all headers:
+# http://privacy.net/analyze/
 #############################################################################
-#{{filter}}
-#s/Microsoft/MicroSuck/ig
+{+add-header{X-Privacy: Yes please} +#-add-header{*} +\
+add-header{X-User-Tracking: No thanks!} -filter}
+privacy.net
 
 #############################################################################
 # Permissions list
 #############################################################################
 
 # Sites that need cookies
-{+cookies}
+{-no-cookies}
 javasoft.com
 sun.com
 yahoo.com
 msdn.microsoft.com
 
 # Alternative way of saying the same thing
-{+cookies-set +cookies-read}
+{-no-cookies-set -no-cookies-read}
 sourceforge.net
 sf.net
 
@@ -133,10 +228,18 @@ jungle.com
 scan.co.uk
 
 # These shops require pop-ups
-{shop +popups}
+{shop -no-popups}
 dabs.com
 overclockers.co.uk
 
+# This is a graphical-> text only conversion script
+{-fast-redirects}
+www.ukc.ac.uk/cgi-bin/wac\.cgi\?
+
+# Please don't re_filter code!
+{-filter}
+cvs.sourceforge.net
+
 #############################################################################
 # Imagelist:
 #############################################################################
@@ -158,6 +261,30 @@ connect.247media.ads.link4ads.com
 ln.doubleclick.net
 mojofarm.mediaplex.com/ad/
 www.carbuyer.com/cgi-carbuyer/getimage.cgi
+/phpAds(New)?/viewbanner\.php
+ad.de.doubleclick.net
+/.*/count\.cgi\?.*df=
+*.fxweb.com/v2-trackrun\.cgi
+195.63.104.61
+195.63.104.222
+213.165.64.38
+213.165.64.39
+213.165.64.40
+213.165.64.41
+213.165.64.42
+213.165.64.43
+213.165.64.44
+194.221.183.221
+194.221.183.222
+194.221.183.223
+194.221.183.224
+194.221.183.225
+194.221.183.226
+194.221.183.227
+a196.g.akamai.net/7/196/2670/000[12]/images.gmx.net/i4/images/.*/
+/cgi-bin/ivw/CP/CGI
+151.189.8.213/Adimg
+151.189.8.193/Media
 
 #############################################################################
 # Blocklist:
@@ -376,12 +503,6 @@ netdirect.nl/nd_servlet/___
 193.158.37.3/cgi-bin/impact
 193.210.156.114
 193.98.1.160/img
-194.221.183.222/mailsentlu
-194.221.183.223
-194.221.183.224
-194.221.183.225
-194.221.183.226
-194.221.183.227
 194.231.79.38
 195.124.124.56
 195.27.70.69
@@ -454,7 +575,6 @@ ICDirect.com/cgi-bin
 Shannon.Austria.Eu.net/\.cgi/
 WebSiteSponsor.de
 207.181.220.145
-213.165.64.42
 
 #
 # generic hosts (probably most effective)
@@ -494,7 +614,6 @@ imagine-inc.com
 commonwealth.riddler.com/Commonwealth/bin/statdeploy\?[0-9]+
 customad.cnn.com
 dagbladet.no/ann-gif
-deja.com/jump/
 digits.com/wc/
 dino.mainz.ibm.de
 dn.adzerver.com/image.ad
@@ -505,7 +624,7 @@ eur.yimg.com/a/
 eur.a1.yimg.com/eur.yimg.com/a/
 us.a1.yimg.com/us.yimg.com/a/
 eurosponsor.de
-fastcounter.linkexchange.com
+#fastcounter.linkexchange.com
 flycast.com
 focalink.com/SmartBanner
 freepage.de/cgi-bin/feets/freepage_ext/.*/rw_banner
@@ -515,9 +634,6 @@ gaia.occ.com/click.*
 globaltrack.com
 globaltrak.net
 go.com/cimages\?SEEK_
-gp.dejanews.com/gtplacer
-gtp.dejanews.com/gtplacer
-deja.com/gifs/onsale/
 hitbox.com 
 home.miningco.com/event.ng/.*AdID
 hurra.de
@@ -525,7 +641,7 @@ hyperbanner.net
 icount.com/.*count
 image*.narrative.com/news/.*\.(gif|jpe?g)
 image.click2net.com
-image.linkexchange.com
+#image.linkexchange.com
 images.nytimes.com
 images.yahoo.com/adv/
 images.yahoo.com/promotions/
@@ -536,7 +652,7 @@ informer2.comdirect.de:6004/cd/banner2
 infoseek.go.com/cimages
 ins.at/asp/images/
 kaufwas.com/cgi-bin/zentralbanner\.cgi
-leader.linkexchange.com
+#leader.linkexchange.com
 link4ads.com
 link4link.com
 linktrader.com/cgi-bin/
@@ -544,7 +660,7 @@ logiclink.nl/cgi-bin/
 lucky.theonion.com/cgi-bin/oniondirectin\.cgi
 lucky.theonion.com/cgi-bin/onionimp\.cgi
 lucky.theonion.com/cgi-bin/onionimpin\.cgi
-m.doubleclick.net
+#m.doubleclick.net
 mailorderbrides.com/mlbrd2\.gif
 media.priceline.com
 mediaplex.com
@@ -657,7 +773,7 @@ www.isys.net/customer/images
 www.javaworld.com/javaworld/jw-ad
 www.kron.com/place-ads/
 www.leo.org/leoclick/
-www.linkexchange.ru/cgi-bin/erle\.cgi
+#www.linkexchange.ru/cgi-bin/erle\.cgi
 www.linkstation.de/cgi-bin/zeige
 www.linux.org/graphic/miniature/
 www.linux.org/graphic/square/
@@ -730,7 +846,7 @@ pathfinder.com/shopping/marketplace/images/
 /*.*/adgraphic*
 static.wired.com/images
 perso.estat.com/cgi-bin/perso/
-dinoadserver1.roka.net
+#dinoadserver1.roka.net
 fooladclient*.fool.com
 affiliate.aol.com/static/
 cybereps.com:8000
@@ -743,14 +859,9 @@ smartage.com
 # www.sunday-times.co.uk
 www.sunday-times.co.uk/standing/newsint/ticker
 
-# Für Germany.Net-User: Germany.Net (fast) banner- u. grafikfrei!
-germany.net/gebu-frei\.gif
-germany.net/bilder/menue/leiste\.gif
-germany.net/bilder/gn_logos/*
-germany.net/bilder/90x90/*
-germany.net/banner-homepage/*
-germany.net/downloadshop/*
-germany.net/bilder/action/promopoly/germanynet/basisdienste/hilfe/*
+#NeXgo (ex Germany.Net)
+151.189.8.193
+151.189.8.213
 
 # Block as much of GeoCities as possible
 # All geocities-owned images
@@ -855,8 +966,6 @@ images.cnn.com/SHOP/
 /.*microdell\.gif
 /.*secureit\.gif
 
-g.deja.com/gifs/(q|us)west_120x120\.gif
-
 #
 /gif/buttons/banner_.*
 /gif/buttons/cd_shop_.*
@@ -957,7 +1066,7 @@ nasdaq-amex.com/images/bn_ticker\.gif
 # wayne@staff.msen.com
 #
 a*.*.*.yimg.com/([0-9]*|\/)*us.yimg.com/*
-ad.doubleclick.net
+#ad.doubleclick.net
 www.dnps.com/ads
 www.realtop50.com/cgi-bin/ad
 
@@ -981,8 +1090,8 @@ www.travelocity.com/images/promos/
 # wonder that that does...
 p01.com/1x1.dyn
 
-/*.*/phpAds/viewbanner.php
-/*.*/phpAds/phpads.php
+#/*.*/phpAds/viewbanner.php
+#/*.*/phpAds/phpads.php
 
 www.linux-magazin.de/banner    
 comtrack.comclick.com
@@ -1049,12 +1158,39 @@ sfads.osdn.com
 #This site traps the browser
 webhideout.com
 
+#privacy.net runs ads
+a.consumer.net
 
 #Lindsay.Marshall@newcastle.ac.uk suggested these, to kill Opera adverts:
 
 www.qksrv.net
 mirror.qkimg.net
 
+#js
+dinoadserver*.roka.net
+logout.gmx.net
+logout.tvspielfilm.de
+gmx.tvspielfilm.de
+www.freenet.de/customerindex\.html
+/*.*/phpAds
+*.fxweb.com/v2-trackrun\.cgi
+rtldating.peopleunited.de
+*.advertising.com
+www.zdnet.com/fcgi-bin/
+service.bfast.com/bfast/serve
+199.172.144.25
+fourohfour.nbci.com/Members404Error.php3
+*.adtech.de
+*.adlink.de
+www.fair-ist-mehr.de/cgi-bin/bt.pl
+*.linkexchange.*
+/.*/adpage.asp
+/ADS
+*.net-on.net
+rstrip.namezero.com
+62.26.220.2
+*.doubleclick.net
+
 #############################################################################
 {-block}
 #############################################################################
@@ -1072,7 +1208,7 @@ cpan.valueclick.com
 #
 #
 adamwhone.co.uk
-adsl.tin.it
+#adsl.tin.it
 stsci.edu
 tgs.com
 sun.com
@@ -1080,10 +1216,10 @@ povray.org
 admin.*.*
 admin.*.*.*
 ad.siemens.de             # SIEMENS Automation & Drives
-add-url.altavista.com
+#add-url.altavista.com
 adis.on.ca
-address*.*.*
-address*.*.*.*
+#address*.*.*
+#address*.*.*.*
 add*.*.*
 add*.*.*.*
 adu*.*.*
@@ -1094,6 +1230,8 @@ advice.*.*.*
 # univ. don't advertise, do they :-)
 *.*.edu
 *.*.*.edu
+*.*.ac.uk   # English Universities too! - Jon
+*.*.*.ac.uk # English Universities too! - Jon 
 www.ugu.com/sui/ugu/adv
 adfa.edu.au
 adsl*.*.*
@@ -1172,5 +1310,12 @@ teledata.de
 msdn.microsoft.com
 
 
+#js
+adbusters.com
+freemail*.web.de/online/ordner/anzeigen
+foggy.sda.t-online.de
+us.i1.yimg.com/us.yimg.com/i/pim/ad2.gif
+www.nexgo.de/.*/bg_banner.jpg
+
 # End of file