Merge branch 'check_ldap_filter' into 'master'

Check LDAP user filter during sign-in

CHANGELOG

@@ -33,6 +33,7 @@ v 7.0.0
   - Overall performance improvements
   - Skip init script check on omnibus-gitlab
   - Be more selective when killing stray Sidekiqs
+  - Check LDAP user filter during sign-in
 
 v 6.9.2
   - Revert the commit that broke the LDAP user filter

app/controllers/omniauth_callbacks_controller.rb

@@ -20,7 +20,15 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
     # if the authentication to LDAP was successful.
     @user = Gitlab::LDAP::User.find_or_create(oauth)
     @user.remember_me = true if @user.persisted?
+
+    gitlab_ldap_access do |access|
+      if 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
 
   private