Merge branch 'fj-reorder-snippet-before-actions' into 'master'

Reorder snippet before action in controller

See merge request gitlab-org/gitlab!28352

app/controllers/repositories/git_http_controller.rb

@@ -4,6 +4,7 @@ module Repositories
   class GitHttpController < Repositories::GitHttpClientController
     include WorkhorseRequest
 
+    before_action :snippet_request_allowed?
     before_action :access_check
     prepend_before_action :deny_head_requests, only: [:info_refs]
 
@@ -12,8 +13,6 @@ module Repositories
     rescue_from Gitlab::GitAccess::ProjectCreationError, with: :render_422_with_exception
     rescue_from Gitlab::GitAccess::TimeoutError, with: :render_503_with_exception
 
-    before_action :snippet_request_allowed?
-
     # GET /foo/bar.git/info/refs?service=git-upload-pack (git pull)
     # GET /foo/bar.git/info/refs?service=git-receive-pack (git push)
     def info_refs
@@ -121,6 +120,7 @@ module Repositories
 
     def snippet_request_allowed?
       if repo_type.snippet? && Feature.disabled?(:version_snippets, user)
+        Gitlab::AppLogger.info('Snippet access attempt with feature disabled')
         render plain: 'The project you were looking for could not be found.', status: :not_found
       end
     end

changelogs/unreleased/fj-reorder-snippet-before-actions.yml

+---
+title: Check first if feature flag version_snippet is enabled
+merge_request: 28352
+author:
+type: fixed

spec/controllers/repositories/git_http_controller_spec.rb

@@ -146,9 +146,12 @@ describe Repositories::GitHttpController do
       let(:params) { container_params.merge(service: 'git-upload-pack') }
 
       it 'returns 404' do
+        expect(controller).not_to receive(:access_check)
+
         get :info_refs, params: params
 
         expect(response).to have_gitlab_http_status(:not_found)
+        expect(response.body).to eq "The project you were looking for could not be found."
       end
     end
 
@@ -160,9 +163,12 @@ describe Repositories::GitHttpController do
       end
 
       it 'returns 404' do
+        expect(controller).not_to receive(:access_check)
+
         post :git_upload_pack, params: params
 
         expect(response).to have_gitlab_http_status(:not_found)
+        expect(response.body).to eq "The project you were looking for could not be found."
       end
     end
   end