Apply signup rate limits to the main site

diff --git a/cookbooks/web/recipes/rails.rb b/cookbooks/web/recipes/rails.rb
index 90411d552e8a6c38064c66b083af8b1f27179fc7..90bd16c0abbb9e62797a485a5347909af948d90a 100644 (file)
--- a/cookbooks/web/recipes/rails.rb
+++ b/cookbooks/web/recipes/rails.rb
@@ -143,6 +143,10 @@ rails_port "www.openstreetmap.org" do
   trace_image_storage_url "https://openstreetmap-gps-images.s3.dualstack.eu-west-1.amazonaws.com"
   overpass_url "https://query.openstreetmap.org/query-features"
   overpass_credentials true
   trace_image_storage_url "https://openstreetmap-gps-images.s3.dualstack.eu-west-1.amazonaws.com"
   overpass_url "https://query.openstreetmap.org/query-features"
   overpass_credentials true

+  signup_ip_per_day 24
+  signup_ip_max_burst 48
+  signup_email_per_day 1
+  signup_email_max_burst 2

   imagery_blacklist [
     # Current Google imagery URLs have google or googleapis in the domain
     ".*\\.google(apis)?\\..*/.*",
   imagery_blacklist [
     # Current Google imagery URLs have google or googleapis in the domain
     ".*\\.google(apis)?\\..*/.*",

diff --git a/cookbooks/web/resources/rails_port.rb b/cookbooks/web/resources/rails_port.rb
index 34ae014587928b942d458ef2cade3a27f6ea65ef..3854235283769dcaff466a2834ab4d09254cd829 100644 (file)
--- a/cookbooks/web/resources/rails_port.rb
+++ b/cookbooks/web/resources/rails_port.rb
@@ -86,6 +86,10 @@ property :trace_image_storage_url, String
 property :trace_icon_storage_url, String
 property :tile_cdn_url, String
 property :imagery_blacklist, Array
 property :trace_icon_storage_url, String
 property :tile_cdn_url, String
 property :imagery_blacklist, Array

+property :signup_ip_per_day, Integer
+property :signup_ip_max_burst, Integer
+property :signup_email_per_day, Integer
+property :signup_email_max_burst, Integer

 
 action :create do
   package %W[
 
 action :create do
   package %W[


@@ -336,7 +340,11 @@ action :create do
     "trace_image_storage_url",
     "trace_icon_storage_url",
     "tile_cdn_url",
     "trace_image_storage_url",
     "trace_icon_storage_url",
     "tile_cdn_url",

-    "imagery_blacklist"
+    "imagery_blacklist",
+    "signup_ip_per_day",
+    "signup_ip_max_burst",
+    "signup_email_per_day",
+    "signup_email_max_burst"

   ).compact.merge(
     "server_protocol" => "https",
     "server_url" => new_resource.site,
   ).compact.merge(
     "server_protocol" => "https",
     "server_url" => new_resource.site,