emonti-rbkb 0.6.8 → 0.6.9

data/History.txt

@@ -1,3 +1,12 @@
+== 0.6.9 / 2009-09-01
+* Enhancements
+  * telson and feed now support -s/--source address:port using TCP with 
+    bind_connect via eventmachine
+  * random_string and random_alphanum added to String extensions
+* Bug-Fix
+  * Plug's PeerList.find_peers was returning nil resulting in problems for 
+    blit -l amongst other things.
+
 == 0.6.8.1 / 2009-06-12
 * Enhancements
   * Added String.rotate_bytes per request for a rotation cypher by 

data/cli_usage.rdoc

@@ -106,14 +106,15 @@ Feed can do the following things with minimum fuss:
       -v, --version                    Show version and exit
       -o, --output=FILE                Output to file
       -l, --listen=(ADDR:?)PORT        Server - on port (and addr?)
+      -s, --source=(ADDR:?)PORT        Bind client on port and addr
       -b, --blit=(ADDR:)?PORT          Where to listen for blit
       -i, --[no-]initiate              Send the first message on connect
       -e, --[no-]end                   End connection when feed is exhausted
-      -s, --[no-]step                  'Continue' prompt between messages
+          --[no-]step                  'Continue' prompt between messages
       -u, --udp                        Use UDP instead of TCP
       -r, --reconnect                  Attempt to reconnect endlessly.
       -q, --quiet                      Suppress verbose messages/dumps
-      -S, --squelch-exhausted          Squelch 'FEED EXHAUSTED' messages
+      -Q, --squelch-exhausted          Squelch 'FEED EXHAUSTED' messages
     Sources: (can be combined)
       -f, --from-files=GLOB            Import messages from raw files
       -x, --from-hex=FILE              Import messages from hexdumps
@@ -121,6 +122,7 @@ Feed can do the following things with minimum fuss:
       -p, --from-pcap=FILE[:FILTER]    Import messages from pcap
 
 
+
 === hexify
 
 Converts a string or raw data to hex characters. Input can be supplied via 
@@ -215,16 +217,17 @@ Telson is for doing the following things with minimum fuss:
   of a conversation.
 
   Usage: telson [options] host:port
-    -h, --help                       Show this message
-    -v, --version                    Show version and exit
-    -o, --output=FILE                Output to file
-    -q, --quiet                      Turn off verbose logging
-    -d, --dump-format=hex/raw        Output conversations in hexdump or raw
-    -b, --blit=ADDR:PORT             Where to listen for blit
-    -u, --udp                        UDP mode
-    -S, --start-tls                  Initiate TLS
-    -r, --reconnect                  Attempt to reconnect endlessly.
-    -s, --source=(ADDR:?)PORT        Bind on port (and addr?)
+      -h, --help                       Show this message
+      -v, --version                    Show version and exit
+      -o, --output=FILE                Output to file
+      -q, --quiet                      Turn off verbose logging
+      -d, --dump-format=hex/raw        Output conversations in hexdump or raw
+      -b, --blit=ADDR:PORT             Where to listen for blit
+      -u, --udp                        UDP mode
+      -S, --start-tls                  Initiate TLS
+      -r, --reconnect                  Attempt to reconnect endlessly.
+      -s, --source=(ADDR:?)PORT        Bind client on port and addr
+
 
 === unhexify
 

data/lib/rbkb/cli/feed.rb

@@ -35,7 +35,7 @@ class Rbkb::Cli::Feed < Rbkb::Cli::Executable
     @persist = false
     @transport = :TCP
     @svr_method = :start_server
-    @cli_method = :connect
+    @cli_method = :bind_connect
     @blit_addr = Plug::Blit::DEFAULT_IPADDR
     @blit_port = Plug::Blit::DEFAULT_PORT
 
@@ -74,6 +74,15 @@ class Rbkb::Cli::Feed < Rbkb::Cli::Executable
       end
     end
 
+    arg.on("-s", "--source=(ADDR:?)PORT", "Bind client on port and addr") do |p|
+      if m=/^(?:([\w\.]+):)?(\d+)$/.match(p)
+        @local_addr = $1 if $1
+        @local_port = $2.to_i
+      else
+        bail("Invalid source argument: #{p.inspect}")
+      end
+    end
+
     arg.on("-b", "--blit=(ADDR:)?PORT", "Where to listen for blit") do |b|
       puts b
       unless(m=/^(?:([\w\._-]+):)?(\d+)$/.match(b))
@@ -91,7 +100,7 @@ class Rbkb::Cli::Feed < Rbkb::Cli::Executable
       @feed_opts[:close_at_end] = c
     end
      
-    arg.on("-s", "--[no-]step", "'Continue' prompt between messages") do |s|
+    arg.on("--[no-]step", "'Continue' prompt between messages") do |s|
       @feed_opts[:step] = s
     end
 
@@ -149,14 +158,14 @@ class Rbkb::Cli::Feed < Rbkb::Cli::Executable
       @svr_method = @cli_method = :open_datagram_socket
     end
 
+    @local_port ||= 0
     # Prepare EventMachine arguments based on whether we are a client or server
-    if @listen
-      @evma_addr = @local_addr
-      @evma_port = @local_port
+    if @listen # server
       @meth = @svr_method
+      addr_args = [@local_addr, @local_port]
       @feed_opts[:kind] = :server
       @feed_opts[:no_stop_on_unbind] = true
-    else
+    else # client
 
       ## Get target/listen argument for client mode
       unless (m = /^([\w\.]+):(\d+)$/.match(tgt=@argv.shift))
@@ -167,11 +176,9 @@ class Rbkb::Cli::Feed < Rbkb::Cli::Executable
       @target_port = m[2].to_i
 
       if @transport == :UDP
-        @evma_addr = @local_addr
-        @evma_port = @local_port || 0
+        addr_args = [@local_addr, @local_port]
       else
-        @evma_addr = @target_addr
-        @evma_port = @target_port
+        addr_args = [@local_addr, @local_port, @target_addr, @target_port]
       end
 
       @meth = @cli_method
@@ -182,8 +189,7 @@ class Rbkb::Cli::Feed < Rbkb::Cli::Executable
 
     @em_args=[ 
       @meth, 
-      @evma_addr, 
-      @evma_port, 
+      addr_args,
       Plug::ArrayFeeder, 
       @transport, 
       @feed_opts

data/lib/rbkb/cli/telson.rb

@@ -20,7 +20,6 @@ class Rbkb::Cli::Telson < Rbkb::Cli::PlugCli
       this.local_port = 0
     end
 
-    @srced = false
     @persist = false
   end
 
@@ -32,13 +31,12 @@ class Rbkb::Cli::Telson < Rbkb::Cli::PlugCli
       @persist=true
     end
 
-    arg.on("-s", "--source=(ADDR:?)PORT", "Bind on port (and addr?)") do |p|
+    arg.on("-s", "--source=(ADDR:?)PORT", "Bind client on port and addr") do |p|
       if m=/^(?:([\w\.]+):)?(\d+)$/.match(p)
         @local_addr = $1 if $1
         @local_port = $2.to_i
-        @srced = true
       else
-        bail("Invalid listen argument: #{p.inspect}")
+        bail("Invalid source argument: #{p.inspect}")
       end
     end
   end
@@ -54,23 +52,30 @@ class Rbkb::Cli::Telson < Rbkb::Cli::PlugCli
 
   def go(*args)
     super(*args)
-
     loop do
       EventMachine.run {
         if @transport == :TCP
-          bail("Sorry: --source only works with UDP.") if @srced
-
-          c=EventMachine.connect(@target_addr, @target_port, Plug::Telson, @transport, @plug_opts)
 
+          c=EventMachine.bind_connect( @local_addr,
+                                       @local_port,
+                                       @target_addr, 
+                                       @target_port, 
+                                       Plug::Telson, 
+                                       @transport, 
+                                       @plug_opts )
         elsif @transport == :UDP
-          c=EventMachine.open_datagram_socket( @local_addr, @local_port, Plug::Telson, @transport, @plug_opts)
+          c=EventMachine.open_datagram_socket( @local_addr, 
+                                               @local_port, 
+                                               Plug::Telson, 
+                                               @transport, 
+                                               @plug_opts )
+ 
           c.peers.add_peer_manually(@target_addr, @target_port)
 
         ### someday maybe raw or others?
         else
           raise "bad transport protocol"
         end
-
         EventMachine.start_server(@blit_addr, @blit_port, Plug::Blit, @blit_proto, c)
         Plug::UI::verbose("** BLITSRV-#{@blit_addr}:#{@blit_port}(TCP) Started") # XXX
       }

data/lib/rbkb/extends.rb

@@ -11,11 +11,16 @@ module Rbkb
 end
 
 # Generates a random alphanumeric string of 'size' bytes (8 by default)
-def random_string(size = 8)
+def random_alphanum(size = 8)
   chars = ('A'..'Z').to_a + ('a'..'z').to_a + ('0'..'9').to_a
   (1..size).collect{|a| chars[rand(chars.size)]}.join
 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| char[rand(chars.size)]}
+end
 
 # Simple syntactic sugar to pass any object to a block
 def with(x)

data/lib/rbkb/plug/peer.rb

@@ -45,7 +45,6 @@ module Plug
 
     def find_peer(addr)
       self.find {|p| p.addr == addr }
-      return nil
     end
 
     def add_peer(addr)

data/lib/rbkb.rb

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

data/rbkb.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rbkb}
-  s.version = "0.6.8"
+  s.version = "0.6.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Eric Monti"]
-  s.date = %q{2009-06-17}
+  s.date = %q{2009-09-01}
   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"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: emonti-rbkb
 version: !ruby/object:Gem::Version 
-  version: 0.6.8
+  version: 0.6.9
 platform: ruby
 authors: 
 - Eric Monti
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-17 00:00:00 -07:00
+date: 2009-09-01 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency