Merge branch 'gitlab_auth_move_ee_to_module' into 'master'

Pull EE specific Gitlab::Auth code in to its own module

See merge request !1112

changelogs/unreleased-ee/gitlab_auth_move_ee_to_module.yml

+---
+title: Pull EE specific Gitlab::Auth code in to its own module
+merge_request: 1112
+author:

lib/ee/gitlab/auth.rb

+module EE
+  module Gitlab
+    module Auth
+      def find_with_user_password(login, password)
+        if Devise.omniauth_providers.include?(:kerberos)
+          kerberos_user = ::Gitlab::Kerberos::Authentication.login(login, password)
+          return kerberos_user if kerberos_user
+        end
+
+        super
+      end
+    end
+  end
+end

lib/gitlab/auth.rb

@@ -7,6 +7,8 @@ module Gitlab
     OPTIONAL_SCOPES = SCOPES - DEFAULT_SCOPES
 
     class << self
+      prepend EE::Gitlab::Auth
+
       def find_for_git_client(login, password, project:, ip:)
         raise "Must provide an IP for rate limiting" if ip.nil?
 
@@ -27,11 +29,6 @@ module Gitlab
       def find_with_user_password(login, password)
         user = User.by_login(login)
 
-        if Devise.omniauth_providers.include?(:kerberos)
-          kerberos_user = Gitlab::Kerberos::Authentication.login(login, password)
-          return kerberos_user if kerberos_user
-        end
-
         # If no user is found, or it's an LDAP server, try LDAP.
         #   LDAP users are only authenticated via LDAP
         if user.nil? || user.ldap_user?

spec/lib/ee/gitlab/auth_spec.rb

+require 'spec_helper'
+
+describe Gitlab::Auth, lib: true do
+  let(:gl_auth) { described_class }
+  let!(:user) do
+    create(:user,
+           username: username,
+           password: password,
+           password_confirmation: password)
+  end
+  let(:username) { 'John' }     # username isn't lowercase, test this
+  let(:password) { 'my-secret' }
+
+  context 'with kerberos' do
+    before do
+      allow(Devise).to receive_messages(omniauth_providers: [:kerberos])
+    end
+
+    it 'finds user' do
+      expect(::Gitlab::Kerberos::Authentication).to receive_messages(login: user)
+
+      expect( gl_auth.find_with_user_password(username, password) ).to eql user
+    end
+  end
+end

spec/lib/gitlab/auth_spec.rb

@@ -152,19 +152,6 @@ describe Gitlab::Auth, lib: true do
       expect( gl_auth.find_with_user_password(username, password) ).not_to eql user
     end
 
-    context "with kerberos" do
-      before do
-        allow(Devise).to receive_messages(omniauth_providers: [:kerberos])
-      end
-
-      it "finds user" do
-        allow(Gitlab::Kerberos::Authentication).to receive_messages(valid?: true)
-        allow(Gitlab::Kerberos::Authentication).to receive_messages(email: user.email)
-
-        expect( gl_auth.find_with_user_password(username, password) ).to eql user
-      end
-    end
-
     context "with ldap enabled" do
       before do
         allow(Gitlab::LDAP::Config).to receive(:enabled?).and_return(true)