X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=re_filterfile;h=7c0f452fcb3b3e12e98f9918fd6adc5619c87708;hb=2a15be9e2f66289de550fc88df4ac4bc969b41a7;hp=a6b70963367f9d055af25e9ff3e5a8b783d7c377;hpb=b031d6f942ede79be80a52262e74aa45e221abd4;p=privoxy.git diff --git a/re_filterfile b/re_filterfile index a6b70963..7c0f452f 100644 --- a/re_filterfile +++ b/re_filterfile @@ -27,6 +27,24 @@ # # Revisions : # $Log: re_filterfile,v $ +# Revision 1.16 2002/02/21 00:12:19 jongfoster +# Modifying the banner regexps to use long URLS and to autodetect +# whether to show a logo or a transparent GIF, based on actionsfile +# setting. +# +# Revision 1.15 2001/12/28 23:54:20 steudten +# Fix for feature Req #495374: http-equiv problem +# +# Revision 1.14 2001/12/09 18:55:11 david__schmidt +# Updated CODE_STATUS to beta, commented out microsuck line in re_filterfile +# for 2.9.10 beta +# +# Revision 1.13 2001/10/13 13:11:20 joergs +# Fixed WebBug filter. +# +# Revision 1.12 2001/10/07 15:46:42 oes +# Followed Guy's proposal to change the document.cookie job +# # Revision 1.11 2001/09/21 12:34:00 joergs # Added filter to replace "Nimda" code by a warning. # @@ -79,7 +97,9 @@ s/()/$1never$2/i # check it out on http://www.airport-cgn.de/ and go to the arrivals page. # # ********************************************************************/ -s/]*http-equiv[^>]*refresh.*URL=([^>]*?)"?>//i +# only if content value isn't 0..1 +# FIXME: second line like first line for content value +s/]*http-equiv[^>]*refresh.*([0-9]+[0-9]|"[2-9]);URL=([^>]*?)"?>//i s/]*http-equiv="?page-enter"?[^>]*content=[^>]*>//i # ********************************************************************/ @@ -123,44 +143,47 @@ s|(document\.cookie)([ \t\r\n]*=)|documenZapCooky$2|g # # Kill *all* popups a la popup.c. (But for *all* sites, so I wouldn't do that.) # -# JavaScript: s/window\.open\(/who_wants_this_to.open(/ig +# JavaScript: s/window\.open\(/1;''\.concat\(/ig # HTML : s/target=['"]?_blank['"]?/target_who/g # # Kill banners by size: # (Sizes from http://www.iab.net/iab_banner_standards/bannersizes.html) -# Note: Use http://i.j.b/send-banner?type=trans for a transparent 1x1 gif -# ********************************************************************/ -s|]*?(width=['"]?468\D)[^>]*(height=['"]?60[^>]*?)>||sig -s|]*?(width=['"]?234\D)[^>]*(height=['"]?60[^>]*?)>||sig -s|]*?(width=['"]?88\D)[^>]*(height=['"]?31[^>]*?)>||sig -s|]*?(width=['"]?120\D)[^>]*(height=['"]?90[^>]*?)>||sig -s|]*?(width=['"]?120\D)[^>]*(height=['"]?600[^>]*?)>||sig -s|]*?(width=['"]?120\D)[^>]*(height=['"]?60[^>]*?)>||sig -s|]*?(width=['"]?160\D)[^>]*(height=['"]?600[^>]*?)>||sig -s|]*?(width=['"]?125\D)[^>]*(height=['"]?125[^>]*?)>||sig -s|]*?(width=['"]?120\D)[^>]*(height=['"]?240[^>]*?)>||sig -s|]*?(width=['"]?180\D)[^>]*(height=['"]?150[^>]*?)>||sig -s|]*?(width=['"]?300\D)[^>]*(height=['"]?250[^>]*?)>||sig -s|]*?(width=['"]?250\D)[^>]*(height=['"]?250[^>]*?)>||sig -s|]*?(width=['"]?240\D)[^>]*(height=['"]?400[^>]*?)>||sig -s|]*?(width=['"]?336\D)[^>]*(height=['"]?280[^>]*?)>||sig +# Note: Use http://ijbswa.sourceforge.net/config/send-banner?type=trans for a transparent 1x1 PNG +# Use http://ijbswa.sourceforge.net/config/send-banner?type=logo for the logo PNG +# Use http://ijbswa.sourceforge.net/config/send-banner?type=logo for a grey/white pattern PNG +# Use http://ijbswa.sourceforge.net/config/send-banner?type=auto to auto-select. +# ********************************************************************/ +s|]*?(width=['"]?468\D)[^>]*(height=['"]?60[^>]*?)>||sig +s|]*?(width=['"]?234\D)[^>]*(height=['"]?60[^>]*?)>||sig +s|]*?(width=['"]?88\D)[^>]*(height=['"]?31[^>]*?)>||sig +s|]*?(width=['"]?120\D)[^>]*(height=['"]?90[^>]*?)>||sig +s|]*?(width=['"]?120\D)[^>]*(height=['"]?600[^>]*?)>||sig +s|]*?(width=['"]?120\D)[^>]*(height=['"]?60[^>]*?)>||sig +s|]*?(width=['"]?160\D)[^>]*(height=['"]?600[^>]*?)>||sig +s|]*?(width=['"]?125\D)[^>]*(height=['"]?125[^>]*?)>||sig +s|]*?(width=['"]?120\D)[^>]*(height=['"]?240[^>]*?)>||sig +s|]*?(width=['"]?180\D)[^>]*(height=['"]?150[^>]*?)>||sig +s|]*?(width=['"]?300\D)[^>]*(height=['"]?250[^>]*?)>||sig +s|]*?(width=['"]?250\D)[^>]*(height=['"]?250[^>]*?)>||sig +s|]*?(width=['"]?240\D)[^>]*(height=['"]?400[^>]*?)>||sig +s|]*?(width=['"]?336\D)[^>]*(height=['"]?280[^>]*?)>||sig # Where is that from? -s|]*?(width=['"]?200\D)[^>]*(height=['"]?50[^>]*?)>||sig +s|]*?(width=['"]?200\D)[^>]*(height=['"]?50[^>]*?)>||sig # ********************************************************************/ # # Squish WebBugs: # # ********************************************************************/ -s/]*?(width|height)\s+=\s+['"]?1\D[^>]*?(width|height)\s+=\s+['"]?1\D[^>]*?>//sig +s/]*?(width|height)\s*=\s*['"]?1\D[^>]*?(width|height)\s*=\s*['"]?1(\D[^>]*?)?>//sig # ********************************************************************/ # # Fun stuff # # ********************************************************************/ -s/microsoft(?!.com)/MicroSuck/ig +#s/microsoft(?!.com)/MicroSuck/ig # ********************************************************************/ # @@ -173,16 +196,11 @@ s/microsoft(?!.com)/MicroSuck/ig #s%^.*(?Blocked

Blocked due to possible adult content. Please see this site.

%is #s+^.*warez.*$+No Warez

You're not searching for illegal stuff, are you?

+is -# ********************************************************************/ -# -# http://www.farscapezone.com/wwwboard/messages/1451.html -# -# ********************************************************************/ -s/(\w+) was tired/$1 needed more coffee<\/b>/ig - # ********************************************************************/ # # Remove Nimda code. # # ********************************************************************/ s%%
Internet JUNKBUSTER WARNING: This Server is infected with Nimda!%g + +