! Fixes all tests

Some code has been removed. Version control is not synonymous with code storage - if you're not using it now, you probably don't have working tests and the code will be buggy anyway. Write it when you need it.

lib/net/ber.rb

@@ -77,7 +77,7 @@ module Net
     
     class BerIdentifiedArray < Array
       attr_accessor :ber_identifier
-      def initialize
+      def initialize(*args)
         super
       end
     end
@@ -88,16 +88,6 @@ module Net
         "\005\000"
       end
     end
-    
-    class BerIdentifiedOid
-      attr_accessor :ber_identifier
-      def initialize oid
-        if oid.is_a?(String)
-          oid = oid.split(/\./).map {|s| s.to_i }
-        end
-        @value = oid
-      end
-    end
   end
 end
 

lib/net/ber/ber_parser.rb

@@ -34,18 +34,9 @@ module Net
         # we ask for more data (like StringIOs). At it is,
         # this can throw TypeErrors and other nasties.
                 
-        # We might have been included in two kinds of things: IO-like 
+        id = getbyte or return nil  # don't trash this value, we'll use it later
-        # (answering to getbyte) and String-like (answering to to_s). Have 
-        # stream be a stream that is IO-like in both cases.
-        if respond_to? :getbyte
-          stream = self
-        else
-          stream = StringIO.new(self.to_s)
-        end
 
-        id = stream.getbyte or return nil  # don't trash this value, we'll use it later
+        n = getbyte
-
-        n = stream.getbyte
         lengthlength,contentlength = if n <= 127
           [1,n]
         else
@@ -56,7 +47,7 @@ module Net
           [1 + (n & 127), j]
         end
 
-        newobj = stream.read contentlength
+        newobj = read contentlength
 
         # This exceptionally clever and clear bit of code is verrrry slow.
         objtype = (syntax && syntax[id]) || BuiltinSyntax[id]

lib/net/ldap/core_ext/all.rb

@@ -10,8 +10,8 @@ class Array
 end
 
 class String
-  include Net::LDAP::Extensions::String
   include Net::BER::BERParser
+  include Net::LDAP::Extensions::String
 end
 
 class Bignum

lib/net/ldap/core_ext/array.rb

@@ -33,7 +33,7 @@ module Net
 
         private
         def to_ber_seq_internal code
-          s = self.to_s
+          s = self.join
           [code].pack('C') + s.length.to_ber_length_encoding + s
         end
       end

lib/net/ldap/core_ext/bignum.rb

@@ -4,32 +4,19 @@ module Net
       module Bignum
 
         def to_ber
-          #i = [self].pack('w')
+          # NOTE: Array#pack's 'w' is a BER _compressed_ integer. We need uncompressed
-          #i.length > 126 and raise Net::BER::BerError.new( "range error in bignum" )
+          # BER integers, so we're not using that.
-          #[2, i.length].pack("CC") + i
+          # See also: http://blade.nagaokaut.ac.jp/cgi-bin/scat.rb/ruby/ruby-talk/228864
+          result = []
 
-          # Ruby represents Bignums as two's-complement numbers so we may actually be
+          n = self
-          # good as far as representing negatives goes.
+          while n>0
-          # I'm sure this implementation can be improved performance-wise if necessary.
+              b = n & 0xff
-          # Ruby's Bignum#size returns the number of bytes in the internal representation
+              result << b
-          # of the number, but it can and will include leading zero bytes on at least
+              n = n >> 8
-          # some implementations. Evidently Ruby stores these as sets of quadbytes.
-          # It's not illegal in BER to encode all of the leading zeroes but let's strip
-          # them out anyway.
-          #
-          sz = self.size
-          out = "\000" * sz
-          (sz*8).times {|bit|
-      	if self[bit] == 1
-      	    out[bit/8] += (1 << (bit % 8))
-      	end
-          }
-
-          while out.length > 1 and out[-1] == 0
-      	out.slice!(-1,1)
           end
 
-          [2, out.length].pack("CC") + out.reverse
+          "\002" + ([result.size] + result.reverse).pack('C*')
         end
 
       end

lib/net/ldap/core_ext/fixnum.rb

@@ -2,14 +2,23 @@ module Net
   class LDAP
     module Extensions
       module Fixnum
+        #
+        # to_ber
+        #
         def to_ber
           "\002" + to_ber_internal
         end
 
+        #
+        # to_ber_enumerated
+        #
         def to_ber_enumerated
           "\012" + to_ber_internal
         end
 
+        #
+        # to_ber_length_encoding
+        #
         def to_ber_length_encoding
           if self <= 127
             [self].pack('C')
@@ -29,21 +38,24 @@ module Net
         #--
         # Called internally to BER-encode the length and content bytes of a Fixnum.
         # The caller will prepend the tag byte.
+        MAX_SIZE = 0.size
         def to_ber_internal
-          # PLEASE optimize this code path. It's awfully ugly and probably slow.
+          size = MAX_SIZE
-          # It also doesn't understand negative numbers yet.
+          while size>1
-          raise Net::BER::BerError.new( "range error in fixnum" ) unless self >= 0
+              break if (self & (0xff << (size-1)*8)) > 0 
-          z = [self].pack("N")
+              size -= 1
-          zlen = if self < 0x80
-      	1
-          elsif self < 0x8000
-      	2
-          elsif self < 0x800000
-      	3
-          else
-      	4
           end
-          [zlen].pack("C") + z[0-zlen,zlen]
+
+          result = [size]
+
+          while size>0
+              # right shift size-1 bytes, mask with 0xff 
+              result << ((self >> ((size-1)*8)) & 0xff)
+
+              size -= 1
+          end
+
+          result.pack('C*')
         end
         private :to_ber_internal
       end

lib/net/ldap/core_ext/string.rb

@@ -1,3 +1,5 @@
+require 'stringio'
+
 module Net
   class LDAP
     module Extensions
@@ -29,18 +31,9 @@ module Net
         end
         
         def read_ber syntax=nil
-      	  StringIO.new(self).read_ber(syntax)
+          StringIO.new(self).
+            read_ber(syntax)
         end
-          
-        # def read_ber! syntax=nil
-        #           obj,n_consumed = read_ber_from_string(self, syntax)
-        #           if n_consumed
-        #             self.slice!(0...n_consumed)
-        #             obj
-        #           else
-        #             nil
-        #           end
-        # end        
       end
     end
   end

lib/net/ldap/filter.rb

@@ -1,8 +1,3 @@
-# $Id$
-#
-#
-#----------------------------------------------------------------------------
-#
 # Copyright (C) 2006 by Francis Cianfrocca. All Rights Reserved.
 #
 # Gmail: garbagecat10
@@ -25,6 +20,7 @@
 #
 #
 
+require 'strscan'
 
 module Net
 class LDAP

lib/net/ldap/psw.rb

@@ -43,7 +43,7 @@ module Net
           when :md5
             [Digest::MD5.new, 'MD5']
           when :sha
-            [Digest::SHA1.new, 'sha']
+            [Digest::SHA1.new, 'SHA']
         # when ssha
           else
             raise Net::LDAP::LdapError.new( "unsupported password-hash type (#{type})" )

spec/integration/ssl_ber_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+require 'socket'
+require 'openssl'
+
+require 'net/ldap'
+
+describe "BER serialisation (SSL)" do
+  # Transmits str to #to and reads it back from #from. 
+  #
+  def transmit(str)
+    to.write(str)
+    to.close
+    
+    from.read
+  end
+  
+  attr_reader :to, :from
+  before(:each) do
+    @from, @to = IO.pipe
+    
+    @to   = Net::LDAP::SSLSocket.wrap(to)
+    @from = Net::LDAP::SSLSocket.wrap(from)
+  end
+  
+  it "should transmit strings" do
+    transmit('foo').should == 'foo'
+  end 
+  it "should correctly transmit numbers" do
+    to.write 1234.to_ber
+    from.read_ber.should == 1234
+  end 
+end

spec/spec.opts

@@ -0,0 +1,2 @@
+--format specdoc
+--colour

spec/spec_helper.rb

@@ -0,0 +1 @@
+

spec/unit/ber/ber_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+require 'net/ber'
+require 'net/ldap'
+
+describe "Ber encoding of various types" do
+  def properly_encode_and_decode
+    simple_matcher('properly encode and decode') do |given|
+      given.to_ber.read_ber.should == given
+    end
+  end
+  
+  context "array" do
+    it "should properly encode []" do
+      [].should properly_encode_and_decode
+    end 
+  end
+end

test/test_ber.rb

@@ -1,5 +1,4 @@
-# $Id: testber.rb 230 2006-12-19 18:27:57Z blackhedd $
+# encoding: ASCII-8BIT
-
 require 'common'
 
 class TestBer < Test::Unit::TestCase
@@ -25,14 +24,14 @@ class TestBer < Test::Unit::TestCase
     assert_equal( "\x02\x01\x00", 0.to_ber )
     assert_equal( "\x02\x01\x01", 1.to_ber )
     assert_equal( "\x02\x01\x7F", 127.to_ber )
-		assert_equal( "\x02\x02\x00\x80", 128.to_ber )
+    assert_equal( "\x02\x01\x80", 128.to_ber )
-		assert_equal( "\x02\x02\x00\xFF", 255.to_ber )
+    assert_equal( "\x02\x01\xFF", 255.to_ber )
 
     assert_equal( "\x02\x02\x01\x00", 256.to_ber )
-		assert_equal( "\x02\x03\x00\xFF\xFF", 65535.to_ber )
+    assert_equal( "\x02\x02\xFF\xFF", 65535.to_ber )
 
     assert_equal( "\x02\x03\x01\x00\x00", 65536.to_ber )
-		assert_equal( "\x02\x04\x00\xFF\xFF\xFF", 16_777_215.to_ber )
+    assert_equal( "\x02\x03\xFF\xFF\xFF", 16_777_215.to_ber )
 
     assert_equal( "\x02\x04\x01\x00\x00\x00", 0x01000000.to_ber )
     assert_equal( "\x02\x04\x3F\xFF\xFF\xFF", 0x3FFFFFFF.to_ber )
@@ -48,30 +47,19 @@ class TestBer < Test::Unit::TestCase
   def test_ber_integers
     assert_equal( "\002\001\005", 5.to_ber )
     assert_equal( "\002\002\001\364", 500.to_ber )
-		assert_equal( "\002\003\0\303P", 50000.to_ber )
+    assert_equal( "\x02\x02\xC3P", 50000.to_ber )
     assert_equal( "\002\005\001*\005\362\000", 5000000000.to_ber )
   end
 
   def test_ber_bignums
     # Some of these values are Fixnums and some are Bignums. Different BER code.
-		[
+    100.times do |p|
-			5,
+      n = 2 << p
-			50,
+      assert_equal(n, n.to_ber.read_ber, "2**#{p} could not be read back")
-			500,
+        
-			5000,
+      n = 5 * 10**p
-			50000,
+      assert_equal(n, n.to_ber.read_ber)
-			500000,
+    end
-			5000000,
-			50000000,
-			500000000,
-			1000000000,
-			2000000000,
-			3000000000,
-			4000000000,
-			5000000000
-		].each {|val|
-			assert_equal( val, val.to_ber.read_ber )
-		}
   end
 
   def test_ber_parsing
@@ -80,8 +68,6 @@ class TestBer < Test::Unit::TestCase
   end
 
   def test_ber_parser_on_ldap_bind_request
-		require 'stringio'
-
     s = StringIO.new(
       "0$\002\001\001`\037\002\001\003\004\rAdministrator\200\vad_is_bogus" )
 
@@ -89,12 +75,4 @@ class TestBer < Test::Unit::TestCase
       [1, [3, "Administrator", "ad_is_bogus"]],
       s.read_ber( Net::LDAP::AsnSyntax ))
   end
-
-	def test_oid
-		oid = Net::BER::BerIdentifiedOid.new( [1,3,6,1,2,1,1,1,0] )
-		assert_equal( "\006\b+\006\001\002\001\001\001\000", oid.to_ber )
-
-		oid = Net::BER::BerIdentifiedOid.new( "1.3.6.1.2.1.1.1.0" )
-		assert_equal( "\006\b+\006\001\002\001\001\001\000", oid.to_ber )
-	end
 end

testserver/ldapserver.rb

@@ -12,9 +12,6 @@
 # reactor library.
 #
 
-
-require 'stringio'
-
 #------------------------------------------------
 
 module LdapServer