Check for the AD disabled flag in Access#allowed?

Jacob Vosmaer
1 parent a754f0b2
Showing 1 changed file with 5 additions and 1 deletions Show diff stats
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
...	...	@@ -14,7 +14,11 @@ module Gitlab
14	14	end
15	15
16	16	def allowed?(user)
17		- !!Gitlab::LDAP::Person.find_by_dn(user.extern_uid, adapter)
	17	+ if Gitlab::LDAP::Person.find_by_dn(user.extern_uid, adapter)
	18	+ !Gitlab::LDAP::Person.ad_disabled?(user.extern_uid, adapter)
	19	+ else
	20	+ false
	21	+ end
18	22	rescue
19	23	false
20	24	end
...	...