X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/611017bc534a5e2191dbf939b4be4899bbe9669c..d4c2f75a87aae00bd5fee0d3772797b6b6b498c2:/cookbooks/nominatim/templates/default/nginx.erb

diff --git a/cookbooks/nominatim/templates/default/nginx.erb b/cookbooks/nominatim/templates/default/nginx.erb
index 1a5fa0c98..2e851c517 100644
--- a/cookbooks/nominatim/templates/default/nginx.erb
+++ b/cookbooks/nominatim/templates/default/nginx.erb
@@ -1,3 +1,7 @@
+upstream nominatim_service {
+  server 127.0.0.1:<%= @pools[:www][:port ]%>;
+}
+
 map $uri $nominatim_script_name {
     ~^(.+?\.php)         $1;
     ~^/([^/]+)           $1.php;
@@ -12,43 +16,54 @@ map $query_string $email_id {
     ~(^|&)email=([^&]+)  $2;
 }
 
-upstream nominatim_service {
-  server 127.0.0.1:<%= @pools[:www][:port ]%>;
+map $email_id $missing_email {
+    default "";
+    "" 1;
+}
+
+map $http_user_agent $missing_ua {
+    default "";
+    "" 1;
+}
+
+map $http_referer $missing_referer {
+    default "";
+    "" 1;
 }
 
 # Whitelisted IPs
-geo $limit {
-    default 1;
-    2001:978:2:2c::172:6 0;
-    2001:978:2:2c::172:7 0;
-    2001:978:2:2c::172:8 0;
-    2001:978:2:2c::172:b 0;
-    2001:978:2:2c::172:c 0;
-    2001:978:2:2c::172:d 0;
-    130.117.76.6 0;
-    130.117.76.7 0;
-    130.117.76.8 0;
-    89.16.162.21 0;
-    89.16.162.22 0;
-    46.235.224.148 0;
-    209.132.180.180 0;
-    209.132.180.168 0;
-    8.43.85.23 0; # gnome
+geo $whitelisted {
+    default 0;
+<% @frontends.each do |frontend| -%>
+<% frontend.ipaddresses(:role => :external) do |address| -%>
+    <%= address %> 1;
+<% end -%>
+<% end -%>
+    46.235.224.148 1;
+    209.132.180.180 1;
+    209.132.180.168 1;
+    8.43.85.23 1; # gnome
 }
 
-map $http_user_agent $blocked_user_agent {
+map $missing_email$missing_referer$http_user_agent $blocked_user_agent {
    default 0;
+   "11" 2; # block any requests without identifier
    include <%= @confdir %>/nginx_blocked_user_agent.conf;
 }
 
-map $http_referer $blocked_referrer {
+map $missing_email$missing_ua$http_referer $blocked_referrer {
    default 0;
    include <%= @confdir %>/nginx_blocked_referrer.conf;
 }
 
-map $limit $limit_key {
-    0 "";
-    1 $binary_remote_addr;
+map $missing_referer$missing_ua$email_id $blocked_email {
+   default 0;
+   include <%= @confdir %>/nginx_blocked_email.conf;
+}
+
+map $whitelisted $limit_www {
+    1 "";
+    0 $binary_remote_addr;
 }
 
 map $blocked_user_agent $limit_tarpit {
@@ -57,17 +72,37 @@ map $blocked_user_agent $limit_tarpit {
     2 $binary_remote_addr;
 }
 
-limit_req_zone $limit zone=www:50m rate=2r/s;
+limit_req_zone $limit_www zone=www:50m rate=2r/s;
 limit_req_zone $limit_tarpit zone=tarpit:10m rate=1r/s;
 limit_req_zone $binary_remote_addr zone=blocked:10m rate=20r/m;
 
+server {
+    listen 80 default_server;
+    listen [::]:80 default_server;
+
+    access_log <%= node[:nominatim][:logdir] %>/nominatim.openstreetmap.org-access.log combined;
+    error_log <%= node[:nominatim][:logdir] %>/nominatim.openstreetmap.org-error.log;
+
+    location /nginx_status {
+        stub_status on;
+        access_log   off;
+        allow 127.0.0.1;
+        allow ::1;
+        deny all;
+    }
+
+     rewrite ^/\.well-known/acme-challenge/(.*)$ http://acme.openstreetmap.org/.well-known/acme-challenge/$1 permanent;
+
+     location / {
+         return 301 https://$host$request_uri;
+     }
+}
+
 server {
     # IPv4
-    listen       80 deferred backlog=16384 reuseport fastopen=2048 default_server;
-    listen       443 ssl deferred backlog=16384 reuseport fastopen=2048 http2 default_server;
+    listen       443 ssl deferred backlog=16384 reuseport http2 default_server;
     # IPv6
-    listen       [::]:80 deferred backlog=16384 reuseport fastopen=2048 default_server;
-    listen       [::]:443 ssl deferred backlog=16384 reuseport fastopen=2048 http2 default_server;
+    listen       [::]:443 ssl deferred backlog=16384 reuseport http2 default_server;
     server_name  localhost;
 
     ssl_certificate /etc/ssl/certs/<%= node[:fqdn] %>.pem;
@@ -98,18 +133,17 @@ server {
     }
 
     location / {
-        set anyid = $http_referer$http_user_agent$email_id;
-        if (anyid = "")
-        { return 403; }
+        try_files $uri $uri/ @php;
+    }
+
+    location @php {
         if ($blocked_user_agent ~ ^2$)
         { return 403; }
         if ($blocked_referrer)
         { return 403; }
+        if ($blocked_email)
+        { return 403; }
 
-        try_files $uri $uri/ @php;
-    }
-
-    location @php {
         limit_req zone=www burst=10;
         limit_req zone=tarpit burst=2;
         limit_req_status 429;
@@ -121,6 +155,13 @@ server {
     }
 
     location ~* \.php$ {
+        if ($blocked_user_agent ~ ^2$)
+        { return 403; }
+        if ($blocked_referrer)
+        { return 403; }
+        if ($blocked_email)
+        { return 403; }
+
         limit_req zone=www burst=10;
         limit_req zone=tarpit burst=2;
         limit_req_status 429;