emonti-rbkb 0.6.1.3 → 0.6.2

data/lib/rbkb/extends.rb

@@ -1,11 +1,10 @@
 # Author Eric Monti (emonti at matasano)
-require "base64"
 require "stringio"
 require 'zlib'
 require 'open3'
 require 'sha1'
 
-module RBkB
+module Rbkb
   DEFAULT_BYTE_ORDER=:big
   HEXCHARS = [("0".."9").to_a, ("a".."f").to_a].flatten
 end
@@ -33,7 +32,6 @@ end if not defined? with
 # Mixins and class-specific items
 
 class String
-
   # shortcut for hex sanity with regex
   def ishex? ; (self =~ /^[a-f0-9]+$/i)? true : false ; end 
 
@@ -44,7 +42,7 @@ class String
     unless (opts[:rx] ||= /[^A-Za-z0-9_\.~-]/).kind_of? Regexp
       raise "rx must be a regular expression for a character class"
     end
-    hx = RBkB::HEXCHARS
+    hx = Rbkb::HEXCHARS
 
     s.gsub(opts[:rx]) do |c| 
       c=c[0]
@@ -60,10 +58,17 @@ class String
   end
 
   # Base64 encode
-  def b64; Base64.encode64(self).tr("\n", ""); end
+  def b64(len=nil)
+    ret = [self].pack("m").gsub("\n", "")
+    if len and Numeric === len 
+      ret.scan(/.{1,#{len}}/).join("\n") + "\n"
+    else
+      ret
+    end
+  end
 
   # Base64 decode
-  def d64; Base64.decode64(self); end
+  def d64;  self.unpack("m")[0];  end
 
   # right-align to 'a' alignment padded with 'p'
   def ralign(a, p=' ')
@@ -100,7 +105,7 @@ class String
       raise "rx must be a regular expression for a character class"
     end
 
-    hx=RBkB::HEXCHARS
+    hx=Rbkb::HEXCHARS
 
     out=Array.new
 
@@ -344,6 +349,7 @@ class String
         pos += endoff
       end
     end
+    return ret
   end
 
   # A 'strings' method a-la unix strings utility. Finds printable strings in
@@ -563,7 +569,7 @@ class Numeric
   #                       (only :big has meaning)
   #   siz:  pack to this size. larger numbers will wrap
   def to_chars(order=nil, siz=nil)
-    order ||= RBkB::DEFAULT_BYTE_ORDER
+    order ||= Rbkb::DEFAULT_BYTE_ORDER
     n=self
     siz ||= self.size
     ret=[]
@@ -600,12 +606,12 @@ class Numeric
   #
   def to_hex(o=nil, s=nil)
     to_chars(o,s) {|c| 
-      RBkB::HEXCHARS[c.clear_bits(0xf) >> 4]+RBkB::HEXCHARS[c.clear_bits(0xf0)]
+      Rbkb::HEXCHARS[c.clear_bits(0xf) >> 4]+Rbkb::HEXCHARS[c.clear_bits(0xf0)]
     }.join
   end
 
   # XXX TODO Fixme for new to_bytes/char etc.
-#  def to_guid(order=RBkB::DEFAULT_BYTE_ORDER)
+#  def to_guid(order=Rbkb::DEFAULT_BYTE_ORDER)
 #    raw = self.to_bytes(order, 16)
 #    a,b,c,d,*e = raw.unpack("VvvnC6").map{|x| x.to_hex}
 #    e = e.join
@@ -657,7 +663,6 @@ class Object
   end
 end
 
-
 module Enumerable
   def each_recursive(&block)
     self.each do |n|
@@ -667,6 +672,3 @@ module Enumerable
   end
 end
 
-__END__
-
-

data/lib/rbkb/plug/blit.rb

@@ -74,7 +74,7 @@ module Plug
 
     def self.make_mute(peerno)
       self.blit_header(:squelch) +
-        peerno.to_bytes(2, :big)
+        peerno.to_bytes(:big, 2)
     end
 
     def unmute
@@ -87,7 +87,7 @@ module Plug
 
     def self.make_squelch(peerno)
       self.blit_header(:squelch) +
-        peerno.to_bytes(2, :big)
+        peerno.to_bytes(:big, 2)
     end
 
     def sendmsg
@@ -121,8 +121,8 @@ module Plug
     #   str      data
     def self.make_sendmsg(idx, dat)
       self.blit_header(:sendmsg) +
-        idx.to_bytes(2, :big) + 
-        dat.size.to_bytes(4, :big) + 
+        idx.to_bytes(:big, 2) + 
+        dat.size.to_bytes(:big, 4) + 
         dat
     end
 
@@ -150,7 +150,7 @@ module Plug
 
     def self.make_delete(idx=0)
       self.blit_header(:delete) +
-        idx.to_bytes(2, :big)
+        idx.to_bytes(:big, 2)
     end
 
     def list_peers

data/lib/rbkb/plug/proxy.rb

@@ -0,0 +1,23 @@
+
+module Plug
+  module Proxy
+    include Base
+    attr_accessor :target
+
+    def initialize(transport, target)
+      @transport = transport
+      @peers = ProxyPeerList.new(self)
+      @kind = :proxy
+    end
+
+  end
+
+  class ProxyPeerList < PeerList
+
+    def add_peer(addr)
+    end
+
+    def add_peer_manually(*args)
+    end
+  end
+end

data/lib/rbkb.rb

@@ -1,5 +1,5 @@
-module RBkB
-  VERSION="0.6.1"
+module Rbkb
+  VERSION="0.6.2"
 end
 
 require 'rbkb/extends'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: emonti-rbkb
 version: !ruby/object:Gem::Version 
-  version: 0.6.1.3
+  version: 0.6.2
 platform: ruby
 authors: 
 - Eric Monti
@@ -34,6 +34,7 @@ executables:
 - dedump
 - hexify
 - len
+- plugsrv
 - rex
 - rstrings
 - slice
@@ -42,7 +43,6 @@ executables:
 - urldec
 - urlenc
 - xor
-- plugsrv
 extensions: []
 
 extra_rdoc_files: []
@@ -59,6 +59,7 @@ files:
 - bin/dedump
 - bin/hexify
 - bin/len
+- bin/plugsrv
 - bin/rex
 - bin/rstrings
 - bin/slice
@@ -67,14 +68,30 @@ files:
 - bin/urldec
 - bin/urlenc
 - bin/xor
-- bin/plugsrv
 - lib/rbkb.rb
-- lib/rbkb/command_line.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/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/plug.rb
 - lib/rbkb/plug/blit.rb
 - lib/rbkb/plug/peer.rb
 - lib/rbkb/plug/plug.rb
+- lib/rbkb/plug/proxy.rb
+- lib/rbkb/plug.rb
 has_rdoc: true
 homepage: http://www.matasano.com
 post_install_message: 

data/lib/rbkb/command_line.rb

@@ -1,41 +0,0 @@
-# Author Eric Monti (emonti at matasano)
-require 'optparse'
-
-module RBkB
-  module CommandLine
-    # exits with a message on stderr
-    def bail(msg)
-      STDERR.puts msg if msg
-      exit 1
-    end
-
-    # returns a OptionsParser object with blackbag standard options
-    def bkb_stdargs(o=OptionParser.new, cfg=OPTS)
-      o=OptionParser.new 
-      o.banner = "Usage: #{File.basename $0} [options]"
-
-      o.on("-h", "--help", "Show this message") do
-        bail(o)
-      end
-
-      o.on("-v", "--version", "Show version and exit") do
-        bail("Ruby BlackBag version #{RBkB::VERSION}")
-      end
-    end
-
-    # returns a OptionsParser object with blackbag input options
-    def bkb_inputargs(o=OptionParser.new, cfg=OPTS)
-      o.on("-f", "--file FILENAME", 
-      "Input from FILENAME") do |f|
-        begin
-          cfg[:indat] = File.read(f) 
-        rescue 
-          bail "File Error: #{$!}"
-        end
-      end
-
-      return o
-    end
-  end
-end
-