buby 1.3.3-java → 1.5.0-java

data/README.rdoc

@@ -26,6 +26,25 @@ Buby is implemented using an abstract Ruby event handler and interface class. Th
 
 The java BurpExtender included with Buby is an implementation of IBurpExtender which is the interface API supplied by PortSwigger for writing extensions to Burp Suite. It mostly acts as a method proxy between Ruby and Java, doing very little except event handler proxying between the java and ruby runtimes with run-time type conversion as needed.
 
+== Caveat
+
+Burp's extension interfaces have changed significantly in 1.5.01. I don't yet know how compatible this will be with Burp versions 1.5.0 and lower going forward. If you want compatibility with Burp Suite versions 1.5.0 and earlier stick with Buby version 1.3.3 or prior.
+
+I will keep the API provided by earlier Buby versions and mark methods deprecated as required. Hopefully, I'll be able to keep them around for a while so old buby scripts will continue to work for a while.
+
+Methods removed/deprecated in 1.5.01 interfaces:
+* IBurpExtenderCallbacks.setCommandLineArgs (removed no replacement)
+* IBurpExtenderCallbacks.applicationClosing (removed use IExtensionStateListener instead)
+* IBurpExtenderCallbacks.getParameters (deprecated, use IExtensionHelpers analyze methods instead)
+* IBurpExtenderCallbacks.getHeaders (deprecated, use IExtensionHelpers analyze methods instead)
+* IBurpExtenderCallbacks.registerMenuItem (deprecated, use IBurpExtenderCalbacks.registerContextMenuFactory instead)
+* IMenuItemHandler (deprecated, use IContextMenuFactory instead)
+
+The deprecated getPatameters and getHeaders methods will, for now, call the equivalent methods on IBurpExtenderCallbacks. At some point soon they'll forward the calls to the correct interface before being removed entirely in favor of the new interfaces.
+
+In 2.0 bin/buby to use a bash script as the primary starting point for the current script - which will be renamed to bin/buby.rb
+
+... And one more thing. The next version of buby will require JRuby 1.7.0+. It won't use 1.9 syntax for a little while. So, extensions that require 1.8 will still work for now. Just don't forget to add the `--1.8` switch to JRuby when starting buby.
 
 == REQUIREMENTS:
 
@@ -59,16 +78,15 @@ Here are manual instructions if you want or need to build things yourself:
 
 ==== Step 2. Compile BurpExtender.java. Include jruby.jar in the classpath:
 
-  cd buby/java/src
-  javac -classpath (.../jruby/root)/lib/jruby.jar:. BurpExtender.java
+Install the development dependencies:
+  jruby -S gem install jeweler rake-compiler
 
-==== Step 3. Create a new java/buby.jar
+==== Step 3. Build with rake
 
-  jar cvf ../buby.jar .
+  jruby -S rake build
 
 ==== Step 4. Build a local gem and install it
 
-  cd ../../
   jruby -S gem build buby.gemspec
   jruby -S gem install --local buby-*.gem
 
@@ -91,8 +109,7 @@ though the actual directory may need to be created.
 Here's how I do it. I have my jruby installation under my home directory.
 Your configuration details can be substituted below. 
 
-  mkdir ~/jruby-1.1.5/lib/ruby/1.8/java
-  ln -s ~/tools/burp.jar ~/jruby-1.1.5/lib/ruby/1.8/java/burp.jar
+  ln -s ~/tools/burp.jar ~/jruby-1.7.1/lib/ruby/1.9/java/burp.jar
 
 Now everything should be ready to go. Try at least the first few parts of the 
 test below to confirm everything is set up. 
@@ -256,13 +273,10 @@ And, assuming 'www.example.com' checks for valid request verbs, you should see s
 
 == CREDIT:
 * Burp and Burp Suite are trademarks of PortSwigger(ltd) 
-  Copyright 2011 PortSwigger Ltd. All rights reserved.
+  Copyright 2012 PortSwigger Ltd. All rights reserved.
   See http://portswigger.net for license terms.
 
-* This ruby library and the accompanying BurpExtender.java implementation was 
-  originally written by Eric Monti @ Matasano Security. This ruby library is 
-  currently maintained by Timur Duehr @ Matasano Security.Matasano Security claims no 
-  professional or legal affiliation with PortSwigger LTD.
+* This ruby library and the accompanying BurpExtender.java implementation was written by Timur Duehr @ Matasano Security. The original version of this library and BurpExtender.java implementation was written my Eric Monti @ Matasano Security. Matasano Security claims no professional or legal affiliation with PortSwigger LTD.
 
   However, the authors would like to express their personal and professional 
   respect and admiration to Burp's authors and appreciation to PortSwigger for 
@@ -274,7 +288,7 @@ And, assuming 'www.example.com' checks for valid request verbs, you should see s
 == LICENSE:
 
 * Burp and Burp Suite are trademarks of PortSwigger Ltd.
-  Copyright 2011 PortSwigger Ltd. All rights reserved.
+  Copyright 2012 PortSwigger Ltd. All rights reserved.
   See http://portswigger.net for license terms.
 
 * The Buby Ruby library and its accompanying BurpExtender implementation are
@@ -283,7 +297,7 @@ And, assuming 'www.example.com' checks for valid request verbs, you should see s
 (The MIT License)
 
 Copyright (C) 2009 Eric Monti, Matasano Security
-Copyright (C) 2010-2011 Timur Duehr, Matasano Security
+Copyright (C) 2010-2012 Timur Duehr, Matasano Security
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the 'Software'), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

data/Rakefile

@@ -2,24 +2,26 @@ require 'rubygems'
 require 'rake'
 require 'rake/clean'
 
-CLOBBER.add '**/*.class', '**/*.jar', "doc", '.yardoc'
+CLEAN.add 'tmp'
+CLOBBER.add '**/*.class', '**/buby.jar', "doc", '.yardoc'
 
 begin
   require 'jeweler'
-  Jeweler::Tasks.new do |gem|
+  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, td@matasano.com"
+    gem.email = "td@matasano.com"
     gem.homepage = "http://tduehr.github.com/buby"
     gem.authors = ["Eric Monti, tduehr"]
     gem.platform = "java"
-    gem.files.include "**/*.jar"
+    gem.files.include "**/buby.jar"
+    gem.files.include "**/burp_interfaces.jar"
     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
+    gem.add_development_dependency "rake-compiler", "~> 0.8.1"
+  end.jeweler
   Jeweler::GemcutterTasks.new
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
@@ -58,6 +60,94 @@ end
 begin
   require 'yard'
   YARD::Rake::YardocTask.new
+  YARD::Rake::YardocTask.new(:todo) do |yard|
+    yard.options.concat ['--query', '@todo']
+    yard.options << "--list"
+  end
+rescue LoadError
+end
+
+begin
+  require 'rake/javaextensiontask'
+  Rake::JavaExtensionTask.new('burp_interfaces', jeweler.gemspec)
+  Rake::JavaExtensionTask.new('buby', jeweler.gemspec) do |jet|
+    jet.classpath = "lib/burp_interfaces.jar"
+  end
+  task :test => :compile
+  task :build => :compile
 rescue LoadError
+  warn 'rake-compiler not found. java compilation must be performed manually'
 end
 
+namespace :version do
+  task :nice do
+    version_hash = YAML.load_file 'VERSION.yml'
+    version_string = ""
+    version_string << version_hash[:major].to_s
+    version_string << ".#{version_hash[:minor].to_s}"
+    version_string << ".#{version_hash[:patch].to_s}"
+    version_string << ".#{version_hash[:build].to_s}" if version_hash[:build]
+    File.open('lib/buby/version.rb', 'w') do |file|
+      file.write <<EOS
+class Buby
+  module Version
+    STRING = "#{version_string}"
+    MAJOR = #{version_hash[:major].to_i}
+    MINOR = #{version_hash[:minor].to_i}
+    PATCH = #{version_hash[:patch].to_i}
+    BUILD = #{version_hash[:build].inspect}
+  end
+end
+EOS
+    end
+    jeweler.repo.add 'lib/buby/version.rb'
+    jeweler.repo.commit "fixup! Version bump to #{version_string}"
+    puts "Buby::Version updated to #{version_string}"
+  end
+
+  namespace :bump do
+    task :patch do
+      Rake::Task["version:nice"].invoke
+    end
+    task :patch do
+      Rake::Task["version:nice"].invoke
+    end
+    task :patch do
+      Rake::Task["version:nice"].invoke
+    end
+  end
+end
+
+desc "Start Buby in interactive mode with all runtime dependencies loaded"
+task :test_console, [:script] do |t,args|
+  # TODO move to a command
+  dirs = ['ext', 'lib'].select { |dir| File.directory?(dir) }
+
+  original_load_path = $LOAD_PATH
+
+  cmd = if File.exist?('Gemfile')
+          require 'bundler'
+          Bundler.setup(:default)
+        end
+
+  # add the project code directories
+  $LOAD_PATH.unshift(*dirs)
+
+  # clear ARGV so IRB is not confused
+  ARGV.clear
+
+  require 'irb'
+
+  require File.basename Dir.glob('lib/burpsuite_pro_*.jar').last
+  require 'burp_interfaces.jar'
+  require 'buby.jar'
+  require 'buby'
+  $burp = Buby.start_burp
+
+  # set the optional script to run
+  IRB.conf[:SCRIPT] = args.script
+  IRB.start
+
+  # return the $LOAD_PATH to it's original state
+  $LOAD_PATH.reject! { |path| !(original_load_path.include?(path)) }
+end

data/VERSION.yml

@@ -0,0 +1,5 @@
+---
+:major: 1
+:minor: 5
+:patch: 0
+:build: 

data/bin/buby

@@ -1,5 +1,7 @@
 #!/usr/bin/env jruby
 
+require 'burp_interfaces.jar'
+require 'buby.jar'
 require 'buby'
 require 'irb'
 require 'optparse'

data/buby.gemspec

@@ -5,14 +5,14 @@
 
 Gem::Specification.new do |s|
   s.name = "buby"
-  s.version = "1.3.3"
+  s.version = "1.5.0"
   s.platform = "java"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Eric Monti, tduehr"]
-  s.date = "2012-12-14"
+  s.date = "2013-04-25"
   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.email = "td@matasano.com"
   s.executables = ["buby"]
   s.extra_rdoc_files = [
     "History.txt",
@@ -23,22 +23,104 @@ Gem::Specification.new do |s|
     "History.txt",
     "README.rdoc",
     "Rakefile",
-    "VERSION",
+    "VERSION.yml",
     "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/IMenuItemHandler.java",
-    "java/src/burp/IScanIssue.java",
-    "java/src/burp/IScanQueueItem.java",
+    "ext/buby/burp/BurpExtender.java",
+    "ext/burp_interfaces/burp/IBurpExtender.java",
+    "ext/burp_interfaces/burp/IBurpExtenderCallbacks.java",
+    "ext/burp_interfaces/burp/IContextMenuFactory.java",
+    "ext/burp_interfaces/burp/IContextMenuInvocation.java",
+    "ext/burp_interfaces/burp/ICookie.java",
+    "ext/burp_interfaces/burp/IExtensionHelpers.java",
+    "ext/burp_interfaces/burp/IExtensionStateListener.java",
+    "ext/burp_interfaces/burp/IHttpListener.java",
+    "ext/burp_interfaces/burp/IHttpRequestResponse.java",
+    "ext/burp_interfaces/burp/IHttpRequestResponsePersisted.java",
+    "ext/burp_interfaces/burp/IHttpRequestResponseWithMarkers.java",
+    "ext/burp_interfaces/burp/IHttpService.java",
+    "ext/burp_interfaces/burp/IInterceptedProxyMessage.java",
+    "ext/burp_interfaces/burp/IIntruderAttack.java",
+    "ext/burp_interfaces/burp/IIntruderPayloadGenerator.java",
+    "ext/burp_interfaces/burp/IIntruderPayloadGeneratorFactory.java",
+    "ext/burp_interfaces/burp/IIntruderPayloadProcessor.java",
+    "ext/burp_interfaces/burp/IMenuItemHandler.java",
+    "ext/burp_interfaces/burp/IMessageEditor.java",
+    "ext/burp_interfaces/burp/IMessageEditorController.java",
+    "ext/burp_interfaces/burp/IMessageEditorTab.java",
+    "ext/burp_interfaces/burp/IMessageEditorTabFactory.java",
+    "ext/burp_interfaces/burp/IParameter.java",
+    "ext/burp_interfaces/burp/IProxyListener.java",
+    "ext/burp_interfaces/burp/IRequestInfo.java",
+    "ext/burp_interfaces/burp/IResponseInfo.java",
+    "ext/burp_interfaces/burp/IScanIssue.java",
+    "ext/burp_interfaces/burp/IScanQueueItem.java",
+    "ext/burp_interfaces/burp/IScannerCheck.java",
+    "ext/burp_interfaces/burp/IScannerInsertionPoint.java",
+    "ext/burp_interfaces/burp/IScannerInsertionPointProvider.java",
+    "ext/burp_interfaces/burp/IScannerListener.java",
+    "ext/burp_interfaces/burp/IScopeChangeListener.java",
+    "ext/burp_interfaces/burp/ISessionHandlingAction.java",
+    "ext/burp_interfaces/burp/ITab.java",
+    "ext/burp_interfaces/burp/ITempFile.java",
+    "ext/burp_interfaces/burp/ITextEditor.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",
+    "lib/buby/burp_extender.rb",
+    "lib/buby/burp_extender/console_frame.rb",
+    "lib/buby/burp_extender/console_pane.rb",
+    "lib/buby/burp_extender/console_tab.rb",
+    "lib/buby/burp_extender/context_menu.rb",
+    "lib/buby/burp_extender/context_menu_factory.rb",
+    "lib/buby/burp_extender/context_menu_item.rb",
+    "lib/buby/burp_extender/jcheck_box_menu_item.rb",
+    "lib/buby/burp_extender/jmenu.rb",
+    "lib/buby/burp_extender/jmenu_item.rb",
+    "lib/buby/burp_extender/menu.rb",
+    "lib/buby/burp_extender/menu_item.rb",
+    "lib/buby/context_menu_factory.rb",
+    "lib/buby/cookie.rb",
+    "lib/buby/extender.rb",
+    "lib/buby/http_listener.rb",
+    "lib/buby/implants.rb",
+    "lib/buby/implants/buby_array_wrapper.rb",
+    "lib/buby/implants/context_menu_invocation.rb",
+    "lib/buby/implants/cookie.rb",
+    "lib/buby/implants/extension_helpers.rb",
+    "lib/buby/implants/http_request_response.rb",
+    "lib/buby/implants/intercepted_proxy_message.rb",
+    "lib/buby/implants/intruder_attack.rb",
+    "lib/buby/implants/jruby.rb",
+    "lib/buby/implants/message_editor.rb",
+    "lib/buby/implants/message_editor_controller.rb",
+    "lib/buby/implants/parameter.rb",
+    "lib/buby/implants/request_info.rb",
+    "lib/buby/implants/response_info.rb",
+    "lib/buby/implants/scan_issue.rb",
+    "lib/buby/implants/scan_queue_item.rb",
+    "lib/buby/implants/scanner_insertion_point.rb",
+    "lib/buby/implants/temp_file.rb",
+    "lib/buby/implants/text_editor.rb",
+    "lib/buby/intruder_payload_generator.rb",
+    "lib/buby/intruder_payload_generator_factory.rb",
+    "lib/buby/intruder_payload_processor.rb",
+    "lib/buby/message_editor_controller.rb",
+    "lib/buby/message_editor_tab.rb",
+    "lib/buby/message_editor_tab_factory.rb",
+    "lib/buby/parameter.rb",
+    "lib/buby/parameter/base.rb",
+    "lib/buby/parameter/body.rb",
+    "lib/buby/parameter/cookie.rb",
+    "lib/buby/parameter/url.rb",
+    "lib/buby/proxy_listener.rb",
+    "lib/buby/scan_issue.rb",
+    "lib/buby/scanner_check.rb",
+    "lib/buby/scanner_insertion_point.rb",
+    "lib/buby/scanner_insertion_point_provider.rb",
+    "lib/buby/scanner_listener.rb",
+    "lib/buby/scope_change_listener.rb",
+    "lib/buby/session_handling_action.rb",
+    "lib/buby/tab.rb",
+    "lib/buby/version.rb",
     "samples/drb_buby.rb",
     "samples/drb_sample_cli.rb",
     "samples/mechanize_burp.rb",
@@ -50,7 +132,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://tduehr.github.com/buby"
   s.rdoc_options = ["--main", "README.rdoc"]
-  s.require_paths = ["lib", "java", "java"]
+  s.require_paths = ["lib"]
   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"]
@@ -59,9 +141,12 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<rake-compiler>, ["~> 0.8.1"])
     else
+      s.add_dependency(%q<rake-compiler>, ["~> 0.8.1"])
     end
   else
+    s.add_dependency(%q<rake-compiler>, ["~> 0.8.1"])
   end
 end
 

data/{java/src → ext/buby/burp}/BurpExtender.java

@@ -1,14 +1,14 @@
-//import javax.annotation.PostConstruct; 
+package burp;
 
-import burp.IBurpExtender;
-import burp.IBurpExtenderCallbacks;
-import burp.IScanIssue;
-import burp.IHttpRequestResponse;
+import burp.*;
 
 import org.jruby.*;
 import org.jruby.javasupport.JavaUtil;
 import org.jruby.runtime.ThreadContext; 
-import org.jruby.runtime.builtin.IRubyObject; 
+import org.jruby.runtime.builtin.IRubyObject;
+import org.jruby.RubyBoolean;
+import java.util.List;
+import javax.swing.JMenuItem;
 
 /**
  * This is an implementation of the BurpExtender/IBurpExtender interface
@@ -17,14 +17,52 @@ import org.jruby.runtime.builtin.IRubyObject;
  * This is a complete implementation of the Burp Extender interfaces available
  * as of Burp Suite 1.4
  */
-public class BurpExtender implements IBurpExtender { 
-    public final static String INIT_METH =      "evt_extender_init";
-    public final static String PROXYMSG_METH =  "evt_proxy_message_raw";
-    public final static String HTTPMSG_METH =   "evt_http_message";
-    public final static String SCANISSUE_METH = "evt_scan_issue";
-    public final static String MAINARGS_METH =  "evt_commandline_args";
-    public final static String REG_METH =       "evt_register_callbacks";
-    public final static String CLOSE_METH =     "evt_application_closing";
+public class BurpExtender implements IBurpExtender, IExtensionStateListener, IHttpListener, IProxyListener, IScannerListener, IContextMenuFactory, IScopeChangeListener { 
+
+    // Legacy callbacks
+    public final static String L_CLOSE_METH     = "evt_application_closing";
+    public final static String L_HTTPMSG_METH   = "evt_http_message";
+    public final static String L_INIT_METH      = "evt_extender_init";
+    public final static String L_MAINARGS_METH  = "evt_commandline_args";
+    public final static String L_PROXYMSG_METH  = "evt_proxy_message_raw";
+    public final static String L_SCANISSUE_METH = "evt_scan_issue";
+    public final static String L_REG_METH       = "evt_register_callbacks";
+
+    // new style callbacks
+    public final static String INIT_METH        = "extender_initialize";
+    public final static String REG_METH         = "register_callbacks";
+    public final static String PROXYMSG_METH    = "process_proxy_message";
+    public final static String HTTPMSG_METH     = "process_http_messge";
+    public final static String SCANISSUE_METH   = "new_scan_issue";
+
+    // new callback methods
+    public final static String UNLOAD_METH      = "extension_unloaded";
+    public final static String MENUFAC_METH     = "create_menu_items";
+    public final static String SCOPE_METH       = "scope_changed";
+    
+
+    // Flag used to identify Burp Suite as a whole.
+    public static final int TOOL_SUITE = 0x00000001;
+    // Flag used to identify the Burp Target tool.
+    public static final int TOOL_TARGET = 0x00000002;
+    // Flag used to identify the Burp Proxy tool.
+    public static final int TOOL_PROXY = 0x00000004;
+    // Flag used to identify the Burp Spider tool.
+    public static final int TOOL_SPIDER = 0x00000008;
+    // Flag used to identify the Burp Scanner tool.
+    public static final int TOOL_SCANNER = 0x00000010;
+    // Flag used to identify the Burp Intruder tool.
+    public static final int TOOL_INTRUDER = 0x00000020;
+    // Flag used to identify the Burp Repeater tool.
+    public static final int TOOL_REPEATER = 0x00000040;
+    // Flag used to identify the Burp Sequencer tool.
+    public static final int TOOL_SEQUENCER = 0x00000080;
+    // Flag used to identify the Burp Decoder tool.
+    public static final int TOOL_DECODER = 0x00000100;
+    // Flag used to identify the Burp Comparer tool.
+    public static final int TOOL_COMPARER = 0x00000200;
+    // Flag used to identify the Burp Extender tool.
+    public static final int TOOL_EXTENDER = 0x00000400;
 
     // Internal reference to hold the ruby Burp handler
     private static IRubyObject r_obj = null;
@@ -37,7 +75,7 @@ public class BurpExtender implements IBurpExtender {
      * However, it is also possible to set this afterwards and even swap in 
      * new objects during runtime.
      */
-    public static void set_handler(IRubyObject hnd) { r_obj = hnd; }
+    public static void setHandler(IRubyObject hnd) { r_obj = hnd; }
 
     /** 
      * Returns the internal Ruby handler reference. 
@@ -45,7 +83,7 @@ public class BurpExtender implements IBurpExtender {
      * The handler is the ruby class or module used for proxying BurpExtender 
      * events into a ruby runtime.
      */
-    public static IRubyObject get_handler() { return r_obj; }
+    public static IRubyObject getHandler() { return r_obj; }
 
 
     /** 
@@ -59,6 +97,8 @@ public class BurpExtender implements IBurpExtender {
     public BurpExtender() {
       if (r_obj !=null && r_obj.respondsTo(INIT_METH))
         r_obj.callMethod(ctx(r_obj), INIT_METH, to_ruby(rt(r_obj), this));
+      if (r_obj !=null && r_obj.respondsTo(L_INIT_METH))
+        r_obj.callMethod(ctx(r_obj), L_INIT_METH, to_ruby(rt(r_obj), this));
     }
 
 
@@ -68,7 +108,7 @@ public class BurpExtender implements IBurpExtender {
      * startup. 
      *
      * This implementation invokes the method defined by 
-     * <code>MAINARGS_METH</code> in the Ruby handler if both the handler
+     * <code>L_MAINARGS_METH</code> in the Ruby handler if both the handler
      * and its ruby method are defined.
      *
      * It allows Ruby implementations to control aspects of their behaviour at 
@@ -81,8 +121,8 @@ public class BurpExtender implements IBurpExtender {
      * @param args The command-line arguments passed to Burp Suite on startup.
      */
     public void setCommandLineArgs(String[] args) {
-      if(r_obj != null && r_obj.respondsTo(MAINARGS_METH))
-        r_obj.callMethod(ctx(r_obj), MAINARGS_METH, to_ruby(rt(r_obj), args));
+      if(r_obj != null && r_obj.respondsTo(L_MAINARGS_METH))
+        r_obj.callMethod(ctx(r_obj), L_MAINARGS_METH, to_ruby(rt(r_obj), args));
     }
   
     /**
@@ -101,9 +141,25 @@ public class BurpExtender implements IBurpExtender {
      * <code>IBurpExtenderCallbacks</code> interface.
      */
     public void registerExtenderCallbacks(IBurpExtenderCallbacks cb) {
-      if(r_obj != null && r_obj.respondsTo(REG_METH)) {
-        cb.issueAlert("[BurpExtender] registering JRuby handler callbacks");
-        r_obj.callMethod(ctx(r_obj), REG_METH, to_ruby(rt(r_obj), cb));
+      cb.setExtensionName("Buby");
+      cb.issueAlert("[BurpExtender] registering JRuby handler callbacks");
+      cb.registerExtensionStateListener(this);
+      cb.registerHttpListener(this);
+      cb.registerScannerListener(this);
+      cb.registerContextMenuFactory(this);
+      cb.registerScopeChangeListener(this);
+      if(r_obj != null) {
+        boolean respondsLegacyRegister = r_obj.respondsTo(L_REG_METH);
+        boolean respondsRegister = r_obj.respondsTo(REG_METH);
+
+        IRubyObject args[] = {to_ruby(rt(r_obj), cb), RubyBoolean.newBoolean(rt(r_obj), false)};
+        if(respondsLegacyRegister && respondsRegister){
+          r_obj.callMethod(ctx(r_obj), REG_METH, args[0]);
+          r_obj.callMethod(ctx(r_obj), L_REG_METH, args);
+        } else if(respondsRegister){
+          r_obj.callMethod(ctx(r_obj), REG_METH, args[0]);
+        } else if(respondsLegacyRegister)
+          r_obj.callMethod(ctx(r_obj), L_REG_METH, args[0]);
       }
     }
 
@@ -112,7 +168,7 @@ public class BurpExtender implements IBurpExtender {
      * response is received. 
      *
      * This implementation simply passes all arguments to the Ruby handler's 
-     * method defined by <code>PROXYMSG_METH</code> if both the handler and
+     * method defined by <code>L_PROXYMSG_METH</code> if both the handler and
      * its ruby method are defined.
      *
      * This allows Ruby implementations to perform logging functions, modify 
@@ -145,6 +201,7 @@ public class BurpExtender implements IBurpExtender {
      * in the <code>message</code> paramater, or (b) a different object 
      * containing a modified message.
      */
+    @Deprecated
     public byte[] processProxyMessage( 
         int messageReference, 
         boolean messageIsRequest, 
@@ -160,7 +217,7 @@ public class BurpExtender implements IBurpExtender {
         int[] action ) 
     {
 
-      if (r_obj != null && r_obj.respondsTo(PROXYMSG_METH)) {
+      if (r_obj != null && r_obj.respondsTo(L_PROXYMSG_METH)) {
         Ruby rt = rt(r_obj);
         // prepare an alternate action value to present to ruby
         IRubyObject r_action = to_ruby(rt, action);
@@ -187,7 +244,7 @@ public class BurpExtender implements IBurpExtender {
         // slurp back in the action value in-case it's been changed
         action[0] = ((int[])r_action.toJava(int[].class))[0];
 
-        IRubyObject ret = r_obj.callMethod(ctx(r_obj), PROXYMSG_METH, pxy_msg);
+        IRubyObject ret = r_obj.callMethod(ctx(r_obj), L_PROXYMSG_METH, pxy_msg);
         if(ret != r_msg) {
           return (byte []) ret.toJava(byte[].class);
         }
@@ -196,8 +253,35 @@ public class BurpExtender implements IBurpExtender {
       return message;
     }
 
+    /**
+     * This method is invoked when an HTTP message is being processed by the
+     * Proxy.
+     *
+     * This method corresponds with Buby#process_proxy_message
+     *
+     * @param messageIsRequest Indicates whether the HTTP message is a request
+     * or a response.
+     * @param message An
+     * <code>IInterceptedProxyMessage</code> object that extensions can use to
+     * query and update details of the message, and control whether the message
+     * should be intercepted and displayed to the user for manual review or
+     * modification.
+     */
+    public void processProxyMessage(boolean messageIsRequest, IInterceptedProxyMessage message)
+    {
+      if (r_obj != null && r_obj.respondsTo(PROXYMSG_METH)) {
+        Ruby rt = rt(r_obj);
+        IRubyObject http_msg[] = {
+          to_ruby(rt, messageIsRequest),
+          to_ruby(rt, message)
+        };
+        r_obj.callMethod(ctx(r_obj), PROXYMSG_METH, http_msg);
+      }
+    }
+
     /** 
      * Added in Burp 1.2.09 
+     * @note Changed in Burp 1.5.01+
      * No javadoc yet but here's what the PortSwigger dev blog has to say:
      *
      * The processHttpMessage method is invoked whenever any of Burp's tools 
@@ -206,18 +290,47 @@ public class BurpExtender implements IBurpExtender {
      * can be used to intercept and modify the HTTP traffic of all Burp 
      * tools.
      */
+    @Deprecated
     public void processHttpMessage(
         String toolName, 
         boolean messageIsRequest, 
         IHttpRequestResponse messageInfo ) 
     {
-      if (r_obj != null && r_obj.respondsTo(HTTPMSG_METH)) {
+      if (r_obj != null && r_obj.respondsTo(L_HTTPMSG_METH)) {
         Ruby rt = rt(r_obj);
         IRubyObject http_msg[] = {
           to_ruby(rt, toolName),
           to_ruby(rt, messageIsRequest),
           to_ruby(rt, messageInfo)
         };
+    
+        r_obj.callMethod(ctx(r_obj), L_HTTPMSG_METH, http_msg);
+      }
+    }
+
+     /**
+     * @note This is the 1.5.01+ version of this callback
+      * This method is invoked when an HTTP request is about to be issued, and
+      * when an HTTP response has been received.
+      *
+      * @param toolFlag A flag indicating the Burp tool that issued the request.
+      * Burp tool flags are defined in the
+      * <code>IBurpExtenderCallbacks</code> interface.
+      * @param messageIsRequest Flags whether the method is being invoked for a
+      * request or response.
+      * @param messageInfo Details of the request / response to be processed.
+      * Extensions can call the setter methods on this object to update the
+      * current message and so modify Burp's behavior.
+      */
+     public void processHttpMessage(int toolFlag, boolean messageIsRequest, IHttpRequestResponse messageInfo)
+    {
+      if (r_obj != null && r_obj.respondsTo(HTTPMSG_METH)) {
+        Ruby rt = rt(r_obj);
+        IRubyObject http_msg[] = {
+          to_ruby(rt, toolFlag),
+          to_ruby(rt, messageIsRequest),
+          to_ruby(rt, messageInfo)
+        };
 
         r_obj.callMethod(ctx(r_obj), HTTPMSG_METH, http_msg);
       }
@@ -233,21 +346,23 @@ public class BurpExtender implements IBurpExtender {
     public void newScanIssue(IScanIssue issue) {
       if (r_obj != null && r_obj.respondsTo(SCANISSUE_METH))
         r_obj.callMethod(ctx(r_obj), SCANISSUE_METH, to_ruby(rt(r_obj), issue));
+      if (r_obj != null && r_obj.respondsTo(L_SCANISSUE_METH))
+        r_obj.callMethod(ctx(r_obj), L_SCANISSUE_METH, to_ruby(rt(r_obj), issue));
     }
 
 
     /**
      * This method is invoked immediately before Burp Suite exits. 
      * This implementation simply invokes the Ruby handler's method defined
-     * by <code>CLOSE_METH</code> if both the handler and its ruby method are
+     * by <code>L_CLOSE_METH</code> if both the handler and its ruby method are
      * defined.
      *
      * This allows implementations to carry out any clean-up actions necessary
      * (e.g. flushing log files or closing database resources, etc.).
      */
     public void applicationClosing() {
-      if (r_obj != null && r_obj.respondsTo(CLOSE_METH))
-        r_obj.callMethod(ctx(r_obj), CLOSE_METH);
+      if (r_obj != null && r_obj.respondsTo(L_CLOSE_METH))
+        r_obj.callMethod(ctx(r_obj), L_CLOSE_METH);
     }
 
     // Private method to return the ThreadContext for a given ruby object.
@@ -308,5 +423,50 @@ public class BurpExtender implements IBurpExtender {
      * to processProxyMessage.
      */
     public final static int ACTION_DONT_INTERCEPT_AND_REHOOK = 0x12;
+
+    /**
+     * Extensions can implement this interface and then call
+     * <code>IBurpExtenderCallbacks.registerExtensionStateListener()</code> to
+     * register an extension state listener. The listener will be notified of
+     * changes to the extension's state. <b>Note:</b> Any extensions that start
+     * background threads or open system resources (such as files or database
+     * connections) should register a listener and terminate threads / close
+     * resources when the extension is unloaded.
+     */
+    public void extensionUnloaded() {
+      if (r_obj != null && r_obj.respondsTo(UNLOAD_METH))
+        r_obj.callMethod(ctx(r_obj), UNLOAD_METH);
+    }
+
+    /**
+     * This method will be called by Burp when the user invokes a context menu
+     * anywhere within Burp. The factory can then provide any custom context
+     * menu items that should be displayed in the context menu, based on the
+     * details of the menu invocation.
+     *
+     * @param invocation An object that implements the
+     * <code>IMessageEditorTabFactory</code> interface, which the extension can
+     * query to obtain details of the context menu invocation.
+     * @return A list of custom menu items (which may include sub-menus,
+     * checkbox menu items, etc.) that should be displayed. Extensions may
+     * return
+     * <code>null</code> from this method, to indicate that no menu items are
+     * required.
+     */
+    public List<JMenuItem> createMenuItems(IContextMenuInvocation invocation) {
+      // IRubyObject ret = null;
+      if (r_obj != null && r_obj.respondsTo(MENUFAC_METH))
+        return (RubyArray)r_obj.callMethod(ctx(r_obj), MENUFAC_METH, to_ruby(rt(r_obj), invocation));
+      return null;
+    }
+
+    /**
+     * This method is invoked whenever a change occurs to Burp's suite-wide
+     * target scope.
+     */
+    public void scopeChanged() {
+      if (r_obj != null && r_obj.respondsTo(SCOPE_METH))
+        r_obj.callMethod(ctx(r_obj), SCOPE_METH);
+    }
 }