Move LDAP timeout code to Gitlab::LDAP::Access

app/controllers/application_controller.rb

@@ -201,18 +201,13 @@ class ApplicationController < ActionController::Base
 
   def ldap_security_check
     if current_user && current_user.requires_ldap_check?
-      gitlab_ldap_access do |access|
-        if access.allowed?(current_user)
-          current_user.last_credential_check_at = Time.now
-          current_user.save
-        else
+      unless Gitlab::LDAP::Access.allowed?(current_user)
         sign_out current_user
         flash[:alert] = "Access denied for your LDAP account."
         redirect_to new_user_session_path
       end
     end
   end
-  end
 
   def event_filter
     filters = cookies['event_filter'].split(',') if cookies['event_filter'].present?

app/controllers/omniauth_callbacks_controller.rb

@@ -21,15 +21,14 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
     @user = Gitlab::LDAP::User.find_or_create(oauth)
     @user.remember_me = true if @user.persisted?
 
-    gitlab_ldap_access do |access|
-      if access.allowed?(@user)
+    # Do additional LDAP checks for the user filter and EE features
+    if Gitlab::LDAP::Access.allowed?(@user)
       sign_in_and_redirect(@user)
     else
       flash[:alert] = "Access denied for your LDAP account."
       redirect_to new_user_session_path
     end
   end
-  end
 
   def omniauth_error
     @provider = params[:provider]

lib/gitlab/ldap/access.rb

@@ -9,6 +9,19 @@ module Gitlab
         end
       end
 
+      def self.allowed?(user)
+        self.open do |access|
+          if access.allowed?(user)
+            # GitLab EE LDAP code goes here
+            user.last_credential_check_at = Time.now
+            user.save
+            true
+          else
+            false
+          end
+        end
+      end
+
       def initialize(adapter=nil)
         @adapter = adapter
       end