emonti-rbkb 0.6.7 → 0.6.8

data/History.txt

@@ -1,7 +1,28 @@
+== 0.6.8.1 / 2009-06-12
+* Enhancements
+  * Added String.rotate_bytes per request for a rotation cypher by 
+    wardwouts@github. I pilfered this implementation mostly from Timur Duehr.
+
+== 0.6.8 / 2009-06-04
+* Enhancements
+  * 0.6.8 is geared towards beginning to make rbkb compatible with ruby 1.9.x 
+    (tested on 1.9.1). Had to sacrifice the 'uuid' helper method 
+    since something happened to SHA1 in ruby 1.9. It may make a comeback if 
+    anybody yells about this.
+* Known Issues:
+  * There are problems with binary releases of eventmachine with 1.9.1 on win32
+    this does not appear to be caused by rbkb, however we're keeping an eye on 
+    it. For now, this is causing the plug tools to crash and test cases to 
+    fail on 1.9.1 win32.
+
 == 0.6.7
+* Enhancements
+  * Http::Parameters was given the same treatement as headers got in 0.6.6. 
+    Technically params are supposed to be unique, but we try to stay flexible 
+    in Rbkb. 
 * Bug-fix:
   * Fixed a silly typing bug in Http::Parameters.set_param introduced
-    with 0.6.6
+    around 0.6.6
 
 == 0.6.6
 * Bug-fix:
@@ -11,7 +32,7 @@
 == 0.6.5.2 
 * Enhancements
   * d64 and b64 now support the -f option for input files as rdoc indicates
-    Thanks to Cory Scott for catching this doc error his patch.
+    Thanks to Cory Scott for catching this doc error and for his patch.
 
 == 0.6.5.1 
 * Minor bug-fix

data/README.rdoc

@@ -1,6 +1,6 @@
 = rbkb
 
-* http://www.github.com/emonti/rbkb
+* http://emonti.github.com/rbkb
 
 == DESCRIPTION:
 

data/Rakefile

@@ -22,7 +22,7 @@ PROJ.name = 'rbkb'
 PROJ.authors = 'Eric Monti'
 PROJ.email = 'emonti@matasano.com'
 PROJ.description = 'Rbkb is a collection of ruby-based pen-testing and reversing tools. Inspired by Matasano Blackbag.'
-PROJ.url = 'http://github.com/emonti/rbkb'
+PROJ.url = 'http://emonti.github.com/rbkb'
 PROJ.version = Rbkb::VERSION
 PROJ.rubyforge.name = 'rbkb'
 PROJ.readme_file = 'README.rdoc'

data/lib/rbkb/cli.rb

@@ -180,9 +180,9 @@ module Rbkb::Cli
           @opts[lkey] = 
             if($2[0,1] == '-')
               $2[1..-1].hex_to_num * -1
-             else
+            else
               $2.hex_to_num
-             end
+            end
         end
       end
     end

data/lib/rbkb/extends.rb

@@ -4,18 +4,12 @@
 require "stringio"
 require 'zlib'
 require 'open3'
-require 'sha1'
 
 module Rbkb
   DEFAULT_BYTE_ORDER=:big
   HEXCHARS = [("0".."9").to_a, ("a".."f").to_a].flatten
 end
 
-# Generates a "universally unique identifier"
-def uuid
-  (SHA1::sha1(rand.to_s)).to_s
-end
-
 # Generates a random alphanumeric string of 'size' bytes (8 by default)
 def random_string(size = 8)
   chars = ('A'..'Z').to_a + ('a'..'z').to_a + ('0'..'9').to_a
@@ -212,6 +206,18 @@ class String
     (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)
+    r = self.dup
+    i=0
+    self.each_byte do |b| 
+      r[i] = ((b + k) % 384).chr
+      i+=1
+    end
+    return r
+  end
+
   # String randomizer
   def randomize ; self.split('').randomize.to_s ; end
 
@@ -322,17 +328,17 @@ class String
 
     dat=self
     if find.kind_of? Regexp
-      search = lambda do |find, buf| 
-        if m = find.match(buf)
+      search = lambda do |m, buf| 
+        if m = m.match(buf)
           mtch = m[0]
           off,endoff = m.offset(0)
           return off, endoff, mtch
         end
       end
     else
-      search = lambda do |find, buf|
-        if off = buf.index(find)
-          return off, off+find.size, find
+      search = lambda do |s, buf|
+        if off = buf.index(s)
+          return off, off+s.size, s
         end
       end
     end
@@ -405,9 +411,12 @@ class String
     urx = /((?:#{prx}\x00){#{min}}(?:#{prx}\x00)*(?:\x00\x00)?)/
 
     rx = case (opts[:encoding] || :both).to_sym
-         when :ascii   : arx
-         when :unicode : urx
-         when :both    : Regexp.union( arx, urx )
+         when :ascii   
+           arx
+         when :unicode 
+           urx
+         when :both    
+           Regexp.union( arx, urx )
          else 
            raise "Encoding must be :unicode, :ascii, or :both"
          end

data/lib/rbkb/http/base.rb

@@ -61,7 +61,7 @@ module Rbkb::Http
     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").first =~ /^(\d+)$/ )
+          hdrs.get_header_value("Content-Length").to_s =~ /^(\d+)$/ )
 
         $1.to_i
       end

data/lib/rbkb/http/headers.rb

@@ -120,20 +120,33 @@ module Rbkb::Http
       self.map {|h,v| "#{h}: #{v}" }
     end
 
-    def get_header(k)
+    def get_all(k)
       self.select {|h| h[0].downcase == k.downcase }
     end
 
-    def get_header_value(k)
-      get_header(k).map {|h| h[1]}
+    def get_all_values_for(k)
+      self.get_all(k).collect {|h,v| v }
+    end
+    alias all_values_for get_all_values_for
+
+    def get_header(k)
+      self.find {|h| h[0].downcase == k.downcase }
+    end
+
+    def get_value_for(k)
+      if h=self.get_header(k)
+        return h[1]
+      end
     end
+    alias get_header_value get_value_for
+    alias value_for get_value_for
     
     def delete_header(k)
       self.delete_if {|h| h[0].downcase == k.downcase }
     end
     
     def set_header(k,v)
-      sel = get_header(k)
+      sel = get_all(k)
 
       if sel.empty?
         self << [k,v]
@@ -143,6 +156,7 @@ module Rbkb::Http
         return sel
       end
     end
+    alias set_all_for set_header
 
     # The to_raw method returns a raw string of headers as they appear
     # on the wire.

data/lib/rbkb/http/parameters.rb

@@ -22,19 +22,22 @@ module Rbkb::Http
       self.select {|p| p[0] == k}
     end
 
+    def get_all_values_for(k)
+      self.get_all(k).collect {|p,v| v }
+    end
+    alias all_values_for get_all_values_for
+
     def get_param(k)
       self.find {|p| p[0] == k}
     end
 
     def get_value_for(k)
-      if v=self.get(k)
-        return v[1]
+      if p=self.get_param(k)
+        return p[1]
       end
     end
-
-    def get_all_values_for(k)
-      self.get_all(k).map {|p,v| v }
-    end
+    alias get_param_value get_value_for
+    alias value_for get_value_for
 
     def set_param(k, v)
       if p=self.get_param(k)
@@ -42,7 +45,7 @@ module Rbkb::Http
       else
         p << [k,v]
       end
-      return v
+      return [[k,v]]
     end
 
     def set_all_for(k, v)

data/lib/rbkb/http/response.rb

@@ -67,7 +67,7 @@ module Rbkb::Http
     # opts parameter.
     def do_chunked_encoding?(hdrs=@headers)
       ( (not @opts[:ignore_chunked_encoding]) and 
-        (hdrs.get_header_value("Transfer-Encoding").first =~ /(?:^|\W)chunked(?:\W|$)/) )
+        (hdrs.get_header_value("Transfer-Encoding").to_s =~ /(?:^|\W)chunked(?:\W|$)/) )
     end
 
     # Returns a new Headers object extended as ResponseHeaders. This is the 

data/lib/rbkb/http.rb

@@ -5,10 +5,12 @@
 
 module Rbkb
   module Http
-    VERSION = "0.0.2"
+    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"
@@ -17,4 +19,3 @@ require "rbkb/http/headers.rb"
 require "rbkb/http/body.rb"
 require "rbkb/http/parameters.rb"
 
-

data/lib/rbkb.rb

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

data/rbkb.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rbkb}
-  s.version = "0.6.7"
+  s.version = "0.6.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Eric Monti"]
-  s.date = %q{2009-06-03}
+  s.date = %q{2009-06-17}
   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.homepage = %q{http://github.com/emonti/rbkb}
+  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}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: emonti-rbkb
 version: !ruby/object:Gem::Version 
-  version: 0.6.7
+  version: 0.6.8
 platform: ruby
 authors: 
 - Eric Monti
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-03 00:00:00 -07:00
+date: 2009-06-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -182,7 +182,7 @@ files:
 - test/test_http_response.rb
 - test/test_rbkb.rb
 has_rdoc: false
-homepage: http://github.com/emonti/rbkb
+homepage: http://emonti.github.com/rbkb
 post_install_message: 
 rdoc_options: 
 - --line-numbers