X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/622372dee2d7bf45fbf482a58732478b0ccf03c6..8f6bf8b7cd2909565909a6f817426a3f6c8c0d80:/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 62e25d195..611bd4a73 100644
--- a/cookbooks/tilecache/templates/default/nginx_tile.conf.erb
+++ b/cookbooks/tilecache/templates/default/nginx_tile.conf.erb
@@ -1,57 +1,73 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
 upstream tile_cache_backend {
-    server 127.0.0.1;
+  server 127.0.0.1;
 
-    # Add the other caches to relieve pressure if local squid failing
-    # Balancer: round-robin
+  # Add the other caches to relieve pressure if local squid failing
+  # Balancer: round-robin
 <% @caches.each do |cache| -%>
 <% if cache[:hostname] != node[:hostname] -%>
-    # Server <%= cache[:hostname] %>
+<% if node[:tilecache][:tile_siblings].include? cache[:fqdn] -%>
 <% cache.ipaddresses(:family => :inet, :role => :external).sort.each do |address| -%>
-    server <%= address %> backup;
+  server <%= address %> backup; # Server <%= cache[:hostname] %>
 <% end -%>
 <% end -%>
 <% end -%>
+<% end -%>
+
+  keepalive 256;
+}
 
-    keepalive 256;
+# Geo Map of tile caches
+geo $tile_cache {
+  default 0;
+<% @caches.each do |cache| -%>
+<% cache.ipaddresses(:family => :inet, :role => :external).sort.each do |address| -%>
+  <%= address %> 1; # <%= cache[:hostname] %>
+<% end -%>
+<% end -%>
 }
 
 # Rates table based on current cookie value
-map $cookie_qos_token $limit_rate_qos {
+map $cookie__osm_totp_token $limit_rate_qos {
   include /etc/nginx/conf.d/tile_qos_rates.map;
 }
 
 # Set-Cookie table based on current cookie value
-map $cookie_qos_token $cookie_qos_token_set {
+map $cookie__osm_totp_token $cookie_qos_token_set {
   include /etc/nginx/conf.d/tile_qos_cookies.map;
 }
 
 map $http_user_agent $approved_scraper {
-  default '';                       # Not approved
-  '~^JOSM\/' 'JOSM';
-  '~^Mozilla\/5\.0\ QGIS\/' 'QGIS';
+  default                   0; # Not approved
+  '~^JOSM\/'                1; # JOSM
+  '~^Mozilla\/5\.0\ QGIS\/' 1; # QGIS
 }
 
 map $http_user_agent $denied_scraper {
-  default '';          # Not denied
-  '~^Python\-urllib\/' 'Python';
-  '~^python\-requests\/' 'Python';
-  '~^R$'               'R';
-  '~^Java\/'           'Java';
-  '~^tiles$'           'Unknown';
-  '~^Dalvik\/'         'Dalvik';
-  '~^runtastic'        'runtastic';
-  'Mozilla/4.0'        'Unknown';
-  'Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1)' 'Unknown';
+  default                0; # Not denied
+  ''                     1; # No User-Agent Set
+  '~^Python\-urllib\/'   1; # Library Default
+  '~^python\-requests\/' 1; # Library Default
+  '~^node\-fetch\/'      1; # Library Default
+  '~^R$'                 1; # Library Default
+  '~^Java\/'             1; # Library Default
+  '~^tiles$'             1; # Library Default
+  '~^runtastic'          1; # App
+  'Mozilla/4.0'          1; # Fake
+  'Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1)' 1;  # Fake
 }
 
 map $http_referer $denied_referer {
-  default '';                      # Not denied
-  'http://www.openstreetmap.org/'  'old-osm';
-  'http://www.osm.org/'            'old-osm';
-  'http://openstreetmap.org'       'fake-osm';
-  'http://www.openstreetmap.org'   'fake-osm';
+  default                          0; # Not denied
+  'http://www.openstreetmap.org/'  1; # Faked
+  'http://www.openstreetmap.org'   1; # Faked
+  'http://openstreetmap.org/'      1; # Faked
+  'http://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
 }
 
 # Limit Cache-Control header to only approved User-Agents
@@ -69,7 +85,7 @@ map $http_user_agent $limit_http_pragma {
 }
 
 server {
-    listen       443 ssl fastopen=2048 http2 default_server;
+    listen       443 ssl deferred backlog=16384 reuseport fastopen=2048 http2 default_server;
     server_name  localhost;
 
     proxy_buffers 8 64k;
@@ -77,13 +93,83 @@ server {
     ssl_certificate      /etc/ssl/certs/tile.openstreetmap.org.pem;
     ssl_certificate_key  /etc/ssl/private/tile.openstreetmap.org.key;
 
+    # Requests sent within early data are subject to replay attacks.
+    # See: http://nginx.org/en/docs/http/ngx_http_ssl_module.html#ssl_early_data
+    ssl_early_data on;
+
+    # Immediately 404 layers we do not support
+<% for i in 20..99 do %>
+    location /<%= i %>/ {
+      set $limit_rate 512;
+      return 404;
+    }
+<% end %>
+
+    # Immediately 404 silly tile requests
+    location = /0/0/-1.png {
+      set $limit_rate 512;
+      return 404;
+    }
+    location = /1/0/-1.png {
+      set $limit_rate 512;
+      return 404;
+    }
+    location = /1/-1/0.png {
+      set $limit_rate 512;
+      return 404;
+    }
+    location = /1/-1/1.png {
+      set $limit_rate 512;
+      return 404;
+    }
+    location = /1/-1/-1.png {
+      set $limit_rate 512;
+      return 404;
+    }
+    location = /1/-1/2.png {
+      set $limit_rate 512;
+      return 404;
+    }
+    location = /1/1/-1.png {
+      set $limit_rate 512;
+      return 404;
+    }
+    location = /1/2/-1.png {
+      set $limit_rate 512;
+      return 404;
+    }
+    location = /2/0/-1.png {
+      set $limit_rate 512;
+      return 404;
+    }
+    location = /2/-1/0.png {
+      set $limit_rate 512;
+      return 404;
+    }
+    location = /2/-1/1.png {
+      set $limit_rate 512;
+      return 404;
+    }
+    location = /2/1/-1.png {
+      set $limit_rate 512;
+      return 404;
+    }
+    location = /2/-1/2.png {
+      set $limit_rate 512;
+      return 404;
+    }
+    location = /2/-1/3.png {
+      set $limit_rate 512;
+      return 404;
+    }
+
     location / {
       proxy_pass http://tile_cache_backend;
       proxy_set_header X-Forwarded-For $remote_addr;
       proxy_http_version 1.1;
       proxy_set_header Connection '';
 
-      proxy_connect_timeout 10s;
+      proxy_connect_timeout 5s;
 
       # Preserve host header.
       proxy_set_header Host $host;
@@ -115,9 +201,11 @@ server {
       }
 
       if ($denied_scraper) {
+        set $limit_rate 512;
         return 429;
       }
       if ($denied_referer) {
+        set $limit_rate 512;
         return 418;
       }