Merge branch 'tz-user-avatar-caching' into 'master'

Changed the Caching of User Avatars to be public and to 5 minutes

See merge request gitlab-org/gitlab-ce!24546

3 files changed, 25 insertions, 5 deletions

diff --git a/app/controllers/concerns/uploads_actions.rb b/app/controllers/concerns/uploads_actions.rb
index c114e16edf8..4ec0e94df9a 100644
--- a/app/controllers/concerns/uploads_actions.rb
+++ b/app/controllers/concerns/uploads_actions.rb
@@ -29,7 +29,13 @@ module UploadsActions
   def show
     return render_404 unless uploader&.exists?
 
-    expires_in 0.seconds, must_revalidate: true, private: true
+    if cache_publicly?
+      # We need to reset caching from the applications controller to get rid of the no-store value
+      headers['Cache-Control'] = ''
+      expires_in 5.minutes, public: true, must_revalidate: false
+    else
+      expires_in 0.seconds, must_revalidate: true, private: true
+    end
 
     disposition = uploader.image_or_video? ? 'inline' : 'attachment'
 
@@ -114,6 +120,10 @@ module UploadsActions
     nil
   end
 
+  def cache_publicly?
+    false
+  end
+
   def model
     strong_memoize(:model) { find_model }
   end
diff --git a/app/controllers/uploads_controller.rb b/app/controllers/uploads_controller.rb
index fa5d84633b5..519e7439205 100644
--- a/app/controllers/uploads_controller.rb
+++ b/app/controllers/uploads_controller.rb
@@ -70,6 +70,10 @@ class UploadsController < ApplicationController
     end
   end
 
+  def cache_publicly?
+    User === model || Appearance === model
+  end
+
   def upload_model_class
     MODEL_CLASSES[params[:model]] || raise(UnknownUploadModelError)
   end
diff --git a/spec/controllers/uploads_controller_spec.rb b/spec/controllers/uploads_controller_spec.rb
index 19142aa1272..5fbb71eca96 100644
--- a/spec/controllers/uploads_controller_spec.rb
+++ b/spec/controllers/uploads_controller_spec.rb
@@ -12,6 +12,12 @@ shared_examples 'content not cached without revalidation and no-store' do
   end
 end
 
+shared_examples 'content publicly cached' do
+  it 'ensures content is publicly cached' do
+    expect(subject['Cache-Control']).to eq('max-age=300, public')
+  end
+end
+
 describe UploadsController do
   let!(:user) { create(:user, avatar: fixture_file_upload("spec/fixtures/dk.png", "image/png")) }
 
@@ -184,7 +190,7 @@ describe UploadsController do
             expect(response).to have_gitlab_http_status(200)
           end
 
-          it_behaves_like 'content not cached without revalidation and no-store' do
+          it_behaves_like 'content publicly cached' do
             subject do
               get :show, params: { model: 'user', mounted_as: 'avatar', id: user.id, filename: 'dk.png' }
 
@@ -201,7 +207,7 @@ describe UploadsController do
           expect(response).to have_gitlab_http_status(200)
         end
 
-        it_behaves_like 'content not cached without revalidation' do
+        it_behaves_like 'content publicly cached' do
           subject do
             get :show, params: { model: 'user', mounted_as: 'avatar', id: user.id, filename: 'dk.png' }
 
@@ -537,7 +543,7 @@ describe UploadsController do
             expect(response).to have_gitlab_http_status(200)
           end
 
-          it_behaves_like 'content not cached without revalidation' do
+          it_behaves_like 'content publicly cached' do
             subject do
               get :show, params: { model: 'appearance', mounted_as: 'header_logo', id: appearance.id, filename: 'dk.png' }
 
@@ -557,7 +563,7 @@ describe UploadsController do
             expect(response).to have_gitlab_http_status(200)
           end
 
-          it_behaves_like 'content not cached without revalidation' do
+          it_behaves_like 'content publicly cached' do
             subject do
               get :show, params: { model: 'appearance', mounted_as: 'logo', id: appearance.id, filename: 'dk.png' }