Skip to content

Queue reads everywhere #144

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Oct 24, 2014
Merged

Queue reads everywhere #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
bb798c4
Add failing test for add nested in an open search
mtodd Oct 22, 2014
b8ffde7
Use queued_read for Net::LDAP::Connection#add
mtodd Oct 22, 2014
e0582da
Merge branch 'master' into queue-reads-everywhere
mtodd Oct 22, 2014
c00105e
Unit test queued_read and usage
mtodd Oct 23, 2014
8b77189
Use queued_read in modify
mtodd Oct 23, 2014
04bad5f
Can't use keyword args in 1.9
mtodd Oct 23, 2014
4132f28
Use queued_read for rename operation
mtodd Oct 24, 2014
e015dfb
Use queued_read for delete operation
mtodd Oct 24, 2014
6186e41
Use queued_read for start_tls
mtodd Oct 24, 2014
47017f1
Use queued_read for bind_simple
mtodd Oct 24, 2014
d124182
Use queued_read for bind_sasl
mtodd Oct 24, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
85 changes: 56 additions & 29 deletions lib/net/ldap/connection.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,18 @@ def setup_encryption(args)
# additional branches requiring server validation and peer certs, etc.
# go here.
when :start_tls
request = [Net::LDAP::StartTlsOid.to_ber_contextspecific(0)].to_ber_appsequence(Net::LDAP::PDU::ExtendedRequest)
write(request)
pdu = read
raise Net::LDAP::LdapError, "no start_tls result" if pdu.nil?
message_id = next_msgid
request = [
Net::LDAP::StartTlsOid.to_ber_contextspecific(0)
].to_ber_appsequence(Net::LDAP::PDU::ExtendedRequest)

write(request, nil, message_id)
pdu = queued_read(message_id)

if pdu.nil? || pdu.app_tag != Net::LDAP::PDU::ExtendedResponse
raise Net::LDAP::LdapError, "no start_tls result"
end

if pdu.result_code.zero?
@conn = self.class.wrap_with_ssl(@conn)
else
Expand Down Expand Up @@ -226,12 +234,18 @@ def bind_simple(auth)

raise Net::LDAP::LdapError, "Invalid binding information" unless (user && psw)

request = [LdapVersion.to_ber, user.to_ber,
psw.to_ber_contextspecific(0)].to_ber_appsequence(Net::LDAP::PDU::BindRequest)
write(request)
message_id = next_msgid
request = [
LdapVersion.to_ber, user.to_ber,
psw.to_ber_contextspecific(0)
].to_ber_appsequence(Net::LDAP::PDU::BindRequest)

pdu = read
raise Net::LDAP::LdapError, "no bind result" unless pdu
write(request, nil, message_id)
pdu = queued_read(message_id)

if !pdu || pdu.app_tag != Net::LDAP::PDU::BindResult
raise Net::LDAP::LdapError, "no bind result"
end

pdu
end
Expand Down Expand Up @@ -262,14 +276,21 @@ def bind_sasl(auth)
auth[:challenge_response]
raise Net::LDAP::LdapError, "Invalid binding information" unless (mech && cred && chall)

message_id = next_msgid

n = 0
loop {
sasl = [mech.to_ber, cred.to_ber].to_ber_contextspecific(3)
request = [LdapVersion.to_ber, "".to_ber, sasl].to_ber_appsequence(Net::LDAP::PDU::BindRequest)
write(request)
request = [
LdapVersion.to_ber, "".to_ber, sasl
].to_ber_appsequence(Net::LDAP::PDU::BindRequest)

pdu = read
raise Net::LDAP::LdapError, "no bind result" unless pdu
write(request, nil, message_id)
pdu = queued_read(message_id)

if !pdu || pdu.app_tag != Net::LDAP::PDU::BindResult
raise Net::LDAP::LdapError, "no bind result"
end

return pdu unless pdu.result_code == Net::LDAP::ResultCodeSaslBindInProgress
raise Net::LDAP::LdapError, "sasl-challenge overflow" if ((n += 1) > MaxSaslChallenges)
Expand Down Expand Up @@ -583,11 +604,15 @@ def self.modify_ops(operations)
def modify(args)
modify_dn = args[:dn] or raise "Unable to modify empty DN"
ops = self.class.modify_ops args[:operations]
request = [ modify_dn.to_ber,
ops.to_ber_sequence ].to_ber_appsequence(Net::LDAP::PDU::ModifyRequest)
write(request)

pdu = read
message_id = next_msgid
request = [
modify_dn.to_ber,
ops.to_ber_sequence
].to_ber_appsequence(Net::LDAP::PDU::ModifyRequest)

write(request, nil, message_id)
pdu = queued_read(message_id)

if !pdu || pdu.app_tag != Net::LDAP::PDU::ModifyResponse
raise Net::LDAP::LdapError, "response missing or invalid"
Expand All @@ -610,10 +635,11 @@ def add(args)
add_attrs << [ k.to_s.to_ber, Array(v).map { |m| m.to_ber}.to_ber_set ].to_ber_sequence
}

request = [add_dn.to_ber, add_attrs.to_ber_sequence].to_ber_appsequence(Net::LDAP::PDU::AddRequest)
write(request)
message_id = next_msgid
request = [add_dn.to_ber, add_attrs.to_ber_sequence].to_ber_appsequence(Net::LDAP::PDU::AddRequest)

pdu = read
write(request, nil, message_id)
pdu = queued_read(message_id)

if !pdu || pdu.app_tag != Net::LDAP::PDU::AddResponse
raise Net::LDAP::LdapError, "response missing or invalid"
Expand All @@ -631,12 +657,12 @@ def rename(args)
delete_attrs = args[:delete_attributes] ? true : false
new_superior = args[:new_superior]

request = [old_dn.to_ber, new_rdn.to_ber, delete_attrs.to_ber]
request << new_superior.to_ber_contextspecific(0) unless new_superior == nil

write(request.to_ber_appsequence(Net::LDAP::PDU::ModifyRDNRequest))
message_id = next_msgid
request = [old_dn.to_ber, new_rdn.to_ber, delete_attrs.to_ber]
request << new_superior.to_ber_contextspecific(0) unless new_superior == nil

pdu = read
write(request.to_ber_appsequence(Net::LDAP::PDU::ModifyRDNRequest), nil, message_id)
pdu = queued_read(message_id)

if !pdu || pdu.app_tag != Net::LDAP::PDU::ModifyRDNResponse
raise Net::LDAP::LdapError.new "response missing or invalid"
Expand All @@ -650,11 +676,12 @@ def rename(args)
#++
def delete(args)
dn = args[:dn] or raise "Unable to delete empty DN"
controls = args.include?(:control_codes) ? args[:control_codes].to_ber_control : nil #use nil so we can compact later
request = dn.to_s.to_ber_application_string(Net::LDAP::PDU::DeleteRequest)
write(request, controls)
controls = args.include?(:control_codes) ? args[:control_codes].to_ber_control : nil #use nil so we can compact later
message_id = next_msgid
request = dn.to_s.to_ber_application_string(Net::LDAP::PDU::DeleteRequest)

pdu = read
write(request, controls, message_id)
pdu = queued_read(message_id)

if !pdu || pdu.app_tag != Net::LDAP::PDU::DeleteResponse
raise Net::LDAP::LdapError, "response missing or invalid"
Expand Down
37 changes: 37 additions & 0 deletions test/integration/test_open.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ def test_binds_with_open
assert_equal 1, events.size
end

# NOTE: query for two or more entries so that the socket must be read
# multiple times.
# See The Problem: https://github.com/ruby-ldap/ruby-net-ldap/issues/136

def test_nested_search_without_open
entries = []
nested_entry = nil
Expand Down Expand Up @@ -48,4 +52,37 @@ def test_nested_search_with_open
assert_equal "user3", nested_entry.uid.first
assert_equal %w(user1 user2), entries
end

def test_nested_add_with_open
entries = []
nested_entry = nil

dn = "uid=nested-open-added-user1,ou=People,dc=rubyldap,dc=com"
attrs = {
objectclass: %w(top inetOrgPerson organizationalPerson person),
uid: "nested-open-added-user1",
cn: "nested-open-added-user1",
sn: "nested-open-added-user1",
mail: "[email protected]"
}

@ldap.authenticate "cn=admin,dc=rubyldap,dc=com", "passworD1"
@ldap.delete dn: dn

@ldap.open do
@ldap.search(filter: "(|(uid=user1)(uid=user2))", base: "ou=People,dc=rubyldap,dc=com") do |entry|
entries << entry.uid.first

nested_entry ||= begin
assert @ldap.add(dn: dn, attributes: attrs), @ldap.get_operation_result.inspect
@ldap.search(base: dn, scope: Net::LDAP::SearchScope_BaseObject).first
end
end
end

assert_equal %w(user1 user2), entries
assert_equal "nested-open-added-user1", nested_entry.uid.first
ensure
@ldap.delete dn: dn
end
end
Loading