buby 1.1.6-java → 1.1.7-java

data/.bnsignore

@@ -0,0 +1,27 @@
+# The list of files that should be ignored by Mr Bones.
+# Lines that start with '#' are comments.
+#
+# A .gitignore file can be used instead by setting it as the ignore
+# file in your Rakefile:
+#
+#   PROJ.ignore_file = '.gitignore'
+#
+# For a project with a C extension, the following would be a good set of
+# exclude patterns (uncomment them if you want to use them):
+# *.[oa]
+
+.*
+*~
+*.swp
+.*.swp
+announcement.txt
+coverage*/
+doc
+pkg
+experimental
+reference
+lib/burp.jar
+*.class
+*.gem
+.DS_Store 
+

data/History.txt

@@ -1,3 +1,7 @@
+== 1.1.7 / 2009-12-29
+  * fix evt_proxy_message_raw bridge to modify proxy messages (broken in 1.1.6)
+  * switched from bones to jeweler for project mgmt
+
 == 1.1.6 / 2009-11-19
 * fix
   * poc_generator.rb example fixed to properly parse port in Host header

data/Rakefile

@@ -1,34 +1,50 @@
-# Look in the tasks/setup.rb file for the various options that can be
-# configured in this Rakefile. The .rake files in the tasks directory
-# are where the options are used.
+require 'rubygems'
+require 'rake'
+require 'rake/clean'
 
 begin
-  require 'bones'
-  Bones.setup
-rescue LoadError
-  begin
-    load 'tasks/setup.rb'
-  rescue LoadError
-    raise RuntimeError, '### please install the "bones" gem ###'
+  require 'jeweler'
+  Jeweler::Tasks.new do |gem|
+    gem.name = "buby"
+    gem.summary = %q{Buby is a mashup of JRuby with the popular commercial web security testing tool Burp Suite from PortSwigger}
+    gem.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.}
+    gem.email = "emonti@matasano.com"
+    gem.homepage = "http://emonti.github.com/buby"
+    gem.authors = ["Eric Monti - Matasano Security"]
+    gem.platform = "java"
+    gem.test_files = ["test/buby_test.rb"]
+    gem.require_paths << 'java'
+    gem.rdoc_options = ["--main", "README.rdoc"]
+    gem.extra_rdoc_files = ["History.txt", "README.rdoc", "bin/buby"]
   end
+rescue LoadError
+  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
+end
+
+require 'rake/testtask'
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'lib' << 'test' << 'java'
+  test.pattern = 'test/**/*_test.rb'
+  test.verbose = true
 end
 
-ensure_in_path 'lib'
-ensure_in_path 'java'
-require 'buby'
+task :test => :check_dependencies
 
-task :default => 'spec:run'
+task :default => :test
 
-PROJ.name = 'buby'
-PROJ.authors = 'Eric Monti - Matasano Security'
-PROJ.email = 'emonti@matasano.com'
-PROJ.url = 'http://emonti.github.com/buby'
-PROJ.version = Buby::VERSION
-PROJ.rubyforge.name = 'buby'
-PROJ.readme_file = 'README.rdoc'
-PROJ.libs << "java"
-PROJ.platform = 'java'
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  if File.exist?('VERSION')
+    version = File.read('VERSION')
+  else
+    version = ""
+  end
 
-PROJ.spec.opts << '--color'
+  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
 
-# EOF

data/VERSION

@@ -0,0 +1 @@
+1.1.7

data/buby.gemspec

@@ -1,37 +1,69 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{buby}
-  s.version = "1.1.6"
+  s.version = "1.1.7"
+  s.platform = %q{java}
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Eric Monti - Matasano Security"]
-  s.date = %q{2009-12-22}
+  s.date = %q{2009-12-29}
   s.default_executable = %q{buby}
   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}
   s.executables = ["buby"]
-  s.extra_rdoc_files = ["History.txt", "README.rdoc", "bin/buby"]
-  s.files = ["History.txt", "README.rdoc", "Rakefile", "bin/buby", "buby.gemspec", "java/buby.jar", "java/src/BurpExtender.java", "java/src/burp/IBurpExtender.java", "java/src/burp/IBurpExtenderCallbacks.java", "java/src/burp/IHttpRequestResponse.java", "java/src/burp/IScanIssue.java", "java/src/burp/IScanQueueItem.java", "lib/buby.rb", "lib/buby/extends.rb", "lib/buby/extends/buby_array_wrapper.rb", "lib/buby/extends/http_request_response.rb", "lib/buby/extends/scan_issue.rb", "samples/drb_buby.rb", "samples/drb_sample_cli.rb", "samples/mechanize_burp.rb", "samples/poc_generator.rb", "samples/verb_tamperer.rb", "samples/watch_scan.rb", "spec/buby_spec.rb", "spec/spec_helper.rb", "tasks/ann.rake", "tasks/bones.rake", "tasks/gem.rake", "tasks/git.rake", "tasks/notes.rake", "tasks/post_load.rake", "tasks/rdoc.rake", "tasks/rubyforge.rake", "tasks/setup.rb", "tasks/spec.rake", "tasks/svn.rake", "tasks/test.rake", "tasks/zentest.rake", "test/test_buby.rb"]
+  s.extra_rdoc_files = [
+    "History.txt",
+     "README.rdoc",
+     "bin/buby"
+  ]
+  s.files = [
+    ".bnsignore",
+     "History.txt",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION",
+     "bin/buby",
+     "buby.gemspec",
+     "java/buby.jar",
+     "java/src/BurpExtender.java",
+     "java/src/burp/IBurpExtender.java",
+     "java/src/burp/IBurpExtenderCallbacks.java",
+     "java/src/burp/IHttpRequestResponse.java",
+     "java/src/burp/IScanIssue.java",
+     "java/src/burp/IScanQueueItem.java",
+     "lib/buby.rb",
+     "lib/buby/extends.rb",
+     "lib/buby/extends/buby_array_wrapper.rb",
+     "lib/buby/extends/http_request_response.rb",
+     "lib/buby/extends/scan_issue.rb",
+     "samples/drb_buby.rb",
+     "samples/drb_sample_cli.rb",
+     "samples/mechanize_burp.rb",
+     "samples/poc_generator.rb",
+     "samples/verb_tamperer.rb",
+     "samples/watch_scan.rb",
+     "test/buby_test.rb"
+  ]
   s.homepage = %q{http://emonti.github.com/buby}
   s.rdoc_options = ["--main", "README.rdoc"]
   s.require_paths = ["lib", "java"]
-  s.rubyforge_project = %q{buby}
-  s.rubygems_version = %q{1.3.3}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{Buby is a mashup of JRuby with the popular commercial web security testing tool Burp Suite from PortSwigger}
-  s.test_files = ["test/test_buby.rb"]
+  s.test_files = [
+    "test/buby_test.rb"
+  ]
 
-  s.platform = 'java'
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<bones>, [">= 2.5.1"])
     else
-      s.add_dependency(%q<bones>, [">= 2.5.1"])
     end
   else
-    s.add_dependency(%q<bones>, [">= 2.5.1"])
   end
 end

data/java/src/BurpExtender.java

@@ -167,7 +167,7 @@ public class BurpExtender implements IBurpExtender {
 
         // prepare an alternate String message value to present to ruby
         //String message_str = new String(message);
-        //IRubyObject r_msg = to_ruby(rt, message_str);
+        IRubyObject r_msg = to_ruby(rt, message);
 
         IRubyObject pxy_msg[] = {
           to_ruby(rt, messageReference),
@@ -180,8 +180,7 @@ public class BurpExtender implements IBurpExtender {
           to_ruby(rt, resourceType),
           to_ruby(rt, statusCode),
           to_ruby(rt, responseContentType),
-          //r_msg,
-          to_ruby(rt, message),
+          r_msg,
           r_action
         };
 
@@ -189,8 +188,9 @@ public class BurpExtender implements IBurpExtender {
         action[0] = ((int[]) JavaUtil.convertRubyToJava(r_action))[0];
 
         IRubyObject ret = r_obj.callMethod(ctx(r_obj), PROXYMSG_METH, pxy_msg);
-        //if(ret != r_msg)
-        //  return ((RubyString) ret).getBytes();
+        if(ret != r_msg) {
+          return (byte[]) JavaUtil.convertRubyToJava(ret);
+        }
       }
 
       return message;

data/lib/buby.rb

@@ -82,7 +82,6 @@ include_class 'BurpExtender'
 class Buby
 
   # :stopdoc:
-  VERSION = '1.1.6'
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
   # :startdoc:
@@ -385,9 +384,11 @@ class Buby
   # which expects a message string 
   def evt_proxy_message_raw msg_ref, is_req, rhost, rport, is_https, http_meth, url, resourceType, status, req_content_type, message, action
     pp [:evt_proxy_message_raw_hit, msg_ref, is_req, rhost, rport, is_https, http_meth, url, resourceType, status, req_content_type, message, action ] if $DEBUG
+
     str_msg = String.from_java_bytes(message)
     ret = evt_proxy_message(msg_ref, is_req, rhost, rport, is_https, http_meth, url, resourceType, status, req_content_type, str_msg, action)
-    message = ret.to_java_bytes unless ret == str_msg
+
+    message = ret.to_java_bytes if ret.object_id != str_msg.object_id
     return message
   end
 
@@ -754,12 +755,6 @@ class Buby
     Dir.glob(search_me).sort.each {|rb| require rb}
   end
 
-  # Returns the version string for the library.
-  #
-  def self.version
-    VERSION
-  end
-
 end # Buby
 
 

data/test/buby_test.rb

@@ -0,0 +1,2 @@
+require 'rubygems'
+require 'buby'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: buby
 version: !ruby/object:Gem::Version 
-  version: 1.1.6
+  version: 1.1.7
 platform: java
 authors: 
 - Eric Monti - Matasano Security
@@ -9,19 +9,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-22 00:00:00 -06:00
+date: 2009-12-29 00:00:00 -06:00
 default_executable: buby
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: bones
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.5.1
-    version: 
+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
 executables: 
@@ -33,9 +24,11 @@ extra_rdoc_files:
 - README.rdoc
 - bin/buby
 files: 
+- .bnsignore
 - History.txt
 - README.rdoc
 - Rakefile
+- VERSION
 - bin/buby
 - buby.gemspec
 - java/buby.jar
@@ -56,22 +49,7 @@ files:
 - samples/poc_generator.rb
 - samples/verb_tamperer.rb
 - samples/watch_scan.rb
-- spec/buby_spec.rb
-- spec/spec_helper.rb
-- tasks/ann.rake
-- tasks/bones.rake
-- tasks/gem.rake
-- tasks/git.rake
-- tasks/notes.rake
-- tasks/post_load.rake
-- tasks/rdoc.rake
-- tasks/rubyforge.rake
-- tasks/setup.rb
-- tasks/spec.rake
-- tasks/svn.rake
-- tasks/test.rake
-- tasks/zentest.rake
-- test/test_buby.rb
+- test/buby_test.rb
 has_rdoc: true
 homepage: http://emonti.github.com/buby
 licenses: []
@@ -97,10 +75,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: buby
+rubyforge_project: 
 rubygems_version: 1.3.5
 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/test_buby.rb
+- test/buby_test.rb

data/spec/buby_spec.rb

@@ -1,7 +0,0 @@
-
-require File.join(File.dirname(__FILE__), %w[spec_helper])
-
-describe Buby do
-end
-
-# EOF

data/spec/spec_helper.rb

@@ -1,16 +0,0 @@
-
-require File.expand_path(
-    File.join(File.dirname(__FILE__), %w[.. lib buby]))
-
-Spec::Runner.configure do |config|
-  # == Mock Framework
-  #
-  # RSpec uses it's own mocking framework by default. If you prefer to
-  # use mocha, flexmock or RR, uncomment the appropriate line:
-  #
-  # config.mock_with :mocha
-  # config.mock_with :flexmock
-  # config.mock_with :rr
-end
-
-# EOF

data/tasks/ann.rake

@@ -1,80 +0,0 @@
-
-begin
-  require 'bones/smtp_tls'
-rescue LoadError
-  require 'net/smtp'
-end
-require 'time'
-
-namespace :ann do
-
-  # A prerequisites task that all other tasks depend upon
-  task :prereqs
-
-  file PROJ.ann.file do
-    ann = PROJ.ann
-    puts "Generating #{ann.file}"
-    File.open(ann.file,'w') do |fd|
-      fd.puts("#{PROJ.name} version #{PROJ.version}")
-      fd.puts("    by #{Array(PROJ.authors).first}") if PROJ.authors
-      fd.puts("    #{PROJ.url}") if PROJ.url.valid?
-      fd.puts("    (the \"#{PROJ.release_name}\" release)") if PROJ.release_name
-      fd.puts
-      fd.puts("== DESCRIPTION")
-      fd.puts
-      fd.puts(PROJ.description)
-      fd.puts
-      fd.puts(PROJ.changes.sub(%r/^.*$/, '== CHANGES'))
-      fd.puts
-      ann.paragraphs.each do |p|
-        fd.puts "== #{p.upcase}"
-        fd.puts
-        fd.puts paragraphs_of(PROJ.readme_file, p).join("\n\n")
-        fd.puts
-      end
-      fd.puts ann.text if ann.text
-    end
-  end
-
-  desc "Create an announcement file"
-  task :announcement => ['ann:prereqs', PROJ.ann.file]
-
-  desc "Send an email announcement"
-  task :email => ['ann:prereqs', PROJ.ann.file] do
-    ann = PROJ.ann
-    from = ann.email[:from] || Array(PROJ.authors).first || PROJ.email
-    to   = Array(ann.email[:to])
-
-    ### build a mail header for RFC 822
-    rfc822msg =  "From: #{from}\n"
-    rfc822msg << "To: #{to.join(',')}\n"
-    rfc822msg << "Subject: [ANN] #{PROJ.name} #{PROJ.version}"
-    rfc822msg << " (#{PROJ.release_name})" if PROJ.release_name
-    rfc822msg << "\n"
-    rfc822msg << "Date: #{Time.new.rfc822}\n"
-    rfc822msg << "Message-Id: "
-    rfc822msg << "<#{"%.8f" % Time.now.to_f}@#{ann.email[:domain]}>\n\n"
-    rfc822msg << File.read(ann.file)
-
-    params = [:server, :port, :domain, :acct, :passwd, :authtype].map do |key|
-      ann.email[key]
-    end
-
-    params[3] = PROJ.email if params[3].nil?
-
-    if params[4].nil?
-      STDOUT.write "Please enter your e-mail password (#{params[3]}): "
-      params[4] = STDIN.gets.chomp
-    end
-
-    ### send email
-    Net::SMTP.start(*params) {|smtp| smtp.sendmail(rfc822msg, from, to)}
-  end
-end  # namespace :ann
-
-desc 'Alias to ann:announcement'
-task :ann => 'ann:announcement'
-
-CLOBBER << PROJ.ann.file
-
-# EOF