rbkb 0.7.1 → 0.7.3

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MjU3Zjk1NzQ1MTVlYmRiNjJjYzJkYzMyM2VhNmRhMjFjNmYwNjNkNQ==
-  data.tar.gz: !binary |-
-    YjVlMWViMTgzYTBkNmFhZmRiNzM4ZTQyYTAyMGRlZGIwYTRjNGY2NA==
+SHA256:
+  metadata.gz: d5474592bbbae9a55abdca06c58359b376691c0b8880d5ff162f83d343c9d6b3
+  data.tar.gz: 93ccb680fcbb0d6401f2b58293e5613752ecb1bc22cd2f228e8ba8c4c8c99256
 SHA512:
-  metadata.gz: !binary |-
-    ZGEyMWFhYzE0MTNjNDkzZmQxYTBmMTcxMGZkNjFhZjVmMTg1NDU1ZDUxNjk3
-    ODE3OTQ0MzhlMWY3OGZlYWEwODEwNjU5ZDE1MjFmZjAyZjFhNWVkNjJmMjU0
-    ZTU0OTVmYzM4MjY1MWNiYTZkY2E4MDg5ZDg0ZmRjNDcwNmNlMzE=
-  data.tar.gz: !binary |-
-    NmU3MDE1YjRjNTQxZmMyM2Y2YzZlMzRjNjVmZmViNGJjZTJkZDBjZDI3NTBi
-    YzNjYmExMGVkYzMwNmUxNTYyNzk5MTQ1N2Y1MzVmZTI2OTBhMmU3OWFlNjYy
-    ODFmOTFjZWFjYjFjOWU3MzVkZTRkMjc5OTViMmRiZDdiNzAwZjg=
+  metadata.gz: 12a216f76dae5c38aa9f191c05fa4fd206852e87fcbab5a43062d90367d0ab7d59cc642ca278c2964dbabd72a10f3833c76a53e28a267e1b6f4bdcca40603c47
+  data.tar.gz: 85771881d4b58a041b13f58f72854a17a4eeaf6b8c2589988f792978dd3812b2a2556760f07af20119394f90881ad12f97f003f58389dd9abf1d374f72310486

data/.gitignore

@@ -1 +1,2 @@
 pkg/
+**/*.swp

data/Gemfile.lock

@@ -1,27 +1,35 @@
 PATH
   remote: .
   specs:
-    rbkb (0.7.1)
+    rbkb (0.7.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    diff-lcs (1.2.1)
-    rake (10.1.0)
-    rspec (2.13.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.1)
-    rspec-expectations (2.13.0)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.0)
+    diff-lcs (1.6.2)
+    rake (13.3.0)
+    rspec (3.13.1)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.4)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.5)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.5)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.4)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.3)
-  rake
+  bundler
+  rake (~> 13)
   rbkb!
   rspec
+
+BUNDLED WITH
+   2.6.9

data/bin/b64

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
-require "rbkb/cli/b64"
+require 'rbkb/cli/b64'
 
-Rbkb::Cli::B64.run()
+Rbkb::Cli::B64.run

data/bin/bgrep

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
-require "rbkb/cli/bgrep"
+require 'rbkb/cli/bgrep'
 
-Rbkb::Cli::Bgrep.run()
+Rbkb::Cli::Bgrep.run

data/bin/blit

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
-require "rbkb/cli/blit"
+require 'rbkb/cli/blit'
 
-Rbkb::Cli::Blit.run()
+Rbkb::Cli::Blit.run

data/bin/c

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
-require "rbkb/cli/chars"
+require 'rbkb/cli/chars'
 
-Rbkb::Cli::Chars.run()
+Rbkb::Cli::Chars.run

data/bin/crc32

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
-require "rbkb/cli/crc32"
+require 'rbkb/cli/crc32'
 
-Rbkb::Cli::Crc32.run()
+Rbkb::Cli::Crc32.run

data/bin/d64

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
-require "rbkb/cli/d64"
+require 'rbkb/cli/d64'
 
-Rbkb::Cli::D64.run()
+Rbkb::Cli::D64.run

data/bin/dedump

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
-require "rbkb/cli/dedump"
+require 'rbkb/cli/dedump'
 
-Rbkb::Cli::Dedump.run()
+Rbkb::Cli::Dedump.run

data/bin/feed

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
-require "rbkb/cli/feed"
+require 'rbkb/cli/feed'
 
-Rbkb::Cli::Feed.run()
+Rbkb::Cli::Feed.run

data/bin/hexify

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
-require "rbkb/cli/hexify"
+require 'rbkb/cli/hexify'
 
-Rbkb::Cli::Hexify.run()
+Rbkb::Cli::Hexify.run

data/bin/len

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
-require "rbkb/cli/len"
+require 'rbkb/cli/len'
 
-Rbkb::Cli::Len.run()
+Rbkb::Cli::Len.run

data/bin/plugsrv

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# Copyright 2009 emonti at matasano.com 
+# Copyright 2009 emonti at matasano.com
 # See README.rdoc for license information
 #
 # A blit-able reverse TCP proxy. Displays traffic hexdumps. Currently uses
@@ -18,16 +18,17 @@ require 'rbkb/plug'
 
 class BlitPlug
   module UI
-    def log( *msg )
-      unless PLUG_OPTS[:quiet]
-        PLUG_OPTS[:out].puts msg
-      end
+    def log(*msg)
+      return if PLUG_OPTS[:quiet]
+
+      PLUG_OPTS[:out].puts msg
     end
     module_function :log
   end
 
   class Controller
     attr_accessor :tgtaddr, :tgtport, :tgtclient, :blit, :peers
+
     @@controller = nil
 
     def initialize(tgtaddr, tgtport, tgtclient)
@@ -37,28 +38,27 @@ class BlitPlug
 
       @@controller = self
 
-      @peers = Array.new
+      @peers = []
 
       ## Just tack on a blit server???
-      @blit = EventMachine::start_server(
+      @blit = EventMachine.start_server(
         PLUG_OPTS[:blit_addr], PLUG_OPTS[:blit_port], Plug::Blit, :TCP, self
       )
-
     end
 
-    ##----------------------------------------
+    # #----------------------------------------
 
-    def dispatch_rcv(snder, data)
+    def dispatch_rcv(_snder, data)
       data # for now
     end
 
-    ##----------------------------------------
+    # #----------------------------------------
 
-    def dispatch_close(snder)
+    def dispatch_close(_snder)
       nil # for now
     end
 
-    ##----------------------------------------
+    # #----------------------------------------
 
     def self.proxy(cli)
       unless (ctrl = @@controller)
@@ -69,7 +69,7 @@ class BlitPlug
       tgtport = ctrl.tgtport
       tgtclient = ctrl.tgtclient
 
-      srv = EventMachine::connect(tgtaddr, tgtport, tgtclient)
+      srv = EventMachine.connect(tgtaddr, tgtport, tgtclient)
       srv.plug_peers.push cli
       cli.plug_peers.push srv
 
@@ -80,7 +80,6 @@ class BlitPlug
     end
   end # class BlitPlug::Controller
 
-
   module BaseTCP
     include UI
 
@@ -88,48 +87,46 @@ class BlitPlug
     attr_reader :sock_peer, :sock_peername
 
     def post_init
-      @plug_peers = Array.new
-      @kind = :conn  # default
+      @plug_peers = []
+      @kind = :conn # default
     end
- 
+
     def name
       @name
     end
 
     def say(data, sender)
-      log "%#{sender.kind.to_s.upcase}-SAYS", data.hexdump(:out => StringIO.new), "%"
-      send_data data 
+      log "%#{sender.kind.to_s.upcase}-SAYS", data.hexdump(out: StringIO.new), '%'
+      send_data data
     end
 
-    def receive_data data
-      log "%#{kind.to_s.upcase}-#{sock_peername}-SAYS", data.hexdump, "%"
+    def receive_data(data)
+      log "%#{kind.to_s.upcase}-#{sock_peername}-SAYS", data.hexdump, '%'
       if @controller and (data = @controller.dispatch_rcv(self, data)).nil?
         return
       end
-      @plug_peers.each {|p| p.send_data data}
-    end
 
+      @plug_peers.each { |p| p.send_data data }
+    end
 
     def notify_connection
       @name = "#{kind.to_s.upcase}-#{sock_peername}"
       log "%#{@name}-CONNECTED"
     end
 
-
     def unbind
       @name = "#{kind.to_s.upcase}-#{sock_peername}"
       log "%#{@name}-CLOSED"
 
       cret = (@controller and @controller.dispatch_close(self))
 
-      @plug_peers.each do |p| 
+      @plug_peers.each do |p|
         p.plug_peers.delete(self)
         p.close_connection unless cret
       end
     end
   end
 
-
   module TCPListener
     include BlitPlug::BaseTCP
     attr_accessor :tgtaddr, :tgtport
@@ -146,10 +143,8 @@ class BlitPlug
 
       notify_connection
     end
-
   end # module TCPListener
 
-
   module TCPClient
     include BlitPlug::BaseTCP
     attr_accessor :connected
@@ -165,25 +160,21 @@ class BlitPlug
       notify_connection
       start_tls if PLUG_OPTS[:tgt_tls]
     end
-
   end # module TCPClient
-
 end # module BlitPlug
 
-PLUG_OPTS={ 
-  :quiet => false, 
-  :out => STDOUT,
-  :blit_addr => Plug::Blit::DEFAULT_IPADDR, 
-  :blit_port => Plug::Blit::DEFAULT_PORT,
+PLUG_OPTS = {
+  quiet: false,
+  out: STDOUT,
+  blit_addr: Plug::Blit::DEFAULT_IPADDR,
+  blit_port: Plug::Blit::DEFAULT_PORT
 }
 
 def bail(*msg)
-  STDERR.puts msg
+  warn msg
   exit 1
 end
 
-
-
 #############################################################################
 ### MAIN
 #############################################################################
@@ -194,78 +185,77 @@ opts = OptionParser.new do |opts|
                 "  <target:tport>  = the address of the target service\n",
                 "  <@laddr:lport> = optional address and port to listen on\n"
 
-  opts.separator ""
-  opts.separator "Options:"
+  opts.separator ''
+  opts.separator 'Options:'
 
-  opts.on_tail("-h", "--help", "Show this message") do
+  opts.on_tail('-h', '--help', 'Show this message') do
     puts opts
     exit 1
   end
 
-  opts.on("-o", "--output FILE", "send output to a file") do |o|
-    PLUG_OPTS[:out] = File.open(o, "w") rescue (bail $!)
+  opts.on('-o', '--output FILE', 'send output to a file') do |o|
+    PLUG_OPTS[:out] = begin
+      File.open(o, 'w')
+    rescue StandardError
+      (bail $!)
+    end
   end
 
-  opts.on("-l", "--listen ADDR:PORT", 
-          "optional listener address:port", 
-          "(default: 0.0.0.0:<tport>)"
-         ) do |addr|
-
-    unless m = /^([\w\.]+)?(?::(\d+))?$/.match(addr)
-      STDERR.puts "invalid listener address"
+  opts.on('-l', '--listen ADDR:PORT',
+          'optional listener address:port',
+          '(default: 0.0.0.0:<tport>)') do |addr|
+    unless m = /^([\w.]+)?(?::(\d+))?$/.match(addr)
+      warn 'invalid listener address'
       exit 1
     end
     PLUG_OPTS[:svraddr] = m[1]
-    PLUG_OPTS[:svrport] = (m[2])? m[2].to_i : nil
+    PLUG_OPTS[:svrport] = m[2] ? m[2].to_i : nil
   end
 
-  opts.on("-q", "--[no-]quiet", "Suppress/Enable conversation dumps.") do |q|
+  opts.on('-q', '--[no-]quiet', 'Suppress/Enable conversation dumps.') do |q|
     PLUG_OPTS[:quiet] = q
   end
 
-  opts.on("-b", "--blitsrv ADDR:PORT", 
-          "specify blit listener [address:]port", 
-          "(default: #{PLUG_OPTS[:blit_addr]}:#{PLUG_OPTS[:blit_port]})"
-         ) do |addr|
-
-    unless m = /^(?:([\w\.]+):)?(\d+)$/.match(addr)
-      STDERR.puts "invalid blit listener argument"
+  opts.on('-b', '--blitsrv ADDR:PORT',
+          'specify blit listener [address:]port',
+          "(default: #{PLUG_OPTS[:blit_addr]}:#{PLUG_OPTS[:blit_port]})") do |addr|
+    unless m = /^(?:([\w.]+):)?(\d+)$/.match(addr)
+      warn 'invalid blit listener argument'
       exit 1
     end
     PLUG_OPTS[:blit_addr] = m[1] if m[1]
     PLUG_OPTS[:blit_port] = m[2].to_i
   end
 
-  opts.on("--[no-]target-tls", "enable/disable TLS to target") {|t| PLUG_OPTS[:tgt_tls] = t }
-  opts.on("--[no-]server-tls", "enable/disable TLS to clients") {|t| PLUG_OPTS[:svr_tls] = t }
-
+  opts.on('--[no-]target-tls', 'enable/disable TLS to target') { |t| PLUG_OPTS[:tgt_tls] = t }
+  opts.on('--[no-]server-tls', 'enable/disable TLS to clients') { |t| PLUG_OPTS[:svr_tls] = t }
 end
 
-opts.parse!(ARGV) rescue (STDERR.puts $!; exit 1)
-
+begin
+  opts.parse!(ARGV)
+rescue StandardError
+  (warn $!
+   exit 1)
+end
 
 # Get target/listen argument
-rx = /^([\w\.]+):(\d+)(?:@(?:([\w\.]+):)?(\d+))?$/
+rx = /^([\w.]+):(\d+)(?:@(?:([\w.]+):)?(\d+))?$/
 unless (m = rx.match(ARGV.shift)) and ARGV.shift.nil?
-  $stderr.puts opts.banner
+  warn opts.banner
   exit 1
 end
 
 PLUG_OPTS[:tgtaddr] = m[1]
 PLUG_OPTS[:tgtport] = m[2].to_i
-PLUG_OPTS[:svraddr] ||= (m[3] || "0.0.0.0")
+PLUG_OPTS[:svraddr] ||= m[3] || '0.0.0.0'
 PLUG_OPTS[:svrport] ||= (m[4] || PLUG_OPTS[:tgtport]).to_i
 
-
-EventMachine::run {
+EventMachine.run do
   # Instantiate controller
-  ctrl = BlitPlug::Controller.new(PLUG_OPTS[:tgtaddr], PLUG_OPTS[:tgtport], BlitPlug::TCPClient)
+  BlitPlug::Controller.new(PLUG_OPTS[:tgtaddr], PLUG_OPTS[:tgtport], BlitPlug::TCPClient)
 
   # Start event loop
   BlitPlug::UI.log "%Starting TCP PlugServer #{PLUG_OPTS[:svraddr]}:#{PLUG_OPTS[:svrport]} -> #{PLUG_OPTS[:tgtaddr]}:#{PLUG_OPTS[:tgtport]}"
 
-  
-  EventMachine::start_server(PLUG_OPTS[:svraddr], PLUG_OPTS[:svrport], BlitPlug::TCPListener)
-}
-
-
+  EventMachine.start_server(PLUG_OPTS[:svraddr], PLUG_OPTS[:svrport], BlitPlug::TCPListener)
+end

data/bin/rex

@@ -6,5 +6,4 @@
 require 'pp'
 require 'rbkb'
 
-eval ARGV.join(' ');
-
+eval ARGV.join(' ')

data/bin/rstrings

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
-require "rbkb/cli/rstrings"
+require 'rbkb/cli/rstrings'
 
-Rbkb::Cli::Rstrings.run()
+Rbkb::Cli::Rstrings.run

data/bin/slice

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
-require "rbkb/cli/slice"
+require 'rbkb/cli/slice'
 
-Rbkb::Cli::Slice.run()
+Rbkb::Cli::Slice.run

data/bin/telson

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
-require "rbkb/cli/telson"
+require 'rbkb/cli/telson'
 
-Rbkb::Cli::Telson.run()
+Rbkb::Cli::Telson.run

data/bin/unhexify

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
-require "rbkb/cli/unhexify"
+require 'rbkb/cli/unhexify'
 
-Rbkb::Cli::Unhexify.run()
+Rbkb::Cli::Unhexify.run

data/bin/urldec

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
-require "rbkb/cli/urldec"
+require 'rbkb/cli/urldec'
 
-Rbkb::Cli::Urldec.run()
+Rbkb::Cli::Urldec.run

data/bin/urlenc

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
-require "rbkb/cli/urlenc"
+require 'rbkb/cli/urlenc'
 
-Rbkb::Cli::Urlenc.run()
+Rbkb::Cli::Urlenc.run

data/bin/xor

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
-require "rbkb/cli/xor"
+require 'rbkb/cli/xor'
 
-Rbkb::Cli::Xor.run()
+Rbkb::Cli::Xor.run

data/lib/rbkb/cli/b64.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
 #
 # b64 converts strings or raw data to base-64 encoding.
@@ -8,13 +8,13 @@ class Rbkb::Cli::B64 < Rbkb::Cli::Executable
   def make_parser
     super()
     arg = @oparse
-    arg.banner += " <data | blank for stdin>"
+    arg.banner += ' <data | blank for stdin>'
 
     add_std_file_opt(:indat)
 
-    arg.on("-l", "--length LEN", Numeric, "Output LEN chars per line") do |l|
-        bail("length must be > 0") unless l > 0
-        @opts[:len] = l
+    arg.on('-l', '--length LEN', Numeric, 'Output LEN chars per line') do |l|
+      bail('length must be > 0') unless l > 0
+      @opts[:len] = l
     end
   end
 
@@ -22,7 +22,7 @@ class Rbkb::Cli::B64 < Rbkb::Cli::Executable
     super(*args)
     parse_string_argument(:indat)
     parse_file_argument(:indat)
-    parse_catchall()
+    parse_catchall
     @opts[:indat] ||= @stdin.read
   end
 
@@ -32,4 +32,3 @@ class Rbkb::Cli::B64 < Rbkb::Cli::Executable
     self.exit(0)
   end
 end
-

data/lib/rbkb/cli/bgrep.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
 #
 # searches for a binary string in input. string can be provided 'hexified'
@@ -15,37 +15,36 @@ class Rbkb::Cli::Bgrep < Rbkb::Cli::Executable
 
   def make_parser
     arg = super()
-    arg.banner += " <search> <file | blank for stdin>"
+    arg.banner += ' <search> <file | blank for stdin>'
 
-    arg.on("-x", "--[no-]hex", "Search for hex (default: false)") do |x|
+    arg.on('-x', '--[no-]hex', 'Search for hex (default: false)') do |x|
       @opts[:hex] = x
     end
 
-    arg.on("-r", "--[no-]regex", "Search for regex (default: false)") do |r|
+    arg.on('-r', '--[no-]regex', 'Search for regex (default: false)') do |r|
       @opts[:rx] = r
     end
 
-    arg.on("-a", "--align=BYTES", Numeric, 
-           "Only match on alignment boundary") do |a|
+    arg.on('-a', '--align=BYTES', Numeric,
+           'Only match on alignment boundary') do |a|
       @opts[:align] = a
     end
 
-    arg.on("-n", "--[no-]filename", 
+    arg.on('-n', '--[no-]filename',
            "Toggle filenames. (Default: #{@opts[:include_fname]})") do |n|
       @opts[:include_fname] = n
     end
-    return arg
+    arg
   end
 
-
   def parse(*args)
     super(*args)
 
-    bail "need search argument" unless @find = @argv.shift
+    bail 'need search argument' unless @find = @argv.shift
 
-    if @opts[:hex] and @opts[:rx]
-      bail "-r and -x are mutually exclusive"
-    end
+    return unless @opts[:hex] and @opts[:rx]
+
+    bail '-r and -x are mutually exclusive'
 
     # ... filenames vs. stdin will be parsed in 'go'
   end
@@ -67,17 +66,17 @@ class Rbkb::Cli::Bgrep < Rbkb::Cli::Executable
       dat = @stdin.read
     end
 
-    loop do 
+    loop do
       dat.bgrep(@find, @opts[:align]) do |hit_start, hit_end, match|
         @stdout.write "#{fname}:" if fname and @opts[:include_fname]
 
-        @stdout.write("%0.8x:%0.8x:b:#{match.inspect}\n" %[hit_start, hit_end])
+        @stdout.write(format("%0.8x:%0.8x:b:#{match.inspect}\n", hit_start, hit_end))
       end
 
-      break unless fname=@argv.shift
+      break unless fname = @argv.shift
+
       dat = do_file_read(fname)
     end
     self.exit(0)
   end
 end
-