From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 21 Jun 2023 12:18:04 +0000 (+0200)
Subject: Add hardened headers to user-uploaded files
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=6a949500ea91fd21a83e55f896fc23f1b5eb29cd;p=mastodon.git

Add hardened headers to user-uploaded files

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---

diff --git a/config/application.rb b/config/application.rb
index c252d5a34..57dd57239 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -160,6 +160,10 @@ module Mastodon
       end
     end
 
+    config.public_file_server.headers = {
+      'X-Content-Type-Options' => 'nosniff',
+    }
+
     # config.paths.add File.join('app', 'api'), glob: File.join('**', '*.rb')
     # config.autoload_paths += Dir[Rails.root.join('app', 'api', '*')]
 
diff --git a/dist/nginx.conf b/dist/nginx.conf
index 7e0334368..cbcf328a6 100644
--- a/dist/nginx.conf
+++ b/dist/nginx.conf
@@ -61,12 +61,15 @@ server {
   location ~ ^/(emoji|packs|system/accounts/avatars|system/media_attachments/files) {
     add_header Cache-Control "public, max-age=31536000, immutable";
     add_header Strict-Transport-Security "max-age=31536000" always;
+    add_header X-Content-Type-Options nosniff;
+    add_header Content-Security-Policy "default-src 'none'; form-action 'none'";
     try_files $uri @proxy;
   }
 
   location /sw.js {
     add_header Cache-Control "public, max-age=0";
     add_header Strict-Transport-Security "max-age=31536000" always;
+    add_header X-Content-Type-Options nosniff;
     try_files $uri @proxy;
   }