deac/ruby-net-ldap
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Added a size limit on searches.

Browse source
This commit is contained in:
blackhedd 2006-09-07 01:17:47 +00:00
parent 5c4de6a5c9
commit b23ef85b60
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lib/net/ldap.rb
View file

@ -555,6 +555,7 @@ module Net
# * :return_result (a boolean specifying whether to return a result set). # * :return_result (a boolean specifying whether to return a result set).
# * :attributes_only (a boolean flag, defaults false) # * :attributes_only (a boolean flag, defaults false)
# * :scope (one of: Net::LDAP::SearchScope_BaseObject, Net::LDAP::SearchScope_SingleLevel, Net::LDAP::SearchScope_WholeSubtree. Default is WholeSubtree.) # * :scope (one of: Net::LDAP::SearchScope_BaseObject, Net::LDAP::SearchScope_SingleLevel, Net::LDAP::SearchScope_WholeSubtree. Default is WholeSubtree.)
# * :size (an integer indicating the maximum number of search entries to return. Default is zero, which signifies no limit.)
# #
# #search queries the LDAP server and passes <i>each entry</i> to the # #search queries the LDAP server and passes <i>each entry</i> to the
# caller-supplied block, as an object of type Net::LDAP::Entry. # caller-supplied block, as an object of type Net::LDAP::Entry.
@ -1150,6 +1151,8 @@ module Net
search_base = (args && args[:base]) || "dc=example,dc=com" search_base = (args && args[:base]) || "dc=example,dc=com"
search_attributes = ((args && args[:attributes]) || []).map {|attr| attr.to_s.to_ber} search_attributes = ((args && args[:attributes]) || []).map {|attr| attr.to_s.to_ber}
return_referrals = args && args[:return_referrals] == true return_referrals = args && args[:return_referrals] == true
sizelimit = (args && args[:size].to_i) || 0
raise LdapError.new( "invalid search-size" ) unless sizelimit >= 0
attributes_only = (args and args[:attributes_only] == true) attributes_only = (args and args[:attributes_only] == true)
scope = args[:scope] || Net::LDAP::SearchScope_WholeSubtree scope = args[:scope] || Net::LDAP::SearchScope_WholeSubtree
@ -1161,15 +1164,22 @@ module Net
# by running slapd in debug mode. Go figure. # by running slapd in debug mode. Go figure.
rfc2696_cookie = [126, ""] rfc2696_cookie = [126, ""]
result_code = 0 result_code = 0
n_results = 0
loop { loop {
# should collect this into a private helper to clarify the structure # should collect this into a private helper to clarify the structure
query_limit = if (sizelimit > 0) && ((sizelimit - n_results) < 126)
sizelimit - n_results
else
0
end
request = [ request = [
search_base.to_ber, search_base.to_ber,
scope.to_ber_enumerated, scope.to_ber_enumerated,
0.to_ber_enumerated, 0.to_ber_enumerated,
0.to_ber, query_limit.to_ber, # size limit
0.to_ber, 0.to_ber,
attributes_only.to_ber, attributes_only.to_ber,
search_filter.to_ber, search_filter.to_ber,
@ -1193,6 +1203,7 @@ module Net
while (be = @conn.read_ber(AsnSyntax)) && (pdu = LdapPdu.new( be )) while (be = @conn.read_ber(AsnSyntax)) && (pdu = LdapPdu.new( be ))
case pdu.app_tag case pdu.app_tag
when 4 # search-data when 4 # search-data
n_results += 1
yield( pdu.search_entry ) if block_given? yield( pdu.search_entry ) if block_given?
when 19 # search-referral when 19 # search-referral
if return_referrals if return_referrals