rbkb 0.7.2 → 0.7.3

data/lib/rbkb/cli/blit.rb

@@ -1,7 +1,7 @@
 require 'rbkb/cli'
 require 'rbkb/plug'
 
-# Copyright 2009 emonti at matasano.com 
+# Copyright 2009 emonti at matasano.com
 # See README.rdoc for license information
 #
 # blit is for use with any of the "plug" tools such as telson, feed, blitplug.
@@ -12,64 +12,63 @@ class Rbkb::Cli::Blit < Rbkb::Cli::Executable
   def initialize(*args)
     super(*args)
     {
-      :b_addr => Plug::Blit::DEFAULT_IPADDR,
-      :b_port => Plug::Blit::DEFAULT_PORT,
-      :bp_proto => :TCP,
-      :b_peeridx => 0,
-    }.each {|k, v| @opts[k] ||= v}
+      b_addr: Plug::Blit::DEFAULT_IPADDR,
+      b_port: Plug::Blit::DEFAULT_PORT,
+      bp_proto: :TCP,
+      b_peeridx: 0
+    }.each { |k, v| @opts[k] ||= v }
   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("-t", "--trans-protocol=PROTO", 
-                 "Blit transport protocol TCP/UDP") do |t|
+    arg.on('-t', '--trans-protocol=PROTO',
+           'Blit transport protocol TCP/UDP') do |t|
       @opts[:b_proto] = t.upcase.to_sym
     end
 
-    arg.on("-S", "--starttls", "Start TLS handshake for the peer index (-i)") do |s|
+    arg.on('-S', '--starttls', 'Start TLS handshake for the peer index (-i)') do |_s|
       @blit_msg = Plug::Blit.make_starttls(@opts[:b_peeridx])
     end
 
-    arg.on("-b", "--blitsrv=ADDR:PORT", 
-           "Where to send blit messages") do |b|
-
-      unless(m=/^(?:([\w\.]+):)?(\d+)$/.match(b))
-        bail "invalid blit address/port"
+    arg.on('-b', '--blitsrv=ADDR:PORT',
+           'Where to send blit messages') do |b|
+      unless (m = /^(?:([\w.]+):)?(\d+)$/.match(b))
+        bail 'invalid blit address/port'
       end
       @opts[:b_port] = m[2].to_i
       @opts[:b_port] = m[1] if m[1]
     end
 
-    arg.on("-i", "--peer-index=IDX", Numeric, 
-           "Index for remote peer to receive") do |i|
+    arg.on('-i', '--peer-index=IDX', Numeric,
+           'Index for remote peer to receive') do |i|
       @opts[:b_peeridx] = i
     end
 
-    arg.on("-l", "--list-peers", "Lists the peer array for the target") do
+    arg.on('-l', '--list-peers', 'Lists the peer array for the target') do
       @blit_msg = Plug::Blit.make_list_peers
     end
 
-    arg.on("-k", "--kill", "Stops the remote event loop.") do
+    arg.on('-k', '--kill', 'Stops the remote event loop.') do
       @blit_msg = Plug::Blit.make_kill
     end
 
-    return arg
+    arg
   end
 
   def parse(*args)
     super(*args)
 
-    unless @blit_msg
-      if @opts[:indat].nil?
-        @opts[:indat] = (@argv.length > 0)?  @argv.join(" ") : @stdin.read()
-      end
-      @blit_msg = Plug::Blit.make_sendmsg(@opts[:b_peeridx], @opts[:indat]) 
+    return if @blit_msg
+
+    if @opts[:indat].nil?
+      @opts[:indat] = @argv.length > 0 ? @argv.join(' ') : @stdin.read
     end
+    @blit_msg = Plug::Blit.make_sendmsg(@opts[:b_peeridx], @opts[:indat])
   end
 
   def go(*args)
@@ -77,17 +76,16 @@ class Rbkb::Cli::Blit < Rbkb::Cli::Executable
 
     begin
       Plug::Blit.blit_init(
-        :addr => @opts[:b_addr],
-        :port => @opts[:b_port],
-        :protocol => @opts[:b_proto]
+        addr: @opts[:b_addr],
+        port: @opts[:b_port],
+        protocol: @opts[:b_proto]
       )
 
       Plug::Blit.blit_raw(@blit_msg)
-    rescue
+    rescue StandardError
       bail($!)
     end
 
     self.exit(0)
   end
-
 end

data/lib/rbkb/cli/chars.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
 #
 # Repeats an argument N times
@@ -21,4 +21,3 @@ class Rbkb::Cli::Chars < Rbkb::Cli::Executable
     self.exit(0)
   end
 end
-

data/lib/rbkb/cli/crc32.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
 #
 # crc32 returns a crc32 checksum in hex from stdin or a file
@@ -11,9 +11,9 @@ class Rbkb::Cli::Crc32 < Rbkb::Cli::Executable
     @opts[:last]  ||= -1
   end
 
-  def make_parser()
+  def make_parser
     arg = super()
-    arg.banner += " [filename]"
+    arg.banner += ' [filename]'
     add_std_file_opt(:indat)
     add_range_opts(:first, :last)
   end
@@ -21,18 +21,16 @@ class Rbkb::Cli::Crc32 < Rbkb::Cli::Executable
   def parse(*args)
     super(*args)
     parse_file_argument(:indat)
-    parse_catchall()
+    parse_catchall
   end
 
   def go(*args)
     super(*args)
-    @opts[:indat] ||= @stdin.read()
+    @opts[:indat] ||= @stdin.read
     dat = opts[:indat].force_to_binary
-    dat = dat[ @opts[:first] .. @opts[:last] ]
-    dat ||= ""
-    @stdout.puts( "%0.8x" % dat.force_to_binary.crc32 )
+    dat = dat[@opts[:first]..@opts[:last]]
+    dat ||= ''
+    @stdout.puts('%0.8x' % dat.force_to_binary.crc32)
     self.exit(0)
   end
 end
-
-

data/lib/rbkb/cli/d64.rb

@@ -1,13 +1,13 @@
 require 'rbkb/cli'
 
-# Copyright 2009 emonti at matasano.com 
+# Copyright 2009 emonti at matasano.com
 # See README.rdoc for license information
 #
 # d64 converts a base-64 encoded string back to its orginal form.
 class Rbkb::Cli::D64 < Rbkb::Cli::Executable
   def make_parser
     super()
-    @oparse.banner += " <data | blank for stdin>"
+    @oparse.banner += ' <data | blank for stdin>'
     add_std_file_opt(:indat)
   end
 
@@ -15,7 +15,7 @@ class Rbkb::Cli::D64 < Rbkb::Cli::Executable
     super(*args)
     parse_string_argument(:indat)
     parse_file_argument(:indat)
-    parse_catchall()
+    parse_catchall
     @opts[:indat] ||= @stdin.read
   end
 
@@ -25,4 +25,3 @@ class Rbkb::Cli::D64 < Rbkb::Cli::Executable
     self.exit(0)
   end
 end
-

data/lib/rbkb/cli/dedump.rb

@@ -1,53 +1,50 @@
 require 'rbkb/cli'
 require 'rbkb/extends'
 
-# Copyright 2009 emonti at matasano.com 
+# Copyright 2009 emonti at matasano.com
 # See README.rdoc for license information
 #
-# Reverses a hexdump back to raw data. Designed to work with hexdumps created 
+# Reverses a hexdump back to raw data. Designed to work with hexdumps created
 # by Unix utilities like 'xxd' as well as 'hexdump -C'.
 class Rbkb::Cli::Dedump < Rbkb::Cli::Executable
   def initialize(*args)
-    super(*args) {|this|
+    super(*args) do |this|
       this.opts[:len] ||= 16
       yield this if block_given?
-    }
+    end
   end
 
-  def make_parser()
+  def make_parser
     arg = super()
-    arg.banner += " <input-file | blank for stdin>"
+    arg.banner += ' <input-file | blank for stdin>'
 
-    arg.on("-l", "--length LEN", Numeric, 
-      "Bytes per line in hexdump (Default: #{@opts[:len]})") do |l|
-        bail("Length must be greater than zero") unless (@opts[:len] = l) > 0
+    arg.on('-l', '--length LEN', Numeric,
+           "Bytes per line in hexdump (Default: #{@opts[:len]})") do |l|
+      bail('Length must be greater than zero') unless (@opts[:len] = l) > 0
     end
-    return arg
+    arg
   end
 
   def parse(*args)
     super(*args)
     parse_file_argument(:indat)
-    parse_catchall()
+    parse_catchall
   end
 
   def go(*args)
     super(*args)
 
     # Default to standard input
-    @opts[:indat] ||= @stdin.read() 
+    @opts[:indat] ||= @stdin.read
 
-    self.exit(1) unless((@opts[:len] ||= @opts[:indat].length) > 0)
+    self.exit(1) unless (@opts[:len] ||= @opts[:indat].length) > 0
 
     begin
-      @opts[:indat].dehexdump( :len => @opts[:len], :out => @stdout)
-    rescue
+      @opts[:indat].dehexdump(len: @opts[:len], out: @stdout)
+    rescue StandardError
       bail "Error: #{$!}"
     end
 
     self.exit(0)
   end
 end
-
-
-

data/lib/rbkb/cli/feed.rb

@@ -7,10 +7,10 @@ require 'eventmachine'
 # See README.rdoc for license information
 #
 # This is a plug-board message feeder from static data sources.
-# The "feed" handles messages opaquely and just plays them in the given 
+# The "feed" handles messages opaquely and just plays them in the given
 # sequence.
 #
-# Feed can do the following things with minimum fuss: 
+# Feed can do the following things with minimum fuss:
 #   - Import messages from files, yaml, or pcap
 #   - Inject custom/modified messages with "blit"
 #   - Run as a server or client using UDP or TCP
@@ -29,7 +29,7 @@ require 'eventmachine'
 
 class Rbkb::Cli::Feed < Rbkb::Cli::Executable
   def initialize(*args)
-    @local_addr = "0.0.0.0"
+    @local_addr = '0.0.0.0'
     @local_port = nil
     @listen = false
     @persist = false
@@ -39,108 +39,106 @@ class Rbkb::Cli::Feed < Rbkb::Cli::Executable
     @blit_addr = Plug::Blit::DEFAULT_IPADDR
     @blit_port = Plug::Blit::DEFAULT_PORT
 
-
     ## Default options sent to the Feed handler
-    @feed_opts = { 
-      :close_at_end => false,
-      :step => false,
-      :go_first => false
+    @feed_opts = {
+      close_at_end: false,
+      step: false,
+      go_first: false
     }
 
     super(*args)
 
-    # TODO Plug::UI obviously need fixing. 
+    # TODO: Plug::UI obviously need fixing.
     # TODO It shouldn't be driven by constants for configuration
     Plug::UI::LOGCFG[:verbose] = true
     Plug::UI::LOGCFG[:dump] = :hex
     Plug::UI::LOGCFG[:out] = @stderr
   end
 
-  def make_parser()
+  def make_parser
     arg = super()
-    arg.banner += " host:port"
+    arg.banner += ' host:port'
 
-    arg.on("-o", "--output=FILE", "Output to file") do |o|
-      Plug::UI::LOGCFG[:out] = File.open(o, "w")
+    arg.on('-o', '--output=FILE', 'Output to file') do |o|
+      Plug::UI::LOGCFG[:out] = File.open(o, 'w')
     end
 
-    arg.on("-l", "--listen=(ADDR:?)PORT", "Server - on port (and addr?)") do |p|
-      if m=/^(?:([\w\._-]+):)?(\d+)$/.match(p)
-        @local_addr = $1 if $1
-        @local_port = $2.to_i
-        @listen = true
-      else
-        raise "Invalid listen argument: #{p.inspect}"
-      end
+    arg.on('-l', '--listen=(ADDR:?)PORT', 'Server - on port (and addr?)') do |p|
+      raise "Invalid listen argument: #{p.inspect}" unless /^(?:([\w._-]+):)?(\d+)$/.match(p)
+
+      @local_addr = ::Regexp.last_match(1) if ::Regexp.last_match(1)
+      @local_port = ::Regexp.last_match(2).to_i
+      @listen = 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
 
-    arg.on("-b", "--blit=(ADDR:)?PORT", "Where to listen for blit") do |b|
+    arg.on('-b', '--blit=(ADDR:)?PORT', 'Where to listen for blit') do |b|
       puts b
-      unless(m=/^(?:([\w\._-]+):)?(\d+)$/.match(b))
+      unless (m = /^(?:([\w._-]+):)?(\d+)$/.match(b))
         raise "Invalid blit argument: #{b.inspect}"
       end
+
       @blit_port = m[2].to_i
       @blit_addr = m[1] if m[1]
     end
 
-    arg.on("-i", "--[no-]initiate", "Send the first message on connect") do |i|
+    arg.on('-i', '--[no-]initiate', 'Send the first message on connect') do |i|
       @feed_opts[:go_first] = i
     end
 
-    arg.on("-e", "--[no-]end", "End connection when feed is exhausted") do |c|
+    arg.on('-e', '--[no-]end', 'End connection when feed is exhausted') do |c|
       @feed_opts[:close_at_end] = c
     end
-     
-    arg.on("--[no-]step", "'Continue' prompt between messages") do |s|
+
+    arg.on('--[no-]step', "'Continue' prompt between messages") do |s|
       @feed_opts[:step] = s
     end
 
-    arg.on("-u", "--udp", "Use UDP instead of TCP" ) do
+    arg.on('-u', '--udp', 'Use UDP instead of TCP') do
       @transport = :UDP
     end
 
-    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("-q", "--quiet", "Suppress verbose messages/dumps") do
+    arg.on('-q', '--quiet', 'Suppress verbose messages/dumps') do
       Plug::UI::LOGCFG[:verbose] = false
     end
 
-    arg.on("-Q", "--squelch-exhausted", "Squelch 'FEED EXHAUSTED' messages") do |s|
+    arg.on('-Q', '--squelch-exhausted', "Squelch 'FEED EXHAUSTED' messages") do |_s|
       @feed_opts[:squelch_exhausted] = true
     end
 
-    arg.separator  "  Sources: (can be combined)"
+    arg.separator '  Sources: (can be combined)'
 
-    arg.on("-f", "--from-files=GLOB", "Import messages from raw files") do |f|
+    arg.on('-f', '--from-files=GLOB', 'Import messages from raw files') do |f|
       @feed_opts[:feed] ||= []
       @feed_opts[:feed] += FeedImport.import_rawfiles(f)
     end
 
-    arg.on("-x", "--from-hex=FILE", "Import messages from hexdumps") do |x|
+    arg.on('-x', '--from-hex=FILE', 'Import messages from hexdumps') do |x|
       @feed_opts[:feed] ||= []
       @feed_opts[:feed] += FeedImport.import_dump(x)
     end
 
-    arg.on("-y", "--from-yaml=FILE", "Import messages from yaml") do |y|
+    arg.on('-y', '--from-yaml=FILE', 'Import messages from yaml') do |y|
       @feed_opts[:feed] ||= []
       @feed_opts[:feed] += FeedImport.import_yaml(y)
     end
 
-    arg.on("-p", "--from-pcap=FILE[:FILTER]", "Import messages from pcap") do |p|
+    arg.on('-p', '--from-pcap=FILE[:FILTER]', 'Import messages from pcap') do |p|
       if /^([^:]+):(.+)$/.match(p)
-        file = $1
-        filter = $2
+        file = ::Regexp.last_match(1)
+        filter = ::Regexp.last_match(2)
       else
         file = p
         filter = nil
@@ -154,9 +152,7 @@ class Rbkb::Cli::Feed < Rbkb::Cli::Executable
   def parse(*args)
     super(*args)
 
-    if @transport == :UDP
-      @svr_method = @cli_method = :open_datagram_socket
-    end
+    @svr_method = @cli_method = :open_datagram_socket if @transport == :UDP
 
     @local_port ||= 0
     # Prepare EventMachine arguments based on whether we are a client or server
@@ -168,18 +164,18 @@ class Rbkb::Cli::Feed < Rbkb::Cli::Executable
     else # client
 
       ## Get target/listen argument for client mode
-      unless (m = /^([\w\.]+):(\d+)$/.match(tgt=@argv.shift))
+      unless (m = /^([\w.]+):(\d+)$/.match(tgt = @argv.shift))
         bail_args tgt
       end
 
       @target_addr = m[1]
       @target_port = m[2].to_i
 
-      if @transport == :UDP
-        addr_args = [@local_addr, @local_port]
-      else
-        addr_args = [@local_addr, @local_port, @target_addr, @target_port]
-      end
+      addr_args = if @transport == :UDP
+                    [@local_addr, @local_port]
+                  else
+                    [@local_addr, @local_port, @target_addr, @target_port]
+                  end
 
       @meth = @cli_method
       @feed_opts[:kind] = :client
@@ -187,18 +183,17 @@ class Rbkb::Cli::Feed < Rbkb::Cli::Executable
 
     @feed_opts[:feed] ||= []
 
-    @em_args=[ 
-      @meth, 
+    @em_args = [
+      @meth,
       addr_args,
-      Plug::ArrayFeeder, 
-      @transport, 
+      Plug::ArrayFeeder,
+      @transport,
       @feed_opts
     ].flatten
 
-    parse_catchall()
+    parse_catchall
   end
 
-
   def go(*args)
     super(*args)
 
@@ -206,13 +201,13 @@ class Rbkb::Cli::Feed < Rbkb::Cli::Executable
 
     ## Start the eventmachine
     loop do
-      EventMachine::run do
+      EventMachine.run do
         EventMachine.send(*@em_args) do |c|
           EventMachine.start_server(@blit_addr, @blit_port, Plug::Blit, :TCP, c)
-          Plug::UI::verbose("** BLITSRV-#{@blit_addr}:#{@blit_port}(TCP) Started")
+          Plug::UI.verbose("** BLITSRV-#{@blit_addr}:#{@blit_port}(TCP) Started")
 
           # if this is a UDP client, we will always send the first message
-          if [:UDP, :client] == [@transport, c.kind]
+          if %i[UDP client] == [@transport, c.kind]
             peer = c.peers.add_peer_manually(@target_addr, @target_port)
             c.feed_data(peer)
             c.go_first = false
@@ -221,9 +216,8 @@ class Rbkb::Cli::Feed < Rbkb::Cli::Executable
       end
 
       break unless @persist
-      Plug::UI::verbose("** RECONNECTING")
-    end
 
+      Plug::UI.verbose('** RECONNECTING')
+    end
   end
 end
-

data/lib/rbkb/cli/hexify.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
 #
-# The hexify command converts a string or raw data to hex characters. 
+# The hexify command converts a string or raw data to hex characters.
 # Input can be supplied via stdin, a string argument, or a file (with -f).
 class Rbkb::Cli::Hexify < Rbkb::Cli::Executable
   def make_parser
@@ -12,21 +12,21 @@ class Rbkb::Cli::Hexify < Rbkb::Cli::Executable
     arg = @oparse
 
     # Add local options
-    arg.banner += " <data | blank for stdin>"
+    arg.banner += ' <data | blank for stdin>'
 
-    arg.on("-l", "--length LEN", Numeric, "Output lines of LEN bytes") do |l|
+    arg.on('-l', '--length LEN', Numeric, 'Output lines of LEN bytes') do |l|
       @opts[:len] = l
     end
 
-    arg.on("-d", "--delim=DELIMITER", "DELIMITER between each byte") do |d|
+    arg.on('-d', '--delim=DELIMITER', 'DELIMITER between each byte') do |d|
       @opts[:delim] = d
     end
 
-    arg.on("-p", "--prefix=PREFIX", "PREFIX before each byte") do |p|
+    arg.on('-p', '--prefix=PREFIX', 'PREFIX before each byte') do |p|
       @opts[:prefix] = p
     end
 
-    arg.on("-s", "--suffix=SUFFIX", "SUFFIX after each byte") do |s|
+    arg.on('-s', '--suffix=SUFFIX', 'SUFFIX after each byte') do |s|
       @opts[:suffix] = s
     end
   end
@@ -35,31 +35,30 @@ class Rbkb::Cli::Hexify < Rbkb::Cli::Executable
     super(*args)
 
     # blackbag-style space delimiter compatability
-    if @argv[0] == "+" and @opts[:delim].nil?
-      @opts[:delim]=" "
+    if @argv[0] == '+' and @opts[:delim].nil?
+      @opts[:delim] = ' '
       @argv.shift
     end
 
     parse_string_argument(:indat)
-    parse_catchall()
+    parse_catchall
   end
 
   def go(*args)
     super(*args)
 
     # Default to standard input
-    @opts[:indat] ||= @stdin.read() 
+    @opts[:indat] ||= @stdin.read
 
     indat = @opts.delete(:indat)
-    len = (@opts.delete(:len) || indat.length)
+    len = @opts.delete(:len) || indat.length
 
-    bail("Length must be greater than zero") unless(len > 0)
+    bail('Length must be greater than zero') unless len > 0
 
-    until (m = indat.slice!(0..len-1)).empty?
+    until (m = indat.slice!(0..len - 1)).empty?
       @stdout << m.hexify(@opts)
-      @stdout.puts((opts[:delim] and ! indat.empty?)? opts[:delim] : "\n")
+      @stdout.puts((opts[:delim] and !indat.empty?) ? opts[:delim] : "\n")
     end
     self.exit(0)
   end
 end
-