Use queued_read for bind_simple

Author: mtodd

lib/net/ldap/connection.rb

@@ -234,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)
+
+    write(request, nil, message_id)
+    pdu = queued_read(message_id)
 
-    pdu = read
-    raise Net::LDAP::LdapError, "no bind result" unless pdu
+    if !pdu || pdu.app_tag != Net::LDAP::PDU::BindResult
+      raise Net::LDAP::LdapError, "no bind result"
+    end
 
     pdu
   end

test/test_ldap_connection.rb

@@ -210,6 +210,27 @@ def test_queued_read_setup_encryption_with_start_tls
     assert result = conn.setup_encryption(method: :start_tls)
     assert_equal mock, result
   end
+
+  def test_queued_read_bind_simple
+    result1 = make_message(1, app_tag: Net::LDAP::PDU::SearchResult)
+    result2 = make_message(2, app_tag: Net::LDAP::PDU::BindResult)
+
+    mock = flexmock("socket")
+    mock.should_receive(:read_ber).
+      and_return(result1).
+      and_return(result2)
+    mock.should_receive(:write)
+    conn = Net::LDAP::Connection.new(:socket => mock)
+
+    conn.next_msgid # simulates ongoing query
+
+    assert result = conn.bind(
+      method: :simple,
+      username: "uid=user1,ou=People,dc=rubyldap,dc=com",
+      password: "passworD1")
+    assert result.success?
+    assert_equal 2, result.message_id
+  end
 end
 
 class TestLDAPConnectionErrors < Test::Unit::TestCase
@@ -257,7 +278,7 @@ def setup
   def test_write_net_ldap_connection_event
     ber = Net::BER::BerIdentifiedArray.new([Net::LDAP::ResultCodeSuccess, "", ""])
     ber.ber_identifier = Net::LDAP::PDU::BindResult
-    read_result = [2, ber]
+    read_result = [1, ber]
     @tcp_socket.should_receive(:read_ber).and_return(read_result)
 
     events = @service.subscribe "write.net_ldap_connection"
@@ -274,7 +295,7 @@ def test_write_net_ldap_connection_event
   def test_read_net_ldap_connection_event
     ber = Net::BER::BerIdentifiedArray.new([Net::LDAP::ResultCodeSuccess, "", ""])
     ber.ber_identifier = Net::LDAP::PDU::BindResult
-    read_result = [2, ber]
+    read_result = [1, ber]
     @tcp_socket.should_receive(:read_ber).and_return(read_result)
 
     events = @service.subscribe "read.net_ldap_connection"
@@ -291,7 +312,7 @@ def test_read_net_ldap_connection_event
   def test_parse_pdu_net_ldap_connection_event
     ber = Net::BER::BerIdentifiedArray.new([Net::LDAP::ResultCodeSuccess, "", ""])
     ber.ber_identifier = Net::LDAP::PDU::BindResult
-    read_result = [2, ber]
+    read_result = [1, ber]
     @tcp_socket.should_receive(:read_ber).and_return(read_result)
 
     events = @service.subscribe "parse_pdu.net_ldap_connection"
@@ -305,15 +326,15 @@ def test_parse_pdu_net_ldap_connection_event
     assert payload.has_key?(:app_tag)
     assert payload.has_key?(:message_id)
     assert_equal Net::LDAP::PDU::BindResult, payload[:app_tag]
-    assert_equal 2, payload[:message_id]
+    assert_equal 1, payload[:message_id]
     pdu = payload[:pdu]
     assert_equal Net::LDAP::ResultCodeSuccess, pdu.result_code
   end
 
   def test_bind_net_ldap_connection_event
     ber = Net::BER::BerIdentifiedArray.new([Net::LDAP::ResultCodeSuccess, "", ""])
     ber.ber_identifier = Net::LDAP::PDU::BindResult
-    bind_result = [2, ber]
+    bind_result = [1, ber]
     @tcp_socket.should_receive(:read_ber).and_return(bind_result)
 
     events = @service.subscribe "bind.net_ldap_connection"