From: Matt Amos Date: Wed, 10 Aug 2016 16:02:04 +0000 (+0100) Subject: Merge branch 'block-fastpokemap' X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/e8987e2fbaf7a3ac07e31a1fb6e97a3ba86d7de1?hp=23c77c8072351780e68de26ed37b872308710247 Merge branch 'block-fastpokemap' --- diff --git a/cookbooks/tilecache/templates/default/squid.conf.erb b/cookbooks/tilecache/templates/default/squid.conf.erb index 032a60ecd..a5aea7912 100644 --- a/cookbooks/tilecache/templates/default/squid.conf.erb +++ b/cookbooks/tilecache/templates/default/squid.conf.erb @@ -23,6 +23,8 @@ acl osmtileScrapers browser MSIE.7\.0.*Windows.NT.5\.1.*2\.0\.50727.$ acl osmtileScrapers browser MSIE.5.5 acl osmtileScrapers browser ^LoadOSM\.exe$ acl osmtileScrapers browser ^app_name$ +acl osmtileScrapers browser ^osmdroid$ # app using osmdroid library not setting app-specific User-Agent +acl osmtileScrapers browser ^Mozilla/5\.0 (Windows NT 5\.1)$ # Faked User-Agent http_access deny osmtile_sites osmtileScrapers @@ -33,6 +35,12 @@ acl osmtileOverusers referer_regex ^https?://[^.]*\.fastpokemap\.com/ http_access deny osmtile_sites osmtileOverusers +# Block when neither the referer nor User-Agent is set - policy requires some identification of the site / app. +acl has_referer referer_regex . +acl has_user_agent browser_regex . + +http_access deny osmtile_sites !has_referer !has_user_agent + acl whitelist_path urlpath_regex ^/cgi-bin/(export|debug) acl blacklist_path urlpath_regex ^/cgi-bin/ acl blacklist_path urlpath_regex ^/MyAdmin/