From a6e4153878eda841b0a71e5e1666e6bed0a050ae Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Wed, 14 May 2014 18:32:40 +0200
Subject: [PATCH] Check for the AD disabled flag in Access#allowed?
---
lib/gitlab/ldap/access.rb | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/lib/gitlab/ldap/access.rb b/lib/gitlab/ldap/access.rb
index 8f492e5c012..71931b79f62 100644
--- 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
--
GitLab