Extend custom CSS cache time with digest paths (#33207)

app/controllers/custom_css_controller.rb

@@ -2,7 +2,7 @@
 
 class CustomCssController < ActionController::Base # rubocop:disable Rails/ApplicationController
   def show
-    expires_in 3.minutes, public: true
+    expires_in 1.month, public: true
     render content_type: 'text/css'
   end
 

app/helpers/theme_helper.rb

@@ -23,8 +23,31 @@ module ThemeHelper
     end
   end
 
+  def custom_stylesheet
+    if active_custom_stylesheet.present?
+      stylesheet_link_tag(
+        custom_css_path(active_custom_stylesheet),
+        host: root_url,
+        media: :all,
+        skip_pipeline: true
+      )
+    end
+  end
+
   private
 
+  def active_custom_stylesheet
+    if cached_custom_css_digest.present?
+      [:custom, cached_custom_css_digest.to_s.first(8)]
+        .compact_blank
+        .join('-')
+    end
+  end
+
+  def cached_custom_css_digest
+    Rails.cache.read(:setting_digest_custom_css)
+  end
+
   def theme_color_for(theme)
     theme == 'mastodon-light' ? Themes::THEME_COLORS[:light] : Themes::THEME_COLORS[:dark]
   end

app/models/form/admin_settings.rb

@@ -69,6 +69,10 @@ class Form::AdminSettings
     favicon
   ).freeze
 
+  DIGEST_KEYS = %i(
+    custom_css
+  ).freeze
+
   OVERRIDEN_SETTINGS = {
     authorized_fetch: :authorized_fetch_mode?,
   }.freeze
@@ -122,6 +126,8 @@ class Form::AdminSettings
     KEYS.each do |key|
       next unless instance_variable_defined?(:"@#{key}")
 
+      cache_digest_value(key) if DIGEST_KEYS.include?(key)
+
       if UPLOAD_KEYS.include?(key)
         public_send(key).save
       else
@@ -133,6 +139,18 @@ class Form::AdminSettings
 
   private
 
+  def cache_digest_value(key)
+    Rails.cache.delete(:"setting_digest_#{key}")
+
+    key_value = instance_variable_get(:"@#{key}")
+    if key_value.present?
+      Rails.cache.write(
+        :"setting_digest_#{key}",
+        Digest::SHA256.hexdigest(key_value)
+      )
+    end
+  end
+
   def typecast_value(key, value)
     if BOOLEAN_KEYS.include?(key)
       value == '1'

app/views/layouts/application.html.haml

@@ -34,7 +34,7 @@
     = csrf_meta_tags unless skip_csrf_meta_tags?
     %meta{ name: 'style-nonce', content: request.content_security_policy_nonce }
 
-    = stylesheet_link_tag custom_css_path, skip_pipeline: true, host: root_url, media: 'all'
+    = custom_stylesheet
 
     = yield :header_tags
 

config/initializers/settings_digests.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+Rails.application.config.to_prepare do
+  custom_css = begin
+    Setting.custom_css
+  rescue ActiveRecord::AdapterError # Running without a database, not migrated, no connection, etc
+    nil
+  end
+
+  if custom_css.present?
+    Rails
+      .cache
+      .write(
+        :setting_digest_custom_css,
+        Digest::SHA256.hexdigest(custom_css)
+      )
+  end
+end

config/routes.rb

@@ -55,7 +55,8 @@ Rails.application.routes.draw do
 
   get 'manifest', to: 'manifests#show', defaults: { format: 'json' }
   get 'intent', to: 'intents#show'
-  get 'custom.css', to: 'custom_css#show', as: :custom_css
+  get 'custom.css', to: 'custom_css#show'
+  resources :custom_css, only: :show, path: :css
 
   get 'remote_interaction_helper', to: 'remote_interaction_helper#index'
 

spec/helpers/theme_helper_spec.rb

@@ -79,6 +79,26 @@ RSpec.describe ThemeHelper do
     end
   end
 
+  describe '#custom_stylesheet' do
+    context 'when custom css setting value digest is present' do
+      before { Rails.cache.write(:setting_digest_custom_css, '1a2s3d4f1a2s3d4f') }
+
+      it 'returns value from settings' do
+        expect(custom_stylesheet)
+          .to match('/css/custom-1a2s3d4f.css')
+      end
+    end
+
+    context 'when custom css setting value digest is not present' do
+      before { Rails.cache.delete(:setting_digest_custom_css) }
+
+      it 'returns default value' do
+        expect(custom_stylesheet)
+          .to be_blank
+      end
+    end
+  end
+
   private
 
   def html_links

spec/models/form/admin_settings_spec.rb

@@ -17,4 +17,40 @@ RSpec.describe Form::AdminSettings do
       end
     end
   end
+
+  describe '#save' do
+    describe 'updating digest values' do
+      context 'when updating custom css to real value' do
+        subject { described_class.new(custom_css: css) }
+
+        let(:css) { 'body { color: red; }' }
+        let(:digested) { Digest::SHA256.hexdigest(css) }
+
+        it 'changes relevant digest value' do
+          expect { subject.save }
+            .to(change { Rails.cache.read(:setting_digest_custom_css) }.to(digested))
+        end
+      end
+
+      context 'when updating custom css to empty value' do
+        subject { described_class.new(custom_css: '') }
+
+        before { Rails.cache.write(:setting_digest_custom_css, 'previous-value') }
+
+        it 'changes relevant digest value' do
+          expect { subject.save }
+            .to(change { Rails.cache.read(:setting_digest_custom_css) }.to(be_blank))
+        end
+      end
+
+      context 'when updating other fields' do
+        subject { described_class.new(site_contact_email: 'test@example.host') }
+
+        it 'does not update digests' do
+          expect { subject.save }
+            .to(not_change { Rails.cache.read(:setting_digest_custom_css) })
+        end
+      end
+    end
+  end
 end

spec/requests/cache_spec.rb

@@ -10,6 +10,7 @@ module TestEndpoints
     /.well-known/nodeinfo
     /nodeinfo/2.0
     /manifest
+    /css/custom-1a2s3d4f.css
     /custom.css
     /actor
     /api/v1/instance/extended_description

spec/requests/custom_css_spec.rb

@@ -5,10 +5,10 @@ require 'rails_helper'
 RSpec.describe 'Custom CSS' do
   include RoutingHelper
 
-  describe 'GET /custom.css' do
+  describe 'GET /css/:id.css' do
     context 'without any CSS or User Roles' do
       it 'returns empty stylesheet' do
-        get '/custom.css'
+        get '/css/custom-123.css'
 
         expect(response)
           .to have_http_status(200)
@@ -27,7 +27,7 @@ RSpec.describe 'Custom CSS' do
       end
 
       it 'returns stylesheet from settings' do
-        get '/custom.css'
+        get '/css/custom-456.css'
 
         expect(response)
           .to have_http_status(200)

spec/routing/custom_css_routing_spec.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Custom CSS routes' do
+  describe 'the legacy route' do
+    it 'routes to correct place' do
+      expect(get('/custom.css'))
+        .to route_to('custom_css#show')
+    end
+  end
+
+  describe 'the custom digest route' do
+    it 'routes to correct place' do
+      expect(get('/css/custom-1a2s3d4f.css'))
+        .to route_to('custom_css#show', id: 'custom-1a2s3d4f', format: 'css')
+    end
+  end
+end