buby 1.3.1-java → 1.3.3-java

data/README.rdoc

@@ -104,13 +104,16 @@ test your Buby set-up and try out a few features.
 
   $ buby -h
   Usage: buby [options]
-      -i, --interactive          Start IRB
-      -d, --debug                Debug info
-      -B, --load-burp=PATH       Load Burp Jar from PATH
-      -s, --state=FILE           Restore burp state file on startup
-      -r, --require=LIB          load a ruby lib (or jar) after Burp loads
-      -e, --extend=MOD           Extend Buby with a module (loaded via -r?)
-      -h, --help                 Show this help message
+      -i, --interactive                Start IRB
+      -p, --pry                        Start pry
+      -d, --debug                      Debug info
+      -B, --load-burp=PATH             Load Burp Jar from PATH
+      -P, --proxy-interception         Enable intercept on load
+      -s, --state=FILE                 Restore burp state file on startup
+      -r, --require=LIB                load a ruby lib (or jar) after Burp loads
+      -e, --extend=MOD                 Extend Buby with a module (loaded via -r?)
+      -v, --version                    Prints version and exits.
+      -h, --help                       Show this help message
 
   $ buby -i -d
   [:got_extender, #<Java::Default::BurpExtender:0x80 ...>]

data/Rakefile

@@ -2,6 +2,8 @@ require 'rubygems'
 require 'rake'
 require 'rake/clean'
 
+CLOBBER.add '**/*.class', '**/*.jar', "doc", '.yardoc'
+
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
@@ -12,6 +14,7 @@ begin
     gem.homepage = "http://tduehr.github.com/buby"
     gem.authors = ["Eric Monti, tduehr"]
     gem.platform = "java"
+    gem.files.include "**/*.jar"
     gem.test_files = ["test/buby_test.rb"]
     gem.require_paths << 'java'
     gem.rdoc_options = ["--main", "README.rdoc"]
@@ -33,19 +36,28 @@ task :test => :check_dependencies
 
 task :default => :test
 
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  if File.exist?('VERSION')
-    version = File.read('VERSION')
-  else
-    version = ""
+begin
+  require 'rdoc/task'
+  Rake::RDocTask.new do |rdoc|
+    if File.exist?('VERSION')
+      version = File.read('VERSION')
+    else
+      version = ""
+    end
+
+    rdoc.rdoc_dir = 'rdoc'
+    rdoc.title = "buby #{version}"
+    rdoc.rdoc_files.include('README*')
+    rdoc.rdoc_files.include('History.txt')
+    rdoc.rdoc_files.include('bin/buby')
+    rdoc.rdoc_files.include('lib/**/*.rb')
   end
+rescue LoadError
+end
 
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "buby #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('History.txt')
-  rdoc.rdoc_files.include('bin/buby')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+begin
+  require 'yard'
+  YARD::Rake::YardocTask.new
+rescue LoadError
 end
 

data/VERSION

@@ -1 +1 @@
-1.3.1
+1.3.3

data/bin/buby

@@ -1,6 +1,6 @@
 #!/usr/bin/env jruby
 
-require File.expand_path(File.join(File.dirname(__FILE__), %w[.. lib buby]))
+require 'buby'
 require 'irb'
 require 'optparse'
 
@@ -14,7 +14,9 @@ begin
       raise opts.to_s
     end
 
-    o.on("-i", "--interactive", "Start IRB") { args[:irb] = true }
+    o.on("-i", "--interactive", "Start IRB") { args[:interactive] = :irb }
+
+    o.on("-p", "--pry", "Start pry") { args[:interactive] = :pry }
 
     o.on("-d", "--debug", "Debug info") { args[:debug] = true }
 
@@ -22,6 +24,8 @@ begin
       args[:load_burp] = b
     end
 
+    o.on("-P", "--proxy-interception", "Enable intercept on load") {args[:proxy_interception] = true}
+
     o.on('-s', '--state=FILE', "Restore burp state file on startup") do |r|
       args[:restore] = r
     end
@@ -59,6 +63,11 @@ $DEBUG=true if args[:debug]
 
 $burp = Buby.start_burp()
 
+until $burp.burp_callbacks
+  puts 'Waiting for burp callbacks...' if $DEBUG
+  sleep 0.1
+end
+
 if libs=args[:requires]
   libs.each {|lib| STDERR.puts "Loading: #{lib.inspect}"; require(lib)}
 end
@@ -92,7 +101,10 @@ if f=args[:restore]
   $burp.restore_state(f)
 end
 
-if args[:irb]
+$burp.proxy_interception = false unless args[:proxy_interception]
+
+case args[:interactive]
+when :irb
   # yucky hack...
   IRB.setup(nil)
   IRB.conf[:IRB_NAME] = File.basename($0, ".rb")
@@ -101,8 +113,12 @@ if args[:irb]
       def setup(*args); end
     end
   end
-  puts "Global $burp is set to #{$burp.inspect}",
+  puts "Starting IRB: Global $burp is set to #{$burp.inspect}",
        " Important Note: exit with $burp.close"
   IRB.start()
+when :pry
+  require 'pry'
+  puts "Starting Pry: Global $burp is set to #{$burp.inspect}",
+       " Important Note: exit with $burp.close"
+  Pry.start
 end
-

data/buby.gemspec

@@ -4,16 +4,16 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{buby}
-  s.version = "1.3.1"
-  s.platform = %q{java}
+  s.name = "buby"
+  s.version = "1.3.3"
+  s.platform = "java"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{Eric Monti, tduehr}]
-  s.date = %q{2011-12-05}
-  s.description = %q{Buby is a mashup of JRuby with the popular commercial web security testing tool Burp Suite from PortSwigger.  Burp is driven from and tied to JRuby with a Java extension using the BurpExtender API.  This extension aims to add Ruby scriptability to Burp Suite with an interface comparable to the Burp's pure Java extension interface.}
-  s.email = %q{emonti@matasano.com, td@matasano.com}
-  s.executables = [%q{buby}]
+  s.authors = ["Eric Monti, tduehr"]
+  s.date = "2012-12-14"
+  s.description = "Buby is a mashup of JRuby with the popular commercial web security testing tool Burp Suite from PortSwigger.  Burp is driven from and tied to JRuby with a Java extension using the BurpExtender API.  This extension aims to add Ruby scriptability to Burp Suite with an interface comparable to the Burp's pure Java extension interface."
+  s.email = "emonti@matasano.com, td@matasano.com"
+  s.executables = ["buby"]
   s.extra_rdoc_files = [
     "History.txt",
     "README.rdoc",
@@ -48,12 +48,12 @@ Gem::Specification.new do |s|
     "samples/watch_scan.rb",
     "test/buby_test.rb"
   ]
-  s.homepage = %q{http://tduehr.github.com/buby}
-  s.rdoc_options = [%q{--main}, %q{README.rdoc}]
-  s.require_paths = [%q{lib}, %q{java}, %q{java}]
-  s.rubygems_version = %q{1.8.6}
-  s.summary = %q{Buby is a mashup of JRuby with the popular commercial web security testing tool Burp Suite from PortSwigger}
-  s.test_files = [%q{test/buby_test.rb}]
+  s.homepage = "http://tduehr.github.com/buby"
+  s.rdoc_options = ["--main", "README.rdoc"]
+  s.require_paths = ["lib", "java", "java"]
+  s.rubygems_version = "1.8.24"
+  s.summary = "Buby is a mashup of JRuby with the popular commercial web security testing tool Burp Suite from PortSwigger"
+  s.test_files = ["test/buby_test.rb"]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/lib/buby.rb

@@ -424,6 +424,7 @@ class Buby
     _check_and_callback(:setProxyInterceptionEnabled, enabled)
   end
   alias proxy_interception_enabled setProxyInterceptionEnabled
+  alias proxy_interception= setProxyInterceptionEnabled
 
   # This method can be used to determine the version of the loaded burp at runtime.
   # This is included in the Javadoc for the extension interfaces but not the supplied interface files.
@@ -828,11 +829,11 @@ class Buby
 
   # Checks the Java namespace to see if Burp has been loaded.
   def self.burp_loaded?
-    begin 
-      include_class 'burp.StartBurp'
-      return true
+    @burp_loaded ||= begin
+      java_import 'burp.StartBurp'
+      true
     rescue NameError
-      return false
+      false
     end
   end
 

metadata

@@ -1,34 +1,26 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: buby
-version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: 
-  segments: 
-  - 1
-  - 3
-  - 1
-  version: 1.3.1
+version: !ruby/object:Gem::Version
+  version: 1.3.3
+  prerelease:
 platform: java
-authors: 
+authors:
 - Eric Monti, tduehr
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-
-date: 2011-12-05 00:00:00 Z
+date: 2012-12-14 00:00:00.000000000 Z
 dependencies: []
-
 description: Buby is a mashup of JRuby with the popular commercial web security testing tool Burp Suite from PortSwigger.  Burp is driven from and tied to JRuby with a Java extension using the BurpExtender API.  This extension aims to add Ruby scriptability to Burp Suite with an interface comparable to the Burp's pure Java extension interface.
 email: emonti@matasano.com, td@matasano.com
-executables: 
+executables:
 - buby
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - History.txt
 - README.rdoc
 - bin/buby
-files: 
+files:
 - History.txt
 - README.rdoc
 - Rakefile
@@ -58,39 +50,33 @@ files:
 - test/buby_test.rb
 homepage: http://tduehr.github.com/buby
 licenses: []
-
-post_install_message: 
-rdoc_options: 
+post_install_message:
+rdoc_options:
 - --main
 - README.rdoc
-require_paths: 
+require_paths:
 - lib
 - java
 - java
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: !binary |-
+        MA==
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: !binary |-
+        MA==
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
 requirements: []
-
-rubyforge_project: 
-rubygems_version: 1.8.6
-signing_key: 
+rubyforge_project:
+rubygems_version: 1.8.24
+signing_key:
 specification_version: 3
 summary: Buby is a mashup of JRuby with the popular commercial web security testing tool Burp Suite from PortSwigger
-test_files: 
+test_files:
 - test/buby_test.rb