Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42

1 files changed, 12 insertions, 9 deletions

diff --git a/lib/gitlab/auth.rb b/lib/gitlab/auth.rb
index 4489fc9f3b2..36f58d43a77 100644
--- a/lib/gitlab/auth.rb
+++ b/lib/gitlab/auth.rb
@@ -156,15 +156,16 @@ module Gitlab
 
         underscored_service = matched_login['service'].underscore
 
-        if Integration.available_services_names.include?(underscored_service)
-          # We treat underscored_service as a trusted input because it is included
-          # in the Integration.available_services_names allowlist.
-          service = project.public_send("#{underscored_service}_service") # rubocop:disable GitlabSecurity/PublicSend
+        return unless Integration.available_services_names.include?(underscored_service)
 
-          if service && service.activated? && service.valid_token?(password)
-            Gitlab::Auth::Result.new(nil, project, :ci, build_authentication_abilities)
-          end
-        end
+        # We treat underscored_service as a trusted input because it is included
+        # in the Integration.available_services_names allowlist.
+        accessor = Project.integration_association_name(underscored_service)
+        service = project.public_send(accessor) # rubocop:disable GitlabSecurity/PublicSend
+
+        return unless service && service.activated? && service.valid_token?(password)
+
+        Gitlab::Auth::Result.new(nil, project, :ci, build_authentication_abilities)
       end
 
       def user_with_password_for_git(login, password)
@@ -371,7 +372,9 @@ module Gitlab
       end
 
       def find_build_by_token(token)
-        ::Ci::AuthJobFinder.new(token: token).execute
+        ::Gitlab::Database::LoadBalancing::Session.current.use_primary do
+          ::Ci::AuthJobFinder.new(token: token).execute
+        end
       end
 
       def user_auth_attempt!(user, success:)