module Gitlab
  module LDAP
    class Person
      AD_USER_DISABLED = Net::LDAP::Filter.ex("userAccountControl:1.2.840.113556.1.4.803", 2)

      def self.find_by_uid(uid, adapter=nil)
        adapter ||= Gitlab::LDAP::Adapter.new
        adapter.user(config.uid, uid)
      end

      def self.find_by_dn(dn, adapter=nil)
        adapter ||= Gitlab::LDAP::Adapter.new
        adapter.user('dn', dn)
      end

      def self.ad_disabled?(dn, adapter=nil)
        adapter ||= Gitlab::LDAP::Adapter.new
        adapter.dn_matches_filter?(dn, AD_USER_DISABLED)
      end

      def initialize(entry)
        Rails.logger.debug { "Instantiating #{self.class.name} with LDIF:\n#{entry.to_ldif}" }
        @entry = entry
      end

      def name
        entry.cn.first
      end

      def uid
        entry.send(config.uid).first
      end

      def username
        uid
      end

      def dn
        entry.dn
      end

      private

      def entry
        @entry
      end

      def adapter
        @adapter ||= Gitlab::LDAP::Adapter.new
      end

      def config
        @config ||= Gitlab.config.ldap
      end
    end
  end
end

module Gitlab
  module LDAP
    class Person
      AD_USER_DISABLED = Net::LDAP::Filter.ex("userAccountControl:1.2.840.113556.1.4.803", "2")

      def self.find_by_uid(uid, adapter=nil)
        adapter ||= Gitlab::LDAP::Adapter.new
        adapter.user(config.uid, uid)
      end

      def self.find_by_dn(dn, adapter=nil)
        adapter ||= Gitlab::LDAP::Adapter.new
        adapter.user('dn', dn)
      end

      def self.ad_disabled?(dn, adapter=nil)
        adapter ||= Gitlab::LDAP::Adapter.new
        adapter.dn_matches_filter?(dn, AD_USER_DISABLED)
      end

      def initialize(entry)
        Rails.logger.debug { "Instantiating #{self.class.name} with LDIF:\n#{entry.to_ldif}" }
        @entry = entry
      end

      def name
        entry.cn.first
      end

      def uid
        entry.send(config.uid).first
      end

      def username
        uid
      end

      def dn
        entry.dn
      end

      private

      def entry
        @entry
      end

      def adapter
        @adapter ||= Gitlab::LDAP::Adapter.new
      end

      def config
        @config ||= Gitlab.config.ldap
      end
    end
  end
end

Fix syntax error in AD disabled user filter
Fix syntax error in AD disabled user filter
