Use BER identifier constants, fix some packet types

Author: mtodd

lib/net/ldap.rb

@@ -1534,18 +1534,18 @@ def search(args = {})
 
         while (be = read) && (pdu = Net::LDAP::PDU.new(be))
           case pdu.app_tag
-          when 4 # search-data
+          when Net::LDAP::PDU::SearchReturnedData
             n_results += 1
             yield pdu.search_entry if block_given?
-          when 19 # search-referral
+          when Net::LDAP::PDU::SearchResultReferral
             if return_referrals
               if block_given?
                 se = Net::LDAP::Entry.new
                 se[:search_referrals] = (pdu.search_referrals || [])
                 yield se
               end
             end
-          when 5 # search-result
+          when Net::LDAP::PDU::SearchResult
             result_pdu = pdu
             controls = pdu.result_controls
             if return_referrals && pdu.result_code == 10
@@ -1638,7 +1638,7 @@ def modify(args)
     pkt = [ next_msgid.to_ber, request ].to_ber_sequence
     write pkt
 
-    (be = read) && (pdu = Net::LDAP::PDU.new(be)) && (pdu.app_tag == 7) or raise Net::LDAP::LdapError, "response missing or invalid"
+    (be = read) && (pdu = Net::LDAP::PDU.new(be)) && (pdu.app_tag == Net::LDAP::PDU::ModifyResponse) or raise Net::LDAP::LdapError, "response missing or invalid"
 
     pdu
   end
@@ -1663,7 +1663,7 @@ def add(args)
 
     (be = read) &&
       (pdu = Net::LDAP::PDU.new(be)) &&
-      (pdu.app_tag == 9) or
+      (pdu.app_tag == Net::LDAP::PDU::AddResponse) or
       raise Net::LDAP::LdapError, "response missing or invalid"
 
     pdu
@@ -1685,7 +1685,7 @@ def rename(args)
     write pkt
 
     (be = read) &&
-    (pdu = Net::LDAP::PDU.new( be )) && (pdu.app_tag == 13) or
+    (pdu = Net::LDAP::PDU.new( be )) && (pdu.app_tag == Net::LDAP::PDU::ModifyRDNResponse) or
     raise Net::LDAP::LdapError.new( "response missing or invalid" )
 
     pdu
@@ -1701,7 +1701,7 @@ def delete(args)
     pkt = [next_msgid.to_ber, request, controls].compact.to_ber_sequence
     write pkt
 
-    (be = read) && (pdu = Net::LDAP::PDU.new(be)) && (pdu.app_tag == 11) or raise Net::LDAP::LdapError, "response missing or invalid"
+    (be = read) && (pdu = Net::LDAP::PDU.new(be)) && (pdu.app_tag == Net::LDAP::PDU::DeleteResponse) or raise Net::LDAP::LdapError, "response missing or invalid"
 
     pdu
   end

spec/unit/ldap_spec.rb

@@ -20,7 +20,7 @@
         read_events  = @service.subscribe "read.net_ldap_connection"
 
         ber = Net::BER::BerIdentifiedArray.new([0, "", ""])
-        ber.ber_identifier = 7
+        ber.ber_identifier = Net::LDAP::PDU::BindResult
         read_result = [2, ber]
         @tcp_socket.should_receive(:read_ber).and_return(read_result)
 
@@ -95,7 +95,7 @@
 
     it "should get back error messages if operation fails" do
       ber = Net::BER::BerIdentifiedArray.new([53, "", "The provided password value was rejected by a password validator:  The provided password did not contain enough characters from the character set 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'.  The minimum number of characters from that set that must be present in user passwords is 1"])
-      ber.ber_identifier = 7
+      ber.ber_identifier = Net::LDAP::PDU::ModifyResponse
       @tcp_socket.should_receive(:read_ber).and_return([2, ber])
 
       result = subject.modify(:dn => "1", :operations => [[:replace, "mail", "[email protected]"]])
@@ -105,7 +105,7 @@
 
     it "shouldn't get back error messages if operation succeeds" do
       ber = Net::BER::BerIdentifiedArray.new([0, "", ""])
-      ber.ber_identifier = 7
+      ber.ber_identifier = Net::LDAP::PDU::ModifyResponse
       @tcp_socket.should_receive(:read_ber).and_return([2, ber])
 
       result = subject.modify(:dn => "1", :operations => [[:replace, "mail", "[email protected]"]])
@@ -132,7 +132,7 @@
 
     it "should publish a write.net_ldap_connection event" do
       ber = Net::BER::BerIdentifiedArray.new([0, "", ""])
-      ber.ber_identifier = 7
+      ber.ber_identifier = Net::LDAP::PDU::BindResult
       read_result = [2, ber]
       @tcp_socket.should_receive(:read_ber).and_return(read_result)
 
@@ -149,11 +149,11 @@
 
     it "should publish a read.net_ldap_connection event" do
       ber = Net::BER::BerIdentifiedArray.new([0, "", ""])
-      ber.ber_identifier = 7
+      ber.ber_identifier = Net::LDAP::PDU::BindResult
       read_result = [2, ber]
       @tcp_socket.should_receive(:read_ber).and_return(read_result)
 
-      events  = @service.subscribe "read.net_ldap_connection"
+      events = @service.subscribe "read.net_ldap_connection"
 
       result = subject.bind(method: :anon)
       result.should be_success