rbkb 0.6.10 → 0.6.11

data/History.txt

@@ -1,3 +1,7 @@
+== 0.6.11 / 2009-10-06
+  * split off rbkb/http as its own package
+  * added some new String crypto utilities in extends
+
 == 0.6.10 / 2009-09-30
   * added -b/--blitsrv argument to plugsrv
   * added --target-tls/--server-tls arguments to plugsrv for TLS support

data/README.rdoc

@@ -17,9 +17,8 @@ related to pen-testing and reversing.
 
 rbkb is inspired by Matasano BlackBag (a set of similar tools written in C).
 
-See:
-* http://www.matasano.com/log/1048/blackbag-091-new-link-and-minor-fixes/
-* http://www.matasano.com/log/552/code-release-blackbag-09-binary-protocol-reversing-unix-thingies/
+See: 
+blackbag - http://github.com/emonti/rbkb/raw/master/reference/blackbag-0.9.1.tgz
 
 Things go into the black bag as they are stolen (as a compliment!) or dreamed 
 up, usually for simplifying some repetetive task or a desire for a new tool.
@@ -81,10 +80,9 @@ your irb sessions and own scripts. See 'lib_usage.rdoc' for more info.
 
 === Gem Installation
 
-rbkb is available as a gem from github:
+rbkb is available as a gem on gemcutter.org:
 
-    gem sources -a http://gems.github.com #(you only have to do this once)
-    gem install emonti-rbkb
+    gem install rbkb --source http://gemcutter.org
 
 
 ==== Gem Install Note
@@ -101,7 +99,7 @@ executable bin/* files somewhere unexpected. To find out where these are and
 either add them to your PATH or copy/symlink them somewhere else like 
 /usr/local/bin/ do this:
 
-    gem contents emonti-rbkb
+    gem contents rbkb
 
 
 === Manual installation:

data/lib/rbkb.rb

@@ -2,7 +2,7 @@
 module Rbkb
 
   # :stopdoc:
-  VERSION = '0.6.10'
+  VERSION = '0.6.11'
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
   # :startdoc:

data/lib/rbkb/extends.rb

@@ -19,7 +19,7 @@ end
 # Generates a random string of 'size' bytes (8 by default)
 def random_string(size = 8)
   chars = (0..255).map {|c| c.chr }
-  (1..size).collect {|a| chars[rand(chars.size)]}
+  (1..size).collect {|a| chars[rand(chars.size)]}.join
 end
 
 # Simple syntactic sugar to pass any object to a block
@@ -194,6 +194,32 @@ class String
     e
   end
 
+
+  # Produces a character frequency distribution histogram in descending
+  # order. Example:
+  #
+  #   pp some_english_text.char_frequency()
+  #
+  #   [[" ", 690],
+  #    ["e", 354],
+  #    ["t", 242],
+  #    ["o", 233],
+  #    ["i", 218],
+  #    ["a", 176],
+  #    ["s", 172],
+  #    ["r", 172],
+  #    ["n", 167],
+  #    ["d", 106],
+  #    ...
+  #   ]
+  #     
+  def char_frequency
+    hits = {}
+    self.each_byte {|c| hits[c.chr] ||= 0; hits[c.chr] += 1 }
+    hits.to_a.sort {|a,b| b[1] <=> a[1] }
+  end
+   
+
   # xor against a key. key will be repeated or truncated to self.size.
   def xor(k)
     s=self
@@ -205,12 +231,30 @@ class String
     out.string
   end
 
+
+  # (en|de)ciphers using a substition cipher en/decoder ring in the form of a 
+  # hash with orig => substitute mappings
+  def substitution(keymap)
+    split('').map {|c| (sub=keymap[c]) ? sub : c }.join
+  end
+
+
+  # (en|de)crypts using a substition xor en/decoder ring in the form of 
+  # a hash with orig => substitute mappings. Used in conjunction with 
+  # char_frequency, this sometimes provides a shorter way to derive a single 
+  # character xor key used in conjunction with char_frequency.
+  def substitution_xor(keymap)
+    split('').map {|c| (sub=keymap[c]) ? sub.xor(c) : c }.join
+  end
+
+
   # convert bytes to number then xor against another byte-string or number
   def ^(x)
     x = x.dat_to_num unless x.is_a? Numeric
     (self.dat_to_num ^ x)#.to_bytes
   end
 
+
   # Byte rotation as found in lame ciphers.
   # This was cribbed from Timur Duehr with only a minor change.
   def rotate_bytes(k=0)
@@ -223,9 +267,11 @@ class String
     return r
   end
 
+
   # String randomizer
   def randomize ; self.split('').randomize.to_s ; end
 
+
   # In-place string randomizer
   def randomize! ; self.replace(randomize) end
 
@@ -552,7 +598,6 @@ class String
     end
     r
   end
-
   
 
   # Returns a reference to actual constant for a given name in namespace
@@ -579,6 +624,22 @@ class Symbol
 end
 
 class Array
+
+  # Should be in the std library.
+  #
+  #   keys = [:one, :two, :three]
+  #   vals = [1, 2, 3]
+  #
+  #   keys.zip(vals).to_hash
+  #   #=> {:two=>2, :three=>3, :one=>1}})
+  #
+  #   keys.to_hash(vals)
+  #   #=> {:two=>2, :three=>3, :one=>1}})
+  def to_hash(vals=nil)
+    a = vals ? self.zip(vals) : self
+    a.inject({}) {|hash, i| hash[i[0]] = i[1]; hash}
+  end
+
   # randomizes the order of contents in the Array (self)
   def randomize  ; self.sort_by { rand } ; end
 

data/rbkb.gemspec

@@ -2,23 +2,23 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rbkb}
-  s.version = "0.6.10"
+  s.version = "0.6.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Eric Monti"]
-  s.date = %q{2009-10-01}
+  s.date = %q{2009-10-07}
   s.description = %q{Rbkb is a collection of ruby-based pen-testing and reversing tools. Inspired by Matasano Blackbag.}
   s.email = %q{emonti@matasano.com}
   s.executables = ["b64", "bgrep", "blit", "c", "crc32", "d64", "dedump", "feed", "hexify", "len", "plugsrv", "rex", "rstrings", "slice", "telson", "unhexify", "urldec", "urlenc", "xor"]
   s.extra_rdoc_files = ["History.txt", "README.rdoc", "bin/b64", "bin/bgrep", "bin/blit", "bin/c", "bin/crc32", "bin/d64", "bin/dedump", "bin/feed", "bin/hexify", "bin/len", "bin/plugsrv", "bin/rex", "bin/rstrings", "bin/slice", "bin/telson", "bin/unhexify", "bin/urldec", "bin/urlenc", "bin/xor", "cli_usage.rdoc", "lib_usage.rdoc"]
-  s.files = ["History.txt", "README.rdoc", "Rakefile", "bin/b64", "bin/bgrep", "bin/blit", "bin/c", "bin/crc32", "bin/d64", "bin/dedump", "bin/feed", "bin/hexify", "bin/len", "bin/plugsrv", "bin/rex", "bin/rstrings", "bin/slice", "bin/telson", "bin/unhexify", "bin/urldec", "bin/urlenc", "bin/xor", "cli_usage.rdoc", "doctor-bag.jpg", "lib/rbkb.rb", "lib/rbkb/cli.rb", "lib/rbkb/cli/b64.rb", "lib/rbkb/cli/bgrep.rb", "lib/rbkb/cli/blit.rb", "lib/rbkb/cli/chars.rb", "lib/rbkb/cli/crc32.rb", "lib/rbkb/cli/d64.rb", "lib/rbkb/cli/dedump.rb", "lib/rbkb/cli/feed.rb", "lib/rbkb/cli/hexify.rb", "lib/rbkb/cli/len.rb", "lib/rbkb/cli/rstrings.rb", "lib/rbkb/cli/slice.rb", "lib/rbkb/cli/telson.rb", "lib/rbkb/cli/unhexify.rb", "lib/rbkb/cli/urldec.rb", "lib/rbkb/cli/urlenc.rb", "lib/rbkb/cli/xor.rb", "lib/rbkb/extends.rb", "lib/rbkb/http.rb", "lib/rbkb/http/base.rb", "lib/rbkb/http/body.rb", "lib/rbkb/http/common.rb", "lib/rbkb/http/headers.rb", "lib/rbkb/http/parameters.rb", "lib/rbkb/http/request.rb", "lib/rbkb/http/response.rb", "lib/rbkb/plug.rb", "lib/rbkb/plug/blit.rb", "lib/rbkb/plug/cli.rb", "lib/rbkb/plug/feed_import.rb", "lib/rbkb/plug/peer.rb", "lib/rbkb/plug/plug.rb", "lib/rbkb/plug/proxy.rb", "lib/rbkb/plug/unix_domain.rb", "lib_usage.rdoc", "rbkb.gemspec", "spec/rbkb_spec.rb", "spec/spec_helper.rb", "tasks/ann.rake", "tasks/bones.rake", "tasks/gem.rake", "tasks/git.rake", "tasks/notes.rake", "tasks/post_load.rake", "tasks/rdoc.rake", "tasks/rubyforge.rake", "tasks/setup.rb", "tasks/spec.rake", "tasks/svn.rake", "tasks/test.rake", "test/test_cli_b64.rb", "test/test_cli_bgrep.rb", "test/test_cli_blit.rb", "test/test_cli_chars.rb", "test/test_cli_crc32.rb", "test/test_cli_d64.rb", "test/test_cli_dedump.rb", "test/test_cli_feed.rb", "test/test_cli_helper.rb", "test/test_cli_hexify.rb", "test/test_cli_len.rb", "test/test_cli_rstrings.rb", "test/test_cli_slice.rb", "test/test_cli_telson.rb", "test/test_cli_unhexify.rb", "test/test_cli_urldec.rb", "test/test_cli_urlenc.rb", "test/test_cli_xor.rb", "test/test_helper.rb", "test/test_http.rb", "test/test_http_helper.rb", "test/test_http_request.rb", "test/test_http_response.rb", "test/test_rbkb.rb"]
+  s.files = ["History.txt", "README.rdoc", "Rakefile", "bin/b64", "bin/bgrep", "bin/blit", "bin/c", "bin/crc32", "bin/d64", "bin/dedump", "bin/feed", "bin/hexify", "bin/len", "bin/plugsrv", "bin/rex", "bin/rstrings", "bin/slice", "bin/telson", "bin/unhexify", "bin/urldec", "bin/urlenc", "bin/xor", "cli_usage.rdoc", "doctor-bag.jpg", "lib/rbkb.rb", "lib/rbkb/cli.rb", "lib/rbkb/cli/b64.rb", "lib/rbkb/cli/bgrep.rb", "lib/rbkb/cli/blit.rb", "lib/rbkb/cli/chars.rb", "lib/rbkb/cli/crc32.rb", "lib/rbkb/cli/d64.rb", "lib/rbkb/cli/dedump.rb", "lib/rbkb/cli/feed.rb", "lib/rbkb/cli/hexify.rb", "lib/rbkb/cli/len.rb", "lib/rbkb/cli/rstrings.rb", "lib/rbkb/cli/slice.rb", "lib/rbkb/cli/telson.rb", "lib/rbkb/cli/unhexify.rb", "lib/rbkb/cli/urldec.rb", "lib/rbkb/cli/urlenc.rb", "lib/rbkb/cli/xor.rb", "lib/rbkb/extends.rb", "lib/rbkb/plug.rb", "lib/rbkb/plug/blit.rb", "lib/rbkb/plug/cli.rb", "lib/rbkb/plug/feed_import.rb", "lib/rbkb/plug/peer.rb", "lib/rbkb/plug/plug.rb", "lib/rbkb/plug/proxy.rb", "lib/rbkb/plug/unix_domain.rb", "lib_usage.rdoc", "rbkb.gemspec", "spec/rbkb_spec.rb", "spec/spec_helper.rb", "tasks/ann.rake", "tasks/bones.rake", "tasks/gem.rake", "tasks/git.rake", "tasks/notes.rake", "tasks/post_load.rake", "tasks/rdoc.rake", "tasks/rubyforge.rake", "tasks/setup.rb", "tasks/spec.rake", "tasks/svn.rake", "tasks/test.rake", "test/test_cli_b64.rb", "test/test_cli_bgrep.rb", "test/test_cli_blit.rb", "test/test_cli_chars.rb", "test/test_cli_crc32.rb", "test/test_cli_d64.rb", "test/test_cli_dedump.rb", "test/test_cli_feed.rb", "test/test_cli_helper.rb", "test/test_cli_hexify.rb", "test/test_cli_len.rb", "test/test_cli_rstrings.rb", "test/test_cli_slice.rb", "test/test_cli_telson.rb", "test/test_cli_unhexify.rb", "test/test_cli_urldec.rb", "test/test_cli_urlenc.rb", "test/test_cli_xor.rb", "test/test_helper.rb", "test/test_rbkb.rb"]
   s.homepage = %q{http://emonti.github.com/rbkb}
   s.rdoc_options = ["--line-numbers", "--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{rbkb}
   s.rubygems_version = %q{1.3.4}
   s.summary = %q{Rbkb is a collection of ruby-based pen-testing and reversing tools}
-  s.test_files = ["test/test_cli_b64.rb", "test/test_cli_bgrep.rb", "test/test_cli_blit.rb", "test/test_cli_chars.rb", "test/test_cli_crc32.rb", "test/test_cli_d64.rb", "test/test_cli_dedump.rb", "test/test_cli_feed.rb", "test/test_cli_helper.rb", "test/test_cli_hexify.rb", "test/test_cli_len.rb", "test/test_cli_rstrings.rb", "test/test_cli_slice.rb", "test/test_cli_telson.rb", "test/test_cli_unhexify.rb", "test/test_cli_urldec.rb", "test/test_cli_urlenc.rb", "test/test_cli_xor.rb", "test/test_helper.rb", "test/test_http.rb", "test/test_http_helper.rb", "test/test_http_request.rb", "test/test_http_response.rb", "test/test_rbkb.rb"]
+  s.test_files = ["test/test_cli_b64.rb", "test/test_cli_bgrep.rb", "test/test_cli_blit.rb", "test/test_cli_chars.rb", "test/test_cli_crc32.rb", "test/test_cli_d64.rb", "test/test_cli_dedump.rb", "test/test_cli_feed.rb", "test/test_cli_helper.rb", "test/test_cli_hexify.rb", "test/test_cli_len.rb", "test/test_cli_rstrings.rb", "test/test_cli_slice.rb", "test/test_cli_telson.rb", "test/test_cli_unhexify.rb", "test/test_cli_urldec.rb", "test/test_cli_urlenc.rb", "test/test_cli_xor.rb", "test/test_helper.rb", "test/test_rbkb.rb"]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rbkb
 version: !ruby/object:Gem::Version 
-  version: 0.6.10
+  version: 0.6.11
 platform: ruby
 authors: 
 - Eric Monti
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-01 00:00:00 -04:00
+date: 2009-10-07 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -125,14 +125,6 @@ files:
 - lib/rbkb/cli/urlenc.rb
 - lib/rbkb/cli/xor.rb
 - lib/rbkb/extends.rb
-- lib/rbkb/http.rb
-- lib/rbkb/http/base.rb
-- lib/rbkb/http/body.rb
-- lib/rbkb/http/common.rb
-- lib/rbkb/http/headers.rb
-- lib/rbkb/http/parameters.rb
-- lib/rbkb/http/request.rb
-- lib/rbkb/http/response.rb
 - lib/rbkb/plug.rb
 - lib/rbkb/plug/blit.rb
 - lib/rbkb/plug/cli.rb
@@ -176,10 +168,6 @@ files:
 - test/test_cli_urlenc.rb
 - test/test_cli_xor.rb
 - test/test_helper.rb
-- test/test_http.rb
-- test/test_http_helper.rb
-- test/test_http_request.rb
-- test/test_http_response.rb
 - test/test_rbkb.rb
 has_rdoc: true
 homepage: http://emonti.github.com/rbkb
@@ -231,8 +219,4 @@ test_files:
 - test/test_cli_urlenc.rb
 - test/test_cli_xor.rb
 - test/test_helper.rb
-- test/test_http.rb
-- test/test_http_helper.rb
-- test/test_http_request.rb
-- test/test_http_response.rb
 - test/test_rbkb.rb

data/lib/rbkb/http.rb

@@ -1,21 +0,0 @@
-
-# ???Why???? would anyone create their own HTTP implementation in ruby with 
-# so many options out there? Short answer: Net:HTTP and others just don't cut 
-# it in lots of edge cases. I needed something I could control completely.
-
-module Rbkb
-  module Http
-    VERSION = "0.0.3"
-  end
-end
-
-require 'time' # gives us Time.httpdate parser and output methods
-
-require "rbkb/http/common.rb"
-require "rbkb/http/base.rb"
-require "rbkb/http/request.rb"
-require "rbkb/http/response.rb"
-require "rbkb/http/headers.rb"
-require "rbkb/http/body.rb"
-require "rbkb/http/parameters.rb"
-

data/lib/rbkb/http/base.rb

@@ -1,172 +0,0 @@
-module Rbkb::Http
-
-  # A base class containing some common features for Request and Response 
-  # objects.
-  #
-  # Don't use this class directly, it's intended for being overridden
-  # from its derived classes or mixins.
-  class Base
-    include CommonInterface
-
-    def self.parse(*args)
-      new(*args)
-    end
-
-    # Initializes a new Base object
-    def initialize(*args)
-      _common_init(*args)
-    end
-
-    # This method parses just HTTP message body. Expects body to be split
-    # from the headers before-hand.
-    def capture_body(bstr)
-      self.body ||= default_body_obj
-      @body.capture(bstr)
-    end
-
-    # XXX stub
-    def first_entity
-      @first_entity
-    end
-
-    # XXX stub
-    def first_entity=(f)
-      @first_entity=(f)
-    end
-
-    # This method parses only HTTP response headers. Expects headers to be 
-    # split from the body before-hand.
-    def capture_headers(hstr)
-      self.headers ||= default_headers_obj
-
-      if @body and not @body.capture_complete?
-        return 
-      elsif @headers.capture_complete?
-        self.first_entity, @headers = default_headers_obj.capture_full_headers(hstr)
-      else 
-        @headers.capture(hstr)
-      end
-    end
-
-    # This method returns the content length from Headers. This is
-    # mostly useful if you are using a BoundBody object for the body.
-    # 
-    # Returns nil if no "Content-Length" is not found.
-    #
-    # The opts parameter :ignore_content_length affects this method and 
-    # will cause it always to return nil. This is useful, for example,
-    # for the responses to the HTTP HEAD request method, which return
-    # a Content-Length without actual content.
-    #
-    def content_length(hdrs=@headers)
-      raise "headers is nil?" if not hdrs
-      if( (not @opts[:ignore_content_length]) and 
-          hdrs.get_header_value("Content-Length").to_s =~ /^(\d+)$/ )
-
-        $1.to_i
-      end
-    end
-
-    def attach_new_header(hdr_obj=nil)
-      self.headers = hdr_obj
-      return hdr_obj
-    end
-
-    def attach_new_body(body_obj=nil)
-      self.body = body_obj
-      return body_obj
-    end
-
-    # XXX doc override!
-    def default_headers_obj(*args)
-      Header.new(*args)
-    end
-
-    # XXX doc override!
-    def default_body_obj(*args)
-      Body.new(*args)
-    end
-
-    # This method will non-destructively reset the capture state on this 
-    # object and all child entities. Note, however, If child entities are not 
-    # defined, it may instantiate new ones. 
-    # See also: capture_complete?, reset_capture!
-    def reset_capture
-      if @headers
-        @headers.reset_capture if not @headers.capture_complete?
-      else
-        attach_new_header()
-      end
-
-      if @body
-        @body.reset_capture if not @body.capture_complete? 
-      else
-        attach_new_body()
-      end
-      @capture_state = nil
-      self
-    end
-
-    # This method will destructively reset the capture state on this object.
-    # It does so by initializing fresh child entities and discarding the old
-    # ones. See also: capture_complete?, reset_capture
-    def reset_capture!
-      attach_new_header()
-      attach_new_body()
-      @capture_state = nil
-      self
-    end
-
-    # Indicates whether this object is ready to capture fresh data, or is
-    # waiting for additional data or a reset from a previous incomplete or 
-    # otherwise broken capture. See also: reset_capture, reset_capture!
-    def capture_complete?
-      if( (@headers and not @headers.capture_complete?) or
-          (@body and not @body.capture_complete?) )
-        return false
-      else
-        true
-      end
-    end
-
-    attr_reader :body, :headers
-
-    # This accessor will attempt to always do the "right thing" while
-    # setting this object's body entity. 
-    #
-    # See also: default_body_obj
-    def body=(b)
-      if @body
-        @body.data = b
-      elsif b.kind_of? Body
-        @body = b.dup
-        @body.opts = b.opts
-      else
-        @body = default_body_obj(b)
-      end
-      @body.base = self
-      return @body
-    end
-
-    # This accessor will attempt to always do the "right thing" while
-    # setting this object's headers entity. 
-    #
-    # See also: default_headers_obj
-    def headers=(h)
-      if @headers
-        @headers.data = h
-      elsif h.kind_of? Headers
-        @headers = h.dup
-        @headers.opts = h.opts
-      else
-        @headers = default_headers_obj(h)
-      end
-      @headers.base = self
-      return @body
-    end
-
-  end
-
-
-end
-

data/lib/rbkb/http/body.rb

@@ -1,214 +0,0 @@
-require 'stringio'
-
-module Rbkb::Http
-  class Body < String
-    include CommonInterface
-
-    def self.parse(str)
-      new().capture(str)
-    end
-
-    attr_reader :expect_length
-
-    def initialize(str=nil, opts=nil)
-      self.opts = opts
-      if Body === str
-        self.replace(str)
-        @opts = str.opts.merge(@opts)
-      elsif String === str 
-        super(str)
-      else
-        super()
-      end
-
-      yield(self) if block_given?
-    end
-
-    # The capture method is used when parsing HTTP requests/responses.
-    # This can and probably should be overridden in derived classes.
-    def capture(str)
-      yield(str) if block_given?
-      self.data=(str)
-    end
-
-    # The to_raw method is used when writing HTTP requests/responses.
-    # This can and probably should be overridden in derived classes.
-    def to_raw
-      (block_given?) ? yield(self.data) : self.data
-    end
-
-    attr_reader :base
-
-    def base=(b)
-      if b.nil? or b.is_a? Base
-        @base = b
-      else
-        raise "base must be a Response or Request object or nil" 
-      end
-    end
-
-    def data
-      self
-    end
-
-    # Sets internal raw string data without any HTTP decoration.
-    def data=(str)
-      self.replace(str.to_s)
-    end
-
-    # Returns the content length from the HTTP base object if
-    # there is one and content-length is available.
-    def get_content_length
-      @base.content_length if @base
-    end
-
-    # This method will non-destructively reset the capture state on this object.
-    # It is non-destructive in that it will not affect existing captured data 
-    # if present.
-    def reset_capture
-      @expect_length = nil
-      @base.reset_capture() if @base and @base.capture_complete?
-    end
-
-    # This method will destructively reset the capture state on this object.
-    # This method is destructive in that it will clear any previously captured
-    # data.
-    def reset_capture!
-      reset_capture()
-      self.data=""
-    end
-
-    def capture_complete?
-      not @expect_length
-    end
-  end
-
-
-  # BoundBody is designed for handling an HTTP body when using the usual
-  # "Content-Length: NNN" HTTP header.
-  class BoundBody < Body
-
-    # This method may throw :expect_length with one of the following values
-    # to indicate certain content-length conditions:
-    #
-    #   > 0 :   Got incomplete data in this capture. The object expects
-    #           capture to be called again with more body data.
-    #
-    #   < 0 :   Got more data than expected, the caller should truncate and 
-    #           handle the extra data in some way. Note: Calling capture again
-    #           on this instance will start a fresh body capture.
-    #
-    # Caller can also detect the above conditions by checking the expect_length 
-    # attribute but should still be prepared handle the throw().
-    #
-    #  0/nil:  Got exactly what was expected. Caller can proceed with fresh
-    #          captures on this or other Body objects.
-    #
-    # See also reset_capture and reset_capture!
-    def capture(str)
-      raise "arg 0 must be a string" unless String === str
-
-      # Start fresh unless we're expecting more data
-      self.data="" unless @expect_length and @expect_length > 0
-
-      if not clen=get_content_length()
-        raise "content-length is unknown. aborting capture"
-      else
-        @expect_length = clen - (self.size + str.size)
-        self << str[0, clen - self.size]
-        if @expect_length > 0
-          throw(:expect_length, @expect_length)
-        elsif @expect_length < 0
-          throw(:expect_length, @expect_length)
-        else
-          reset_capture()
-        end
-      end
-      return self
-    end
-
-    def to_raw(*args)
-      if @base
-        @base.headers.set_header("Content-Length", self.size)
-      end
-      super(*args)
-    end
-  end
-
-
-  # ChunkedBody is designed for handling an HTTP body when using a
-  # "Transfer-Encoding: chunked" HTTP header.
-  class ChunkedBody < Body
-    DEFAULT_CHUNK_SIZE = 2048
-
-    # Throws :expect_length with 'true' when given incomplete data and expects 
-    # to be called again with more body data to parse. 
-    #
-    # The caller can also detect this condition by checking the expect_length 
-    # attribute but must still handle the throw().
-    #
-    # See also reset_capture and reset_capture!
-    def capture(str)
-      # chunked encoding is gross...
-      if @expect_length
-        sio = StringIO.new(@last_chunk.to_s + str)
-      else
-        sio = StringIO.new(str)
-        self.data=""
-      end
-      @last_chunk = nil
-
-      @expect_length = true
-      while not sio.eof?
-        unless m=/^([a-fA-F0-9]+)\s*(;[[:print:]\s]*)?\r?\n$/.match(line=sio.readline)
-          raise "invalid chunk at #{line.chomp.inspect}"
-        end
-        if (chunksz = m[1].hex) == 0
-          @expect_length = false
-          # XXX ignore Trailer headers
-          break
-        end
-
-        if ( (not sio.eof?) and 
-             (chunk=sio.read(chunksz)) and 
-             chunk.size == chunksz and 
-             (not sio.eof?) and (extra = sio.readline) and
-             (not sio.eof?) and (extra << sio.readline)
-           )
-          if extra =~ /^\r?\n\r?\n$/
-            yield(chunk) if block_given?
-            self << chunk
-          else
-            raise "expected CRLF"
-          end
-        else
-          @last_chunk = line + chunk.to_s + extra.to_s
-          break
-        end
-      end
-      throw(:expect_length, @expect_length) if @expect_length
-      return self
-    end
-
-
-    def to_raw(csz=nil)
-      csz ||= (@opts[:output_chunk_size] || DEFAULT_CHUNK_SIZE)
-      unless csz.kind_of? Integer and csz > 0
-        raise "chunk size must be an integer >= 1"
-      end
-
-      out=[]
-      i=0
-      while i <= self.size
-        chunk = self[i, csz]
-        out << "#{chunk.size.to_s(16)}\r\n#{chunk}\r\n\r\n"
-        yield(self, out.last) if block_given?
-        i+=csz
-      end
-      out << "0\r\n"
-      yield(self, out.last) if block_given?
-      return out.join
-    end
-  end
-end
-