Improve filesystem sandboxing for tile services

[chef.git] / cookbooks / tile / recipes / default.rb

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index 7d056163fa234e057a2b34cf99fab87a1073de6b..576c0f6adf080718f0e35dd637bac1b208a8964c 100644 (file)
--- a/cookbooks/tile/recipes/default.rb
+++ b/cookbooks/tile/recipes/default.rb
@@ -23,7 +23,9 @@ include_recipe "git"
 include_recipe "munin"
 include_recipe "nodejs"
 include_recipe "postgresql"
 include_recipe "munin"
 include_recipe "nodejs"
 include_recipe "postgresql"

+include_recipe "prometheus"

 include_recipe "python"
 include_recipe "python"

+include_recipe "ruby"

 include_recipe "tools"
 
 blocks = data_bag_item("tile", "blocks")
 include_recipe "tools"
 
 blocks = data_bag_item("tile", "blocks")


@@ -40,45 +42,68 @@ apache_module "tile" do
   conf "tile.conf.erb"
 end
 
   conf "tile.conf.erb"
 end
 

+apache_conf "renderd" do
+  action :disable
+end
+

 ssl_certificate node[:fqdn] do
   domains [node[:fqdn], "tile.openstreetmap.org", "render.openstreetmap.org"]
   notifies :reload, "service[apache2]"
 end
 
 ssl_certificate node[:fqdn] do
   domains [node[:fqdn], "tile.openstreetmap.org", "render.openstreetmap.org"]
   notifies :reload, "service[apache2]"
 end
 

-tilecaches = search(:node, "roles:tilecache").sort_by { |n| n[:hostname] }
+remote_file "#{Chef::Config[:file_cache_path]}/fastly-ip-list.json" do
+  source "https://api.fastly.com/public-ip-list"
+  compile_time true
+  ignore_failure true
+end
+
+fastlyips = JSON.parse(IO.read("#{Chef::Config[:file_cache_path]}/fastly-ip-list.json"))

 
 apache_site "default" do
 
 apache_site "default" do

-  action [:disable]
+  action :disable
+end
+
+apache_site "tileserver_site" do
+  action :disable

 end
 
 apache_site "tile.openstreetmap.org" do
   template "apache.erb"
 end
 
 apache_site "tile.openstreetmap.org" do
   template "apache.erb"

-  variables :caches => tilecaches
+  variables :fastly => fastlyips["addresses"]

 end
 
 template "/etc/logrotate.d/apache2" do
   source "logrotate.apache.erb"
   owner "root"
   group "root"
 end
 
 template "/etc/logrotate.d/apache2" do
   source "logrotate.apache.erb"
   owner "root"
   group "root"

-  mode 0o644
+  mode "644"

 end
 
 directory "/srv/tile.openstreetmap.org" do
   owner "tile"
   group "tile"
 end
 
 directory "/srv/tile.openstreetmap.org" do
   owner "tile"
   group "tile"

-  mode 0o755
+  mode "755"
+end
+
+directory "/srv/tile.openstreetmap.org/conf" do
+  owner "tile"
+  group "tile"
+  mode "755"
+end
+
+file "/srv/tile.openstreetmap.org/conf/ip.map" do
+  owner "tile"
+  group "adm"
+  mode "644"

 end
 
 package "renderd"
 
 systemd_service "renderd" do
 end
 
 package "renderd"
 
 systemd_service "renderd" do

-  description "Mapnik rendering daemon"
+  dropin "chef"

   after "postgresql.service"
   wants "postgresql.service"
   after "postgresql.service"
   wants "postgresql.service"

-  user "www-data"
-  exec_start "/usr/bin/renderd -f"
-  runtime_directory "renderd"
-  standard_error "null"
+  limit_nofile 4096

   private_tmp true
   private_devices true
   private_network true
   private_tmp true
   private_devices true
   private_network true


@@ -88,6 +113,10 @@ systemd_service "renderd" do
   restart "on-failure"
 end
 
   restart "on-failure"
 end
 

+systemd_service "renderd" do
+  action :delete
+end
+

 service "renderd" do
   action [:enable, :start]
   subscribes :restart, "systemd_service[renderd]"
 service "renderd" do
   action [:enable, :start]
   subscribes :restart, "systemd_service[renderd]"


@@ -96,14 +125,14 @@ end
 directory "/srv/tile.openstreetmap.org/tiles" do
   owner "tile"
   group "tile"
 directory "/srv/tile.openstreetmap.org/tiles" do
   owner "tile"
   group "tile"

-  mode 0o755
+  mode "755"

 end
 
 template "/etc/renderd.conf" do
   source "renderd.conf.erb"
   owner "root"
   group "root"
 end
 
 template "/etc/renderd.conf" do
   source "renderd.conf.erb"
   owner "root"
   group "root"

-  mode 0o644
+  mode "644"

   notifies :reload, "service[apache2]"
   notifies :restart, "service[renderd]"
 end
   notifies :reload, "service[apache2]"
   notifies :restart, "service[renderd]"
 end


@@ -112,22 +141,23 @@ remote_directory "/srv/tile.openstreetmap.org/html" do
   source "html"
   owner "tile"
   group "tile"
   source "html"
   owner "tile"
   group "tile"

-  mode 0o755
+  mode "755"

   files_owner "tile"
   files_group "tile"
   files_owner "tile"
   files_group "tile"

-  files_mode 0o644
+  files_mode "644"

 end
 
 template "/srv/tile.openstreetmap.org/html/index.html" do
   source "index.html.erb"
   owner "tile"
   group "tile"
 end
 
 template "/srv/tile.openstreetmap.org/html/index.html" do
   source "index.html.erb"
   owner "tile"
   group "tile"

-  mode 0o644
+  mode "644"

 end
 
 package %w[
   python3-cairo
   python3-mapnik
 end
 
 package %w[
   python3-cairo
   python3-mapnik

+  python3-pyproj

   python3-setuptools
 ]
 
   python3-setuptools
 ]
 


@@ -135,35 +165,17 @@ python_package "pyotp" do
   python_version "3"
 end
 
   python_version "3"
 end
 

-package %w[
-  fonts-noto-cjk
-  fonts-noto-hinted
-  fonts-noto-unhinted
-  fonts-hanazono
-  ttf-unifont
-]
-
-["NotoSansArabicUI-Regular.ttf", "NotoSansArabicUI-Bold.ttf"].each do |font|
-  remote_file "/usr/share/fonts/truetype/noto/#{font}" do
-    action :create_if_missing
-    source "https://github.com/googlei18n/noto-fonts/raw/master/hinted/#{font}"
-    owner "root"
-    group "root"
-    mode 0o644
-  end
-end
-

 directory "/srv/tile.openstreetmap.org/cgi-bin" do
   owner "tile"
   group "tile"
 directory "/srv/tile.openstreetmap.org/cgi-bin" do
   owner "tile"
   group "tile"

-  mode 0o755
+  mode "755"

 end
 
 template "/srv/tile.openstreetmap.org/cgi-bin/export" do
   source "export.erb"
   owner "tile"
   group "tile"
 end
 
 template "/srv/tile.openstreetmap.org/cgi-bin/export" do
   source "export.erb"
   owner "tile"
   group "tile"

-  mode 0o755
+  mode "755"

   variables :blocks => blocks, :totp_key => web_passwords["totp_key"]
 end
 
   variables :blocks => blocks, :totp_key => web_passwords["totp_key"]
 end
 


@@ -171,20 +183,20 @@ template "/srv/tile.openstreetmap.org/cgi-bin/debug" do
   source "debug.erb"
   owner "tile"
   group "tile"
   source "debug.erb"
   owner "tile"
   group "tile"

-  mode 0o755
+  mode "755"

 end
 
 template "/etc/cron.hourly/export" do
   source "export.cron.erb"
   owner "root"
   group "root"
 end
 
 template "/etc/cron.hourly/export" do
   source "export.cron.erb"
   owner "root"
   group "root"

-  mode 0o755
+  mode "755"

 end
 
 directory "/srv/tile.openstreetmap.org/data" do
   owner "tile"
   group "tile"
 end
 
 directory "/srv/tile.openstreetmap.org/data" do
   owner "tile"
   group "tile"

-  mode 0o755
+  mode "755"

 end
 
 package "mapnik-utils"
 end
 
 package "mapnik-utils"


@@ -199,7 +211,7 @@ node[:tile][:data].each_value do |data|
     directory directory do
       owner "tile"
       group "tile"
     directory directory do
       owner "tile"
       group "tile"

-      mode 0o755
+      mode "755"

     end
   else
     directory = "/srv/tile.openstreetmap.org/data"
     end
   else
     directory = "/srv/tile.openstreetmap.org/data"


@@ -254,7 +266,7 @@ node[:tile][:data].each_value do |data|
     source url
     owner "tile"
     group "tile"
     source url
     owner "tile"
     group "tile"

-    mode 0o644
+    mode "644"

     backup false
     notifies :run, "execute[#{file}]", :immediately
     notifies :restart, "service[renderd]"
     backup false
     notifies :run, "execute[#{file}]", :immediately
     notifies :restart, "service[renderd]"


@@ -265,13 +277,19 @@ nodejs_package "carto"
 
 systemd_service "update-lowzoom@" do
   description "Low zoom tile update service for %i layer"
 
 systemd_service "update-lowzoom@" do
   description "Low zoom tile update service for %i layer"

+  conflicts "render-lowzoom.service"

   user "tile"
   exec_start "/bin/bash /usr/local/bin/update-lowzoom-%i"
   user "tile"
   exec_start "/bin/bash /usr/local/bin/update-lowzoom-%i"

+  runtime_directory "update-lowzoom-%i"

   private_tmp true
   private_devices true
   private_network true
   private_tmp true
   private_devices true
   private_network true

-  protect_system "full"
+  protect_system "strict"

   protect_home true
   protect_home true

+  read_write_paths [
+    "/srv/tile.openstreetmap.org/tiles/%i",
+    "/var/log/tile"
+  ]

   no_new_privileges true
   restart "on-failure"
 end
   no_new_privileges true
   restart "on-failure"
 end


@@ -279,7 +297,7 @@ end
 directory "/srv/tile.openstreetmap.org/styles" do
   owner "tile"
   group "tile"
 directory "/srv/tile.openstreetmap.org/styles" do
   owner "tile"
   group "tile"

-  mode 0o755
+  mode "755"

 end
 
 node[:tile][:styles].each do |name, details|
 end
 
 node[:tile][:styles].each do |name, details|


@@ -290,7 +308,7 @@ node[:tile][:styles].each do |name, details|
     source "update-lowzoom.erb"
     owner "root"
     group "root"
     source "update-lowzoom.erb"
     owner "root"
     group "root"

-    mode 0o755
+    mode "755"

     variables :style => name
   end
 
     variables :style => name
   end
 


@@ -302,21 +320,21 @@ node[:tile][:styles].each do |name, details|
   directory tile_directory do
     owner "tile"
     group "tile"
   directory tile_directory do
     owner "tile"
     group "tile"

-    mode 0o755
+    mode "755"

   end
 
   details[:tile_directories].each do |directory|
     directory directory[:name] do
   end
 
   details[:tile_directories].each do |directory|
     directory directory[:name] do

-      owner "www-data"
-      group "www-data"
-      mode 0o755
+      owner "_renderd"
+      group "_renderd"
+      mode "755"

     end
 
     directory[:min_zoom].upto(directory[:max_zoom]) do |zoom|
       directory "#{directory[:name]}/#{zoom}" do
     end
 
     directory[:min_zoom].upto(directory[:max_zoom]) do |zoom|
       directory "#{directory[:name]}/#{zoom}" do

-        owner "www-data"
-        group "www-data"
-        mode 0o755
+        owner "_renderd"
+        group "_renderd"
+        mode "755"

       end
 
       link "#{tile_directory}/#{zoom}" do
       end
 
       link "#{tile_directory}/#{zoom}" do


@@ -331,7 +349,7 @@ node[:tile][:styles].each do |name, details|
     action :create_if_missing
     owner "tile"
     group "tile"
     action :create_if_missing
     owner "tile"
     group "tile"

-    mode 0o444
+    mode "444"

   end
 
   git style_directory do
   end
 
   git style_directory do


@@ -348,6 +366,17 @@ node[:tile][:styles].each do |name, details|
     group "tile"
   end
 
     group "tile"
   end
 

+  if details[:fonts_script]
+    execute details[:fonts_script] do
+      action :nothing
+      command details[:fonts_script]
+      cwd style_directory
+      user "tile"
+      group "tile"
+      subscribes :run, "git[#{style_directory}]"
+    end
+  end
+

   execute "#{style_directory}/project.mml" do
     action :nothing
     command "carto -a 3.0.0 project.mml > project.xml"
   execute "#{style_directory}/project.mml" do
     action :nothing
     command "carto -a 3.0.0 project.mml > project.xml"


@@ -375,6 +404,11 @@ postgresql_user "tomh" do
   superuser true
 end
 
   superuser true
 end
 

+postgresql_user "pnorman" do
+  cluster node[:tile][:database][:cluster]
+  superuser true
+end
+

 postgresql_user "tile" do
   cluster node[:tile][:database][:cluster]
 end
 postgresql_user "tile" do
   cluster node[:tile][:database][:cluster]
 end


@@ -383,6 +417,10 @@ postgresql_user "www-data" do
   cluster node[:tile][:database][:cluster]
 end
 
   cluster node[:tile][:database][:cluster]
 end
 

+postgresql_user "_renderd" do
+  cluster node[:tile][:database][:cluster]
+end
+

 postgresql_database "gis" do
   cluster node[:tile][:database][:cluster]
   owner "tile"
 postgresql_database "gis" do
   cluster node[:tile][:database][:cluster]
   owner "tile"


@@ -413,7 +451,32 @@ end
     cluster node[:tile][:database][:cluster]
     database "gis"
     owner "tile"
     cluster node[:tile][:database][:cluster]
     database "gis"
     owner "tile"

-    permissions "tile" => :all, "www-data" => :select
+    permissions "tile" => :all, "www-data" => :select, "_renderd" => :select
+  end
+end
+
+package %w[
+  gdal-bin
+  python3-yaml
+  python3-psycopg2
+]
+
+if node[:tile][:database][:external_data_script]
+  execute node[:tile][:database][:external_data_script] do
+    command "#{node[:tile][:database][:external_data_script]} -R _renderd"
+    cwd "/srv/tile.openstreetmap.org"
+    user "tile"
+    group "tile"
+    ignore_failure true
+  end
+
+  Array(node[:tile][:database][:external_data_tables]).each do |table|
+    postgresql_table table do
+      cluster node[:tile][:database][:cluster]
+      database "gis"
+      owner "tile"
+      permissions "tile" => :all, "www-data" => :select, "_renderd" => :select
+    end

   end
 end
 
   end
 end
 


@@ -425,77 +488,124 @@ end
 directory File.dirname(node[:tile][:database][:node_file]) do
   owner "root"
   group "root"
 directory File.dirname(node[:tile][:database][:node_file]) do
   owner "root"
   group "root"

-  mode 0o755
+  mode "755"

   recursive true
 end
 
 file node[:tile][:database][:node_file] do
   owner "tile"
   recursive true
 end
 
 file node[:tile][:database][:node_file] do
   owner "tile"

-  group "www-data"
-  mode 0o660
+  group "_renderd"
+  mode "660"

 end
 
 directory "/var/log/tile" do
   owner "tile"
   group "tile"
 end
 
 directory "/var/log/tile" do
   owner "tile"
   group "tile"

-  mode 0o755
+  mode "755"

 end
 
 package %w[
   osm2pgsql
 end
 
 package %w[
   osm2pgsql

-  ruby

   osmium-tool
   pyosmium
   python3-pyproj
 ]
 
   osmium-tool
   pyosmium
   python3-pyproj
 ]
 

+gem_package "apachelogregex" do
+  gem_binary node[:ruby][:gem]
+end
+
+gem_package "file-tail" do
+  gem_binary node[:ruby][:gem]
+end
+
+gem_package "lru_redux" do
+  gem_binary node[:ruby][:gem]
+end
+

 remote_directory "/usr/local/bin" do
   source "bin"
   owner "root"
   group "root"
 remote_directory "/usr/local/bin" do
   source "bin"
   owner "root"
   group "root"

-  mode 0o755
+  mode "755"

   files_owner "root"
   files_group "root"
   files_owner "root"
   files_group "root"

-  files_mode 0o755
+  files_mode "755"
+end
+
+template "/usr/local/bin/tile-ratelimit" do
+  source "tile-ratelimit.erb"
+  owner "root"
+  group "root"
+  mode "755"
+end
+
+systemd_service "tile-ratelimit" do
+  description "Monitor tile requests and enforce rate limits"
+  after "apache2.service"
+  user "tile"
+  group "adm"
+  exec_start "/usr/local/bin/tile-ratelimit"
+  nice 10
+  private_tmp true
+  private_devices true
+  private_network true
+  protect_system "strict"
+  protect_home true
+  read_write_paths "/srv/tile.openstreetmap.org/conf"
+  no_new_privileges true
+  restart "on-failure"
+end
+
+service "tile-ratelimit" do
+  action [:enable, :start]
+  subscribes :restart, "file[/usr/local/bin/tile-ratelimit]"
+  subscribes :restart, "systemd_service[tile-ratelimit]"

 end
 
 template "/usr/local/bin/expire-tiles" do
   source "expire-tiles.erb"
   owner "root"
   group "root"
 end
 
 template "/usr/local/bin/expire-tiles" do
   source "expire-tiles.erb"
   owner "root"
   group "root"

-  mode 0o755
+  mode "755"

 end
 
 directory "/var/lib/replicate" do
   owner "tile"
   group "tile"
 end
 
 directory "/var/lib/replicate" do
   owner "tile"
   group "tile"

-  mode 0o755
+  mode "755"

 end
 
 directory "/var/lib/replicate/expire-queue" do
   owner "tile"
 end
 
 directory "/var/lib/replicate/expire-queue" do
   owner "tile"

-  group "www-data"
-  mode 0o775
+  group "_renderd"
+  mode "775"

 end
 
 template "/usr/local/bin/replicate" do
   source "replicate.erb"
   owner "root"
   group "root"
 end
 
 template "/usr/local/bin/replicate" do
   source "replicate.erb"
   owner "root"
   group "root"

-  mode 0o755
+  mode "755"

   variables :postgresql_version => postgresql_version.to_f
 end
 
 systemd_service "expire-tiles" do
   description "Tile dirtying service"
   type "simple"
   variables :postgresql_version => postgresql_version.to_f
 end
 
 systemd_service "expire-tiles" do
   description "Tile dirtying service"
   type "simple"

-  user "www-data"
+  user "_renderd"

   exec_start "/usr/local/bin/expire-tiles"
   exec_start "/usr/local/bin/expire-tiles"

+  nice 10

   standard_output "null"
   private_tmp true
   private_devices true
   standard_output "null"
   private_tmp true
   private_devices true

-  protect_system "full"
+  protect_system "strict"

   protect_home true
   protect_home true

+  read_write_paths [
+    "/srv/tile.openstreetmap.org/tiles/%i",
+    "/var/lib/replicate/expire-queue",
+    "/var/log/tile"
+  ]

   no_new_privileges true
 end
 
   no_new_privileges true
 end
 


@@ -517,8 +627,13 @@ systemd_service "replicate" do
   exec_start "/usr/local/bin/replicate"
   private_tmp true
   private_devices true
   exec_start "/usr/local/bin/replicate"
   private_tmp true
   private_devices true

-  protect_system "full"
+  protect_system "strict"

   protect_home true
   protect_home true

+  read_write_paths [
+    "/store/database/nodes",
+    "/var/lib/replicate",
+    "/var/log/tile"
+  ]

   no_new_privileges true
   restart "on-failure"
 end
   no_new_privileges true
   restart "on-failure"
 end


@@ -533,41 +648,39 @@ template "/etc/logrotate.d/replicate" do
   source "replicate.logrotate.erb"
   owner "root"
   group "root"
   source "replicate.logrotate.erb"
   owner "root"
   group "root"

-  mode 0o644
+  mode "644"

 end
 
 template "/usr/local/bin/render-lowzoom" do
   source "render-lowzoom.erb"
   owner "root"
   group "root"
 end
 
 template "/usr/local/bin/render-lowzoom" do
   source "render-lowzoom.erb"
   owner "root"
   group "root"

-  mode 0o755
+  mode "755"

 end
 
 systemd_service "render-lowzoom" do
   description "Render low zoom tiles"
 end
 
 systemd_service "render-lowzoom" do
   description "Render low zoom tiles"

+  condition_path_exists_glob "!/run/update-lowzoom-*"

   user "tile"
   exec_start "/usr/local/bin/render-lowzoom"
   private_tmp true
   private_devices true
   private_network true
   user "tile"
   exec_start "/usr/local/bin/render-lowzoom"
   private_tmp true
   private_devices true
   private_network true

-  protect_system "full"
+  protect_system "strict"

   protect_home true
   protect_home true

+  read_write_paths "/var/log/tile"

   no_new_privileges true
 end
 
 systemd_timer "render-lowzoom" do
   description "Render low zoom tiles"
   no_new_privileges true
 end
 
 systemd_timer "render-lowzoom" do
   description "Render low zoom tiles"

-  on_calendar "Sun *-*~07/1 01:00:00"
+  on_calendar "Fri *-*-* 23:00:00 UTC"

 end
 
 service "render-lowzoom.timer" do
   action [:enable, :start]
 end
 
 end
 
 service "render-lowzoom.timer" do
   action [:enable, :start]
 end
 

-file "/etc/cron.d/render-lowzoom" do
-  action :delete
-end
-

 package "liblockfile-simple-perl"
 package "libfilesys-df-perl"
 
 package "liblockfile-simple-perl"
 package "libfilesys-df-perl"
 


@@ -575,19 +688,22 @@ template "/usr/local/bin/cleanup-tiles" do
   source "cleanup-tiles.erb"
   owner "root"
   group "root"
   source "cleanup-tiles.erb"
   owner "root"
   group "root"

-  mode 0o755
+  mode "755"

 end
 
 tile_directories = node[:tile][:styles].collect do |_, style|
   style[:tile_directories].collect { |directory| directory[:name] }
 end.flatten.sort.uniq
 
 end
 
 tile_directories = node[:tile][:styles].collect do |_, style|
   style[:tile_directories].collect { |directory| directory[:name] }
 end.flatten.sort.uniq
 

-template "/etc/cron.d/cleanup-tiles" do
-  source "cleanup-tiles.cron.erb"
-  owner "root"
-  group "root"
-  mode 0o644
-  variables :directories => tile_directories
+tile_directories.each do |directory|
+  label = directory.gsub("/", "-")
+
+  cron_d "cleanup-tiles#{label}" do
+    minute "0"
+    user "_renderd"
+    command "ionice -c 3 /usr/local/bin/cleanup-tiles #{directory}"
+    mailto "admins@openstreetmap.org"
+  end

 end
 
 munin_plugin "mod_tile_fresh"
 end
 
 munin_plugin "mod_tile_fresh"


@@ -602,3 +718,13 @@ munin_plugin "renderd_zoom"
 munin_plugin "renderd_zoom_time"
 
 munin_plugin "replication_delay"
 munin_plugin "renderd_zoom_time"
 
 munin_plugin "replication_delay"

+
+package "ruby-webrick"
+
+prometheus_exporter "modtile" do
+  port 9494
+end
+
+prometheus_exporter "renderd" do
+  port 9393
+end