rbkb 0.7.2 → 0.7.3

data/lib/rbkb/cli/len.rb

@@ -1,69 +1,63 @@
 require 'rbkb/cli'
 
-# Copyright 2009 emonti at matasano.com 
+# Copyright 2009 emonti at matasano.com
 # See README.rdoc for license information
 
 # len prepends a binary length number in front of its input and outputs
 # raw on STDOUT
 class Rbkb::Cli::Len < Rbkb::Cli::Executable
-
   def initialize(*args)
     # endianness pair. index 0 is always the default
-    @endpair = [:big, :little]
+    @endpair = %i[big little]
 
     super(*args) do |this|
       {
-        :nudge => 0, 
-        :size => 4, 
-        :endian => @endpair[0],
-      }.each {|k,v| this.opts[k] ||= v}
+        nudge: 0,
+        size: 4,
+        endian: @endpair[0]
+      }.each { |k, v| this.opts[k] ||= v }
 
       yield this if block_given?
     end
   end
 
-  def make_parser()
+  def make_parser
     super()
     add_std_file_opt(:indat)
     arg = @oparse
-    arg.banner += " <data | blank for stdin>"
+    arg.banner += ' <data | blank for stdin>'
 
-    arg.on("-n", "--nudge INT", Numeric, "Add integer to length") do |n|
+    arg.on('-n', '--nudge INT', Numeric, 'Add integer to length') do |n|
       @opts[:nudge] += n
     end
 
-    arg.on("-s", "--size=SIZE", Numeric, 
-           "Size of length field in bytes") do |s|
-      bail("Size must be greater than 0") unless (@opts[:size] = s) > 0
+    arg.on('-s', '--size=SIZE', Numeric, 'Size of length field in bytes') do |s|
+      bail('Size must be greater than 0') unless (@opts[:size] = s) > 0
     end
 
-    arg.on("-x", "--[no-]swap", 
-           "Swap endianness. Default=#{@opts[:endian]}") do |x|
-      @opts[:endian] = @endpair[(x)? 1 : 0]
+    arg.on('-x', '--[no-]swap', "Swap endianness. Default=#{@opts[:endian]}") do |x|
+      @opts[:endian] = @endpair[x ? 1 : 0]
     end
 
-    arg.on("-t", "--[no-]total", "Include size word in size") do |t|
-      @opts[:tot]=t
+    arg.on('-t', '--[no-]total', 'Include size word in size') do |t|
+      @opts[:tot] = t
     end
 
-    arg.on("-l", "--length=LEN", Numeric, 
-           "Ignore all other flags and use static LEN") do |l|
-      @opts[:static]=l
+    arg.on('-l', '--length=LEN', Numeric, 'Ignore all other flags and use static LEN') do |l|
+      @opts[:static] = l
     end
   end
 
-
   def parse(*args)
     super(*args)
     @opts[:indat] ||= @argv.shift
-    parse_catchall()
+    parse_catchall
     @opts[:indat] ||= @stdin.read
   end
 
-
   def go(*args)
     super(*args)
-    unless len=@opts[:static]
+    unless len = @opts[:static]
       len = @opts[:indat].size
       len += @opts[:size] if @opts[:tot]
       len += @opts[:nudge]
@@ -71,6 +65,4 @@ class Rbkb::Cli::Len < Rbkb::Cli::Executable
     @stdout << len.to_bytes(@opts[:endian], @opts[:size]) << @opts[:indat]
     self.exit(0)
   end
-
 end
-

data/lib/rbkb/cli/rstrings.rb

@@ -1,6 +1,6 @@
 require 'rbkb/cli'
 
-# Copyright 2009 emonti at matasano.com 
+# Copyright 2009 emonti at matasano.com
 # See README.rdoc for license information
 #
 # rstrings is Unix "strings" in ruby... with some extra stuff
@@ -8,64 +8,64 @@ class Rbkb::Cli::Rstrings < Rbkb::Cli::Executable
   def initialize(*args)
     super(*args) do |this|
       {
-        :start_off => 0, 
-        :end_off => -1, 
-        :encoding => :both, 
-        :minimum => 6,
-        :indat => Array.new,
-        :fnames => Array.new,
-      }.each {|k,v| this.opts[k] ||= v }
+        start_off: 0,
+        end_off: -1,
+        encoding: :both,
+        minimum: 6,
+        indat: [],
+        fnames: []
+      }.each { |k, v| this.opts[k] ||= v }
 
       yield this if block_given?
     end
   end
 
-  def make_parser()
+  def make_parser
     arg = super()
-    arg.banner += " <file ... || blank for stdin>"
+    arg.banner += ' <file ... || blank for stdin>'
 
-    arg.on("-s", "--start=OFFSET", "Start at offset") do |s|
-      unless m=/^(?:(\d+)|0x([A-Fa-f0-9]+))$/.match(s)
+    arg.on('-s', '--start=OFFSET', 'Start at offset') do |s|
+      unless m = /^(?:(\d+)|0x([A-Fa-f0-9]+))$/.match(s)
         bail "invalid offset '#{s}'"
       end
-      @opts[:start_off] = (m[2])? m[0].hex : m[0].to_i
+      @opts[:start_off] = m[2] ? m[0].hex : m[0].to_i
     end
 
-    arg.on("-e", "--end=OFFSET", "End at offset") do |e|
-      unless m=/^(?:(\d+)|0x([A-Fa-f0-9]+))$/.match(e)
+    arg.on('-e', '--end=OFFSET', 'End at offset') do |e|
+      unless m = /^(?:(\d+)|0x([A-Fa-f0-9]+))$/.match(e)
         bail "invalid offset '#{e}'"
       end
-      @opts[:end_off] = (m[2])? m[0].hex : m[0].to_i
+      @opts[:end_off] = m[2] ? m[0].hex : m[0].to_i
     end
 
-    arg.on("-t", "--encoding-type=TYPE", 
-      "Encoding: ascii/unicode/both (default=#{@opts[:encoding]})") do |t|
-        @opts[:encoding] = t.to_sym
+    arg.on('-t', '--encoding-type=TYPE',
+           "Encoding: ascii/unicode/both (default=#{@opts[:encoding]})") do |t|
+      @opts[:encoding] = t.to_sym
     end
 
-    arg.on("-l", "--min-length=NUM", Numeric,
-      "Minimum length of strings (default=#{@opts[:minimum]})") do |l|
-        @opts[:minimum] = l
+    arg.on('-l', '--min-length=NUM', Numeric,
+           "Minimum length of strings (default=#{@opts[:minimum]})") do |l|
+      @opts[:minimum] = l
     end
 
-    return arg
+    arg
   end
 
   def parse(*args)
     super(*args)
-    if @opts[:indat].empty? and not @argv.empty?
-      while a=@argv.shift
+    if @opts[:indat].empty? and !@argv.empty?
+      while a = @argv.shift
         @opts[:indat] << do_file_read(a)
         @opts[:fnames] << a
       end
     end
 
-    parse_catchall()
+    parse_catchall
 
-    if @opts[:indat].empty?
-      @opts[:indat] << @stdin.read() if @opts[:indat].empty?
-      @opts[:fnames] << "[STDIN]"
-    end
+    return unless @opts[:indat].empty?
+
+    @opts[:indat] << @stdin.read if @opts[:indat].empty?
+    @opts[:fnames] << '[STDIN]'
   end
 
   def go(*args)
@@ -77,26 +77,23 @@ class Rbkb::Cli::Rstrings < Rbkb::Cli::Executable
     min  = @opts[:minimum]
     align = @opts[:align]
 
-    @opts[:pr_fnames]=true if @opts[:fnames].size > 1
+    @opts[:pr_fnames] = true if @opts[:fnames].size > 1
 
-    i=0
-    while buf=@opts[:indat].shift
+    i = 0
+    while buf = @opts[:indat].shift
       buf[start_off..end_off].strings(
-        :encoding => enc,
-        :minimum => min,
-        :align => align
+        encoding: enc,
+        minimum: min,
+        align: align
       ) do |off, len, type, str|
-        if @opts[:pr_fnames]
-          @stdout << "#{@opts[:fnames][i]}:"
-        end
-        @stdout << "#{(off+start_off).to_hex.rjust(8,"0")}:"+
-                   "#{(len+start_off).to_hex.rjust(8,"0")}:"+
-                   "#{type.to_s[0,1]}:#{str.delete("\x00").inspect}\n"
+        @stdout << "#{@opts[:fnames][i]}:" if @opts[:pr_fnames]
+        @stdout << "#{(off + start_off).to_hex.rjust(8, '0')}:" +
+                   "#{(len + start_off).to_hex.rjust(8, '0')}:" +
+                   "#{type.to_s[0, 1]}:#{str.delete("\x00").inspect}\n"
       end
-      i+=1
+      i += 1
     end
 
     self.exit(0)
   end
 end
-

data/lib/rbkb/cli/slice.rb

@@ -1,47 +1,40 @@
 require 'rbkb/cli'
 
-# Copyright 2009 emonti at matasano.com 
+# Copyright 2009 emonti at matasano.com
 # See README.rdoc for license information
 #
-# Returns a slice from input. This is just a shell interface to a String.slice 
+# Returns a slice from input. This is just a shell interface to a String.slice
 # operation.
 class Rbkb::Cli::Slice < Rbkb::Cli::Executable
-
   def initialize(*args)
     super(*args)
     @opts[:last] ||= -1
   end
 
-  def make_parser()
+  def make_parser
     super()
     add_std_file_opt(:indat)
     add_range_opts(:first, :last)
     arg = @oparse
 
-    arg.banner += " start (no args when using -r or -x)"
+    arg.banner += ' start (no args when using -r or -x)'
   end
 
-
   def parse(*args)
     super(*args)
     @opts[:first] ||= @argv.shift
 
-    unless(Numeric === @opts[:first] or /^-?\d+$/.match(@opts[:first]) )
-      bail_args "invalid start length"
-    end
+    bail_args 'invalid start length' unless @opts[:first].is_a?(Numeric) or /^-?\d+$/.match(@opts[:first])
 
-    parse_catchall()
+    parse_catchall
 
     @opts[:first] = @opts[:first].to_i
-    @opts[:indat] ||= @stdin.read()
+    @opts[:indat] ||= @stdin.read
   end
 
-
   def go(*args)
     super(*args)
-    @stdout << @opts[:indat][ @opts[:first] .. @opts[:last] ]
+    @stdout << @opts[:indat][ @opts[:first]..@opts[:last] ]
     self.exit(0)
   end
-
 end
-

data/lib/rbkb/cli/telson.rb

@@ -1,87 +1,83 @@
 require 'rbkb/plug/cli'
 
-# Copyright 2009 emonti at matasano.com 
+# Copyright 2009 emonti at matasano.com
 # See README.rdoc for license information
 #
-# This is an implementation of the original blackbag "telson" around 
-# ruby and eventmachine. 
+# This is an implementation of the original blackbag "telson" around
+# ruby and eventmachine.
 #
-# Telson can do the following things with minimum fuss: 
+# Telson can do the following things with minimum fuss:
 #   - Run as a "stubbed" network client using UDP or TCP
 #   - Debugging network protocols
 #   - Observe client/server behaviors using different messages at
 #     various phases of a conversation.
 #
 class Rbkb::Cli::Telson < Rbkb::Cli::PlugCli
-
   def initialize(*args)
     super(*args) do |this|
-      this.local_addr = "0.0.0.0"
+      this.local_addr = '0.0.0.0'
       this.local_port = 0
     end
 
     @persist = false
   end
 
-
-  def make_parser()
+  def make_parser
     arg = super()
 
-    arg.on("-r", "--reconnect", "Attempt to reconnect endlessly.") do
-      @persist=true
+    arg.on('-r', '--reconnect', 'Attempt to reconnect endlessly.') do
+      @persist = true
     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
+    arg.on('-s', '--source=(ADDR:?)PORT', 'Bind client on port and addr') do |p|
+      if /^(?:([\w.]+):)?(\d+)$/.match(p)
+        @local_addr = ::Regexp.last_match(1) if ::Regexp.last_match(1)
+        @local_port = ::Regexp.last_match(2).to_i
       else
         bail("Invalid source argument: #{p.inspect}")
       end
     end
   end
 
-
   def parse(*args)
     super(*args)
 
-    parse_target_argument()
-    parse_catchall()
+    parse_target_argument
+    parse_catchall
   end
 
-
   def go(*args)
     super(*args)
     loop do
-      EventMachine.run {
+      EventMachine.run do
         if @transport == :TCP
 
-          c=EventMachine.bind_connect( @local_addr,
-                                       @local_port,
-                                       @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"
+          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
-      }
+        Plug::UI.verbose("** BLITSRV-#{@blit_addr}:#{@blit_port}(TCP) Started") # XXX
+      end
       break unless @persist
-      Plug::UI::verbose("** RECONNECTING") # XXX
+
+      Plug::UI.verbose('** RECONNECTING') # XXX
     end
   end
 end
-

data/lib/rbkb/cli/unhexify.rb

@@ -1,9 +1,9 @@
 require 'rbkb/cli'
 
-# Copyright 2009 emonti at matasano.com 
+# Copyright 2009 emonti at matasano.com
 # See README.rdoc for license information
 #
-# unhexify converts a string of hex bytes back to raw data. Input can be 
+# unhexify converts a string of hex bytes back to raw data. Input can be
 # supplied via stdin, a hex-string argument, or a file containing hex (use -f).
 class Rbkb::Cli::Unhexify < Rbkb::Cli::Executable
   def make_parser
@@ -13,11 +13,11 @@ class Rbkb::Cli::Unhexify < Rbkb::Cli::Executable
 
     #----------------------------------------------------------------------
     # Add local options
-    arg.banner += " <data | blank for stdin>"
+    arg.banner += ' <data | blank for stdin>'
 
-    arg.on("-d", "--delim DELIMITER", 
-           "DELIMITER regex between hex chunks") do |d|
-        @opts[:delim] = Regexp.new(d.gsub('\\\\', '\\'))
+    arg.on('-d', '--delim DELIMITER',
+           'DELIMITER regex between hex chunks') do |d|
+      @opts[:delim] = Regexp.new(d.gsub('\\\\', '\\'))
     end
   end
 
@@ -25,19 +25,19 @@ class Rbkb::Cli::Unhexify < Rbkb::Cli::Executable
     super(*args)
 
     # default string arg
-    if @opts[:indat].nil? and a=@argv.shift
-      @opts[:indat] = a.dup 
+    if @opts[:indat].nil? and a = @argv.shift
+      @opts[:indat] = a.dup
     end
 
     # catchall
-    bail_args @argv.join(' ') if ARGV.length != 0 
+    bail_args @argv.join(' ') if ARGV.length != 0
   end
 
   def go(*args)
     super(*args)
 
     # Default to standard input
-    @opts[:indat] ||= @stdin.read() 
+    @opts[:indat] ||= @stdin.read
 
     @opts[:indat].delete!("\r\n")
     @opts[:delim] ||= Regexp.new('\s*')
@@ -47,4 +47,3 @@ class Rbkb::Cli::Unhexify < Rbkb::Cli::Executable
     self.exit(0)
   end
 end
-

data/lib/rbkb/cli/urldec.rb

@@ -1,35 +1,34 @@
 require 'rbkb/cli'
 
-# Copyright 2009 emonti at matasano.com 
+# Copyright 2009 emonti at matasano.com
 # See README.rdoc for license information
 #
 # urldec converts a url percent-encoded string back to its raw form.
 # Input can be supplied via stdin, a string argument, or a file (with -f).
 # (url percent-encoding is just fancy hex encoding)
 class Rbkb::Cli::Urldec < Rbkb::Cli::Executable
-  def make_parser()
+  def make_parser
     super()
     add_std_file_opt(:indat)
     arg = @oparse
-    arg.banner += " <data | blank for stdin>"
+    arg.banner += ' <data | blank for stdin>'
 
-    arg.on("-p", "--[no-]plus", "Convert '+' to space (default: true)") do |p|
-      @opts[:noplus] = (not p)
+    arg.on('-p', '--[no-]plus', "Convert '+' to space (default: true)") do |p|
+      @opts[:noplus] = !p
     end
   end
 
   def parse(*args)
     super(*args)
     parse_string_argument(:indat)
-    parse_catchall()
+    parse_catchall
   end
 
   def go(*args)
     super(*args)
     # Default to standard input
-    @opts[:indat] ||= @stdin.read()
-    @stdout << @opts[:indat].urldec(:noplus => @opts[:noplus])
+    @opts[:indat] ||= @stdin.read
+    @stdout << @opts[:indat].urldec(noplus: @opts[:noplus])
     self.exit(0)
   end
 end
-

data/lib/rbkb/cli/urlenc.rb

@@ -1,19 +1,19 @@
 require 'rbkb/cli'
 
-# Copyright 2009 emonti at matasano.com 
+# Copyright 2009 emonti at matasano.com
 # See README.rdoc for license information
 #
-# urlenc converts a string or raw data to a url percent-encoded string 
+# urlenc converts a string or raw data to a url percent-encoded string
 # Input can be supplied via stdin, a string argument, or a file (with -f).
 # (url percent-encoding is just fancy hex encoding)
 class Rbkb::Cli::Urlenc < Rbkb::Cli::Executable
-  def make_parser()
+  def make_parser
     super()
     add_std_file_opt(:indat)
     arg = @oparse
-    arg.banner += " <data | blank for stdin>"
+    arg.banner += ' <data | blank for stdin>'
 
-    arg.on("-p", "--[no-]plus", 
+    arg.on('-p', '--[no-]plus',
            "Convert spaces to '+' (default: false)") do |p|
       @opts[:plus] = p
     end
@@ -22,14 +22,14 @@ class Rbkb::Cli::Urlenc < Rbkb::Cli::Executable
   def parse(*args)
     super(*args)
     parse_string_argument(:indat)
-    parse_catchall()
+    parse_catchall
   end
 
   def go(*args)
     super(*args)
     # Default to standard input
-    @opts[:indat] ||= @stdin.read()
-    @stdout << @opts[:indat].urlenc(:plus => @opts[:plus]) + "\n"
+    @opts[:indat] ||= @stdin.read
+    @stdout << @opts[:indat].urlenc(plus: @opts[:plus]) + "\n"
     self.exit(0)
   end
 end

data/lib/rbkb/cli/xor.rb

@@ -1,36 +1,36 @@
 #!/usr/bin/env ruby
 require 'rbkb/cli'
 
-# Copyright 2009 emonti at matasano.com 
+# Copyright 2009 emonti at matasano.com
 # See README.rdoc for license information
 #
 # Repeating string xor. Takes input from a string, stdin, or a file (-f).
 class Rbkb::Cli::Xor < Rbkb::Cli::Executable
-  def make_parser()
+  def make_parser
     super()
     add_std_file_opt(:indat)
     arg = @oparse
-    arg.banner += " -k|-s <key> <data | stdin>"
+    arg.banner += ' -k|-s <key> <data | stdin>'
 
-    arg.separator "  Key options (you must specify one of the following):"
-    arg.on("-s", "--strkey STRING", "xor against STRING")  do |s|
-        bail "only one key option can be specified with -s or -x" if @opts[:key]
-        @opts[:key] = s
+    arg.separator '  Key options (you must specify one of the following):'
+    arg.on('-s', '--strkey STRING', 'xor against STRING') do |s|
+      bail 'only one key option can be specified with -s or -x' if @opts[:key]
+      @opts[:key] = s
     end
 
-    arg.on("-x", "--hexkey HEXSTR", "xor against binary HEXSTR") do |x|
-        bail "only one key option can be specified with -s or -x" if @opts[:key]
-        x.sub!(/^0[xX]/, '')
-        bail "Unable to parse hex string" unless @opts[:key] = x.unhexify
+    arg.on('-x', '--hexkey HEXSTR', 'xor against binary HEXSTR') do |x|
+      bail 'only one key option can be specified with -s or -x' if @opts[:key]
+      x.sub!(/^0[xX]/, '')
+      bail 'Unable to parse hex string' unless @opts[:key] = x.unhexify
     end
-    return arg
+    arg
   end
 
   def parse(*args)
     super(*args)
     bail("You must specify a key with -s or -x\n#{@oparse}") unless @opts[:key]
     parse_string_argument(:indat)
-    parse_catchall()
+    parse_catchall
   end
 
   def go(*args)
@@ -40,4 +40,3 @@ class Rbkb::Cli::Xor < Rbkb::Cli::Executable
     self.exit(0)
   end
 end
-