From: Tom Hughes <tom@compton.nu>
Date: Mon, 1 Jul 2024 18:04:51 +0000 (+0100)
Subject: Disable OAuth 1.0a and basic authentication
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/8dd0893b2c8f8996079a6aa4288539b6ba1cd896

Disable OAuth 1.0a and basic authentication
---

diff --git a/cookbooks/web/recipes/cgimap.rb b/cookbooks/web/recipes/cgimap.rb
index 380f2a8eb..7f302b6ec 100644
--- a/cookbooks/web/recipes/cgimap.rb
+++ b/cookbooks/web/recipes/cgimap.rb
@@ -65,7 +65,7 @@ systemd_service "cgimap" do
   user "rails"
   group "www-data"
   umask "0002"
-  exec_start "/usr/bin/openstreetmap-cgimap --daemon --instances 30"
+  exec_start "/usr/bin/openstreetmap-cgimap --daemon --instances 30 --basic_auth_support false --oauth_10_support false"
   exec_reload "/bin/kill -HUP $MAINPID"
   runtime_directory "cgimap"
   private_tmp true
diff --git a/cookbooks/web/resources/rails_port.rb b/cookbooks/web/resources/rails_port.rb
index 3f5078d34..debc4db50 100644
--- a/cookbooks/web/resources/rails_port.rb
+++ b/cookbooks/web/resources/rails_port.rb
@@ -364,7 +364,9 @@ action :create do
     "max_number_of_way_nodes" => node[:web][:max_number_of_way_nodes],
     "max_number_of_relation_members" => node[:web][:max_number_of_relation_members],
     "oauth_10_support" => false,
-    "oauth_10_registration" => false
+    "oauth_10_registration" => false,
+    "oauth_10a_support" => false,
+    "basic_auth_support" => false
   )
 
   if new_resource.memcache_servers