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 b49223225463f0ffd9c42f84cf083513878d99f0..576c0f6adf080718f0e35dd637bac1b208a8964c 100644 (file)
--- a/cookbooks/tile/recipes/default.rb
+++ b/cookbooks/tile/recipes/default.rb
@@ -165,30 +165,6 @@ python_package "pyotp" do
   python_version "3"
 end
 
   python_version "3"
 end
 

-unifont = if node[:lsb][:release].to_f < 22.04
-            "ttf-unifont"
-          else
-            "fonts-unifont"
-          end
-
-package %W[
-  fonts-noto-cjk
-  fonts-noto-hinted
-  fonts-noto-unhinted
-  fonts-hanazono
-  #{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 "644"
-  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"


@@ -308,8 +284,12 @@ systemd_service "update-lowzoom@" do
   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


@@ -386,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"


@@ -413,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


@@ -550,10 +546,11 @@ systemd_service "tile-ratelimit" do
   user "tile"
   group "adm"
   exec_start "/usr/local/bin/tile-ratelimit"
   user "tile"
   group "adm"
   exec_start "/usr/local/bin/tile-ratelimit"

+  nice 10

   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
   read_write_paths "/srv/tile.openstreetmap.org/conf"
   no_new_privileges true
   protect_home true
   read_write_paths "/srv/tile.openstreetmap.org/conf"
   no_new_privileges true


@@ -598,11 +595,17 @@ systemd_service "expire-tiles" do
   type "simple"
   user "_renderd"
   exec_start "/usr/local/bin/expire-tiles"
   type "simple"
   user "_renderd"
   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
 


@@ -624,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


@@ -658,14 +666,15 @@ systemd_service "render-lowzoom" do
   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 "/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
 end
 
 service "render-lowzoom.timer" do