Commit a754f0b2205d4f09092c8c7c032ad944a229be8f
1 parent
d54133b0
Exists in
spb-stable
and in
2 other branches
Add LDAP::Person#ad_disabled?
Check the bit for disabled Active Directory users. The filter is based on http://ctogonewild.com/2009/09/03/bitmask-searches-in-ldap/ .
Showing
1 changed file
with
7 additions
and
0 deletions
Show diff stats
lib/gitlab/ldap/person.rb
| 1 | module Gitlab | 1 | module Gitlab |
| 2 | module LDAP | 2 | module LDAP |
| 3 | class Person | 3 | class Person |
| 4 | + AD_USER_DISABLED = Net::LDAP::Filter.ex("userAccountControl:1.2.840.113556.1.4.803", 2) | ||
| 5 | + | ||
| 4 | def self.find_by_uid(uid, adapter=nil) | 6 | def self.find_by_uid(uid, adapter=nil) |
| 5 | adapter ||= Gitlab::LDAP::Adapter.new | 7 | adapter ||= Gitlab::LDAP::Adapter.new |
| 6 | adapter.user(config.uid, uid) | 8 | adapter.user(config.uid, uid) |
| @@ -11,6 +13,11 @@ module Gitlab | @@ -11,6 +13,11 @@ module Gitlab | ||
| 11 | adapter.user('dn', dn) | 13 | adapter.user('dn', dn) |
| 12 | end | 14 | end |
| 13 | 15 | ||
| 16 | + def self.ad_disabled?(dn, adapter=nil) | ||
| 17 | + adapter ||= Gitlab::LDAP::Adapter.new | ||
| 18 | + adapter.dn_matches_filter?(dn, AD_USER_DISABLED) | ||
| 19 | + end | ||
| 20 | + | ||
| 14 | def initialize(entry) | 21 | def initialize(entry) |
| 15 | Rails.logger.debug { "Instantiating #{self.class.name} with LDIF:\n#{entry.to_ldif}" } | 22 | Rails.logger.debug { "Instantiating #{self.class.name} with LDIF:\n#{entry.to_ldif}" } |
| 16 | @entry = entry | 23 | @entry = entry |