X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/a85fb31369bba596e063e47a00b0e1c528513567..8b26972a6378577bb1f565093453bce77752a8eb:/cookbooks/tilecache/templates/default/nginx_tile.conf.erb

diff --git a/cookbooks/tilecache/templates/default/nginx_tile.conf.erb b/cookbooks/tilecache/templates/default/nginx_tile.conf.erb
index f4dc039e6..1965de764 100644
--- a/cookbooks/tilecache/templates/default/nginx_tile.conf.erb
+++ b/cookbooks/tilecache/templates/default/nginx_tile.conf.erb
@@ -52,6 +52,7 @@ map $http_user_agent $approved_scraper {
 map $http_user_agent $denied_scraper {
   default                0; # Not denied
   ''                     1; # No User-Agent Set
+  '-'                    1;
 
   # Library defaults
   '~^Python\-urllib\/'   1;
@@ -64,6 +65,7 @@ map $http_user_agent $denied_scraper {
   '~^Microsoft-ATL-Native\/' 1;
   '/n software IPWorks HTTP/S Component - www.nsoftware.com' 1;
   '~^Wget\/'             1;
+  'java'                 1;
 
   # Library defaults or fakes
   'Android'              1;
@@ -71,6 +73,9 @@ map $http_user_agent $denied_scraper {
   'host'                 1;
   '~^maptestapp'         1;
   'Other'                1;
+  'osmdroid'             1;
+  '~^tilelive-http'      1;
+  '~^Java-http-client'   1;
 
   # Fakes
   'Mozilla/4.0'          1;
@@ -88,7 +93,7 @@ map $http_user_agent $denied_scraper {
   'br.com.concisoti.potybus' 1;
   'com.soft373.taptaxi'  1;
   'com.kradac.ktxcore'   1;
-  'ru.crowdsystems.topcontrol.knd' 1;
+  '~^ru.crowdsystems.topcontrol.knd' 1;
   'pl.itaxi.driver'      1;
   'net.uztaxi.driver'    1;
   'OSMDroid/2.1 (its; rutaxi 3.28.0)' 1;
@@ -96,46 +101,57 @@ map $http_user_agent $denied_scraper {
   'ru.taximaster.www'    1;
   'com.arobs.trackgps'   1;
   'com.helleniccomms.asteras.driver' 1;
+
+  # Malware
+  'Agent Smith'          1;
   # '~[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}' 1; # Fake UA
 }
 
 map $http_referer $denied_referer {
   default                          0; # Not denied
-  'http://www.openstreetmap.org/'  1; # Faked
-  'http://www.openstreetmap.org'   1; # Faked
-  'https://www.openstreetmap.org'  1; # Faked
-  'http://openstreetmap.org/'      1; # Faked
-  'http://openstreetmap.org'       1; # Faked
-  'https://openstreetmap.org'      1; # Faked
-  'http://www.osm.org/'            1; # Faked
-  'http://www.osm.org'             1; # Faked
-  'http://osm.org/'                1; # Faked
-  'http://osm.org'                 1; # Faked
-  'http://google.com'              1; # Faked
-  'http://www.google.com'          1; # Faked
-  'http://google.com/'             1; # Faked
-  'http://www.google.com/'         1; # Faked
-  'https://google.com'             1; # Faked
-  'https://www.google.com'         1; # Faked
-  'https://google.com/'            1; # Faked
-  'https://www.google.com/'        1; # Faked
-  'http://www.microsoft.com/'      1; # Faked
-  '~^https?://pmap\.kuku\.lu/'           1; # Too much traffic
-  '~^https?://[^.]*\.pmap\.kuku\.lu/'    1; # Too much traffic
-  '~^https?://fastpokemap\.com/'         1; # Too much traffic
-  '~^https?://[^.]*\.fastpokemap\.com/'  1; # Too much traffic
-  '~^https?://pkget\.com/'               1; # Too much traffic
-  '~^https?://[^.]*\.pkget\.com/'        1; # Too much traffic
-  '~^https?://twpkinfo\.com/'            1; # Too much traffic
-  '~^https?://[^.]*\.twpkinfo\.com/'     1; # Too much traffic
-  '~^https?://9db\.jp/'                  1; # Too much traffic
-  '~^https?://[^.]*\.9db\.jp/'           1; # Too much traffic
-  '~^https?://clustrmaps\.com/'          1; # Too much traffic
-  '~^https?://[^.]*\.clustrmaps\.com/'   1; # Too much traffic
-  '~^https?://geoportal360\.pl/'         1; # Too much traffic
-  '~^https?://skelbiu\.lt/'              1; # Too much traffic
-  '~^https?://[^.]*\.skelbiu\.lt/'       1; # Too much traffic
-  # '~^https?://[^.]*\.wialon.com/'        1; # Too much traffic (hold per 2020-04-10 email)
+  # Faked sites
+  'http://www.openstreetmap.org/'  1;
+  'http://www.openstreetmap.org'   1;
+  'https://www.openstreetmap.org'  1;
+  'http://openstreetmap.org/'      1;
+  'http://openstreetmap.org'       1;
+  'https://openstreetmap.org'      1;
+  'http://www.osm.org/'            1;
+  'http://www.osm.org'             1;
+  'http://osm.org/'                1;
+  'http://osm.org'                 1;
+  'http://google.com'              1;
+  'http://www.google.com'          1;
+  'http://google.com/'             1;
+  'http://www.google.com/'         1;
+  'https://google.com'             1;
+  'https://www.google.com'         1;
+  'https://google.com/'            1;
+  'https://www.google.com/'        1;
+  'http://www.microsoft.com/'      1;
+
+  # Overusing websites
+  '~^https?://pmap\.kuku\.lu/'           1;
+  '~^https?://[^.]*\.pmap\.kuku\.lu/'    1;
+  '~^https?://fastpokemap\.com/'         1;
+  '~^https?://[^.]*\.fastpokemap\.com/'  1;
+  '~^https?://pkget\.com/'               1;
+  '~^https?://[^.]*\.pkget\.com/'        1;
+  '~^https?://twpkinfo\.com/'            1;
+  '~^https?://[^.]*\.twpkinfo\.com/'     1;
+  '~^https?://9db\.jp/'                  1;
+  '~^https?://[^.]*\.9db\.jp/'           1;
+  '~^https?://clustrmaps\.com/'          1;
+  '~^https?://[^.]*\.clustrmaps\.com/'   1;
+  '~^https?://geoportal360\.pl/'         1;
+  '~^https?://skelbiu\.lt/'              1;
+  '~^https?://[^.]*\.skelbiu\.lt/'       1;
+  '~^https?://wialon\.[^.]*/'            1; # wialon has many domains, so block them all
+  '~^https?://[^.]*\.wialon\.[^.]*/'     1;
+  '~^https?://gps-trace\.com/'           1;
+  '~^https?://[^.]*\.gps-trace\.com/'    1;
+  '~^https?://cellmapper\.net/'          1;
+  '~^https?://[^.]*\.cellmapper\.net/'   1;
 }
 
 map $http_referer $osm_referer {
@@ -201,31 +217,64 @@ server {
 <% end %>
 
     # Immediately 404 silly tile requests
+    location = /0/-1/-1.png {
+      return 404;
+    }
+    location = /0/-1/0.png {
+      return 404;
+    }
+    location = /0/-1/1.png {
+      return 404;
+    }
     location = /0/0/-1.png {
       return 404;
     }
-    location = /1/0/-1.png {
+    location = /0/0/1.png {
       return 404;
     }
-    location = /1/-1/0.png {
+    location = /0/0/2.png {
       return 404;
     }
-    location = /1/-1/1.png {
+    location = /0/1/-1.png {
+      return 404;
+    }
+    location = /0/1/0.png {
+      return 404;
+    }
+    location = /0/1/1.png {
+      return 404;
+    }
+    location = /0/1/2.png {
+      return 404;
+    }
+    location = /0/2/0.png {
+      return 404;
+    }
+    location = /0/2/1.png {
+      return 404;
+    }
+    location = /0/2/2.png {
       return 404;
     }
     location = /1/-1/-1.png {
       return 404;
     }
+    location = /1/-1/0.png {
+      return 404;
+    }
+    location = /1/-1/1.png {
+      return 404;
+    }
     location = /1/-1/2.png {
       return 404;
     }
-    location = /1/1/-1.png {
+    location = /1/0/-1.png {
       return 404;
     }
-    location = /1/2/-1.png {
+    location = /1/1/-1.png {
       return 404;
     }
-    location = /2/0/-1.png {
+    location = /1/2/-1.png {
       return 404;
     }
     location = /2/-1/0.png {
@@ -234,13 +283,40 @@ server {
     location = /2/-1/1.png {
       return 404;
     }
+    location = /2/-1/2.png {
+      return 404;
+    }
+    location = /2/-1/3.png {
+      return 404;
+    }
+    location = /2/0/-1.png {
+      return 404;
+    }
     location = /2/1/-1.png {
       return 404;
     }
-    location = /2/-1/2.png {
+    location = /2/1/4.png {
       return 404;
     }
-    location = /2/-1/3.png {
+    location = /2/2/4.png {
+      return 404;
+    }
+    location = /2/3/4.png {
+      return 404;
+    }
+    location = /2/4/0.png {
+      return 404;
+    }
+    location = /2/4/1.png {
+      return 404;
+    }
+    location = /2/4/2.png {
+      return 404;
+    }
+    location = /2/4/3.png {
+      return 404;
+    }
+    location = /2/4/4.png {
       return 404;
     }