Check for the AD disabled flag in Access#allowed?

a6e41538 · Jacob Vosmaer · a754f0b2 · a6e41538
Commit a6e41538 authored May 14, 2014 by Jacob Vosmaer
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

lib/gitlab/ldap/access.rb lib/gitlab/ldap/access.rb +5 -1

No files found.
--- a/lib/gitlab/ldap/access.rb
+++ b/lib/gitlab/ldap/access.rb
@@ -14,7 +14,11 @@ module Gitlab
      end

      def allowed?(user)
-        !!Gitlab::LDAP::Person.find_by_dn(user.extern_uid, adapter)
+        if Gitlab::LDAP::Person.find_by_dn(user.extern_uid, adapter)
+          !Gitlab::LDAP::Person.ad_disabled?(user.extern_uid, adapter)
+        else
+          false
+        end
      rescue
        false
      end