Merge branch 'sh-guard-against-ldap-login-csrf-fail' into 'master'

Guard against a login attempt with invalid CSRF token

See merge request gitlab-org/gitlab-ce!21934

changelogs/unreleased/sh-guard-against-ldap-login-csrf-fail.yml

+---
+title: Guard against a login attempt with invalid CSRF token
+merge_request: 21934
+author:
+type: fixed

config/initializers/warden.rb

@@ -31,6 +31,11 @@ Rails.application.configure do |config|
 
   Warden::Manager.before_logout(scope: :user) do |user, auth, opts|
     user ||= auth.user
+
+    # Rails CSRF protection may attempt to log out a user before that
+    # user even logs in
+    next unless user
+
     activity = Gitlab::Auth::Activity.new(opts)
     tracker = Gitlab::Auth::BlockedUserTracker.new(user, auth)