buby 1.5.2-java → 1.6.0-java

data/ext/burp_interfaces/burp/IResponseInfo.java

@@ -46,9 +46,28 @@ public interface IResponseInfo
      * This method is used to obtain details of the HTTP cookies set in the
      * response.
      *
-     * @return A list of
-     * <code>ICookie</code> objects representing the cookies set in the
-     * response, if any.
+     * @return A list of <code>ICookie</code> objects representing the cookies
+     * set in the response, if any.
      */
     List<ICookie> getCookies();
+
+    /**
+     * This method is used to obtain the MIME type of the response, as stated in
+     * the HTTP headers.
+     *
+     * @return A textual label for the stated MIME type, or an empty String if
+     * this is not known or recognized. The possible labels are the same as
+     * those used in the main Burp UI.
+     */
+    String getStatedMimeType();
+
+    /**
+     * This method is used to obtain the MIME type of the response, as inferred
+     * from the contents of the HTTP message body.
+     *
+     * @return A textual label for the inferred MIME type, or an empty String if
+     * this is not known or recognized. The possible labels are the same as
+     * those used in the main Burp UI.
+     */
+    String getInferredMimeType();
 }

data/lib/buby.rb

@@ -9,11 +9,11 @@ rescue NameError
   require 'burp_interfaces.jar'
 end
 
-# Buby is a mash-up of the commercial security testing web proxy PortSwigger 
-# Burp Suite(tm) allowing you to add scripting to Burp. Burp is driven from 
+# Buby is a mash-up of the commercial security testing web proxy PortSwigger
+# Burp Suite(tm) allowing you to add scripting to Burp. Burp is driven from
 # and tied to JRuby with a Java extension using the BurpExtender API.
 #
-# The Buby class is an abstract implementation of a BurpExtender ruby handler. 
+# The Buby class is an abstract implementation of a BurpExtender ruby handler.
 # Included are several abstract event handlers used from the BurpExtender
 # java implementation:
 # * evt_extender_init
@@ -28,8 +28,8 @@ end
 # * evt_scan_issue
 #
 #
-# This class also exposes several methods to access Burp functionality 
-# and user interfaces through the IBurpExtenderCallbacks interface 
+# This class also exposes several methods to access Burp functionality
+# and user interfaces through the IBurpExtenderCallbacks interface
 # (note, several abbreviated aliases also exist for each):
 # * doActiveScan
 # * doPassiveScan
@@ -42,10 +42,10 @@ end
 # * sendToRepeater
 # * sendToSpider
 #
-# Buby also provides front-end ruby methods for the various callback methods 
+# Buby also provides front-end ruby methods for the various callback methods
 # supported by Burp. New callbacks have been cropping up in newer Burp versions
-# frequently. 
-# 
+# frequently.
+#
 # Available since Burp 1.2.09:
 # * getProxyHistory
 # * getSiteMap
@@ -60,30 +60,27 @@ end
 # Available since Burp 1.2.17:
 # * exitSuite
 #
-# If you wish to access any of the IBurpExtenderCallbacks methods directly. 
+# If you wish to access any of the IBurpExtenderCallbacks methods directly.
 # You can use 'burp_callbacks' to obtain a reference.
 #
-# Credit:
-# * Burp and Burp Suite are trade-marks of PortSwigger Ltd.
-#     Copyright 2011 PortSwigger Ltd. All rights reserved.
-#     See http://portswigger.net for license terms.
-#
-# * This ruby library and the accompanying BurpExtender.java implementation 
-#   were written by Eric Monti @ Matasano Security. 
-#
-#   Matasano claims no professional or legal affiliation with PortSwigger LTD. 
-#   nor do we sell or officially endorse any of their products.
+# == CREDIT:
+# Burp and Burp Suite are trademarks of PortSwigger(ltd)
+#   Copyright 2013 PortSwigger Ltd. All rights reserved.
+#   See http://portswigger.net for license terms.
 #
-#   However, this author would like to express his personal and professional 
-#   respect and appreciation for their making available the BurpExtender 
-#   extension API. The availability of this interface in an already great tool
-#   goes a long way to make Burp Suite a truly first-class application.
+# This JRuby library and the accompanying Java and JRuby BurpExtender
+# implementations were written by Timur Duehr @ Matasano Security. The original
+# version of this library and BurpExtender.java implementation was written by
+# Eric Monti @ Matasano Security. Matasano Security claims no professional or
+# legal affiliation with PortSwigger LTD.
 #
-# * Forgive the name. It won out over "Burb" and "BurpRub". It's just easier 
-#   to type and say out-loud. Mike Tracy gets full credit as official 
-#   Buby-namer.
+# However, the authors would like to express their personal and professional
+# respect and admiration to Burp's authors and appreciation to PortSwigger for
+# the availability of the IBurpExtender extension API and its continued
+# improvement. The availability of this interface goes a long way to helping
+# make Burp Suite a truly first-class application.
 #
-# @todo move more to Java side
+# @todo move more to BurpExtender side
 class Buby
   autoload :ContextMenuFactory, 'buby/context_menu_factory'
   autoload :Cookie, 'buby/cookie'
@@ -108,9 +105,9 @@ class Buby
 
   # @deprecated moving to proper version module
   VERSION = Buby::Version::STRING
-  
+
   # latest tested version of burp
-  COMPAT_VERSION = '1.5.05'
+  COMPAT_VERSION = '1.5.17'
 
   # :stopdoc:
   # @deprecated to be removed next version
@@ -143,7 +140,7 @@ class Buby
 
   # Returns the internal reference to the IBupExtenderCallbacks instance.
   # This reference gets set from Java through the evt_register_callbacks
-  # method. It is exposed to allow you to access the IBurpExtenderCallbacks 
+  # method. It is exposed to allow you to access the IBurpExtenderCallbacks
   # instance directly if you so choose.
   def burp_callbacks; @burp_callbacks; end
 
@@ -159,10 +156,12 @@ class Buby
   # proceed with the scan.
   #
   # @overload doActiveScan(host, port, useHttps, request, insertionPointOffsets = nil)
-  #   @param [String] host The hostname of the remote HTTP server.
+  #   @param [String, java.net.URL, URI] host The hostname of the remote HTTP
+  #     server.
   #   @param [Fixnum] port The port of the remote HTTP server.
   #   @param [Boolean] useHttps Flags whether the protocol is HTTPS or HTTP.
-  #   @param [String, Array<byte>] request The full HTTP request.
+  #   @param [String, Array<byte>, IHttpRequestResponse] request The full HTTP
+  #     request.
   #   @param [Array<Array<Fixnum>>] insertionPointOffsets A list of index pairs
   #     representing the positions of the insertion points that should be
   #     scanned. Each item in the list must be an +int\[2]+ array containing the
@@ -174,6 +173,15 @@ class Buby
   #     representing the positions of the insertion points that should be
   #     scanned. Each item in the list must be an +int\[2]+ array containing the
   #     start and end offsets for the insertion point.
+  # @overload doActiveScan(service, request, insertionPointOffsets = nil)
+  #   @param [IHttpService] service Object describing host, port and protocol
+  #     for scan.
+  #   @param [IHttpRequestResponse, String, Array<byte>] request Request object
+  #     containing details about the request to scan.
+  #   @param [Array<Array<Fixnum>>] insertionPointOffsets A list of index pairs
+  #     representing the positions of the insertion points that should be
+  #     scanned. Each item in the list must be an +int\[2]+ array containing the
+  #     start and end offsets for the insertion point.
   # @overload doActiveScan(url, insertionPointOffsets = nil)
   #   @param [String, URI, java.net.URL] url Build a +GET+ request and scan url.
   #   @param [Array<Array<Fixnum>>] insertionPointOffsets A list of index pairs
@@ -183,166 +191,478 @@ class Buby
   # @return [IScanQueueItem] The resulting scan queue item.
   #
   def doActiveScan(*args)
-    host, port, https, req, ip_off = args
-    case args.size
-    when 1,2
-      req = args.first
-      ip_off = args[1]
-      if req.kind_of? Java::Burp::IHttpRequestResponse
-        serv = req.getHttpService
-        https = serv.getProtocol == "https"
+    raise ArgumentError, "wrong number of arguments calling '#{__callee__}' (#{args.size} for 1..5)" unless (1..5).include?(args.size)
+    host, port, https, req, ip_off = *args
+    if args.size < 4
+      case args.first
+      when Java::Burp::IHttpRequestResponse
+        raise ArgumentError, "wrong number/type of arguments calling '#{__callee__}' (#{args.size} for 1..5)" unless args.size < 3
+        req, ip_off = *args
+        host = req.host
+        port = req.port
+        https = req.protocol
+      when Java::Burp::IHttpService
+        raise ArgumentError, "wrong number/type of arguments calling '#{__callee__}' (#{args.size} for 1..5)" unless args.size
+        serv, req, ip_off = *args
+        https = serv.getProtocol
         host = serv.getHost
         port = serv.getPort
         req = req.request
       else
         url = (req.kind_of?(URI) || req.kind_of?(Java::JavaNet::URL)) ? req : Java::JavaNet::URL.new(req.to_s)
-        req = getHelpers.buildHttpRequest req
+        req = helpers.buildHttpRequest req
         host = url.host
         port = url.port
-        if url.scheme.downcase == "https"
-          https = true
-          port = 443 if port == -1
-        else
-          https = false
-          port = 80 if port == -1
-        end
+        https = url.respond_to? :scheme ? url.scheme : url.protocol
       end
-    when 4,5
-      host, port, https, req, ip_off = args
+    end
+
+    https = case https.to_s.downcase
+    when 'https'
+      true
+    when 'http'
+      false
     else
-      raise ArgumentError
+      !!https
     end
+
+    port ||= https ? 443 : 80
+    port = https ? 443 : 80 if port < 0
+    host = host.host if host.respond_to? :host
+
+    req = req.request if req.respond_to? :request
     req = req.to_java_bytes if req.respond_to? :to_java_bytes
     scanq = if getBurpVersion
-      _check_cb.doActiveScan(host, port, https, req, ip_off)
+      _check_and_callback :doActiveScan, host, port, https, req, ip_off
     else
-      _check_cb.doActiveScan(host, port, https, req)
+      _check_and_callback :doActiveScan, host, port, https, req
     end
     Buby::Implants::ScanQueueItem.implant scanq
   end
   alias do_active_scan doActiveScan
   alias active_scan doActiveScan
 
-  # Send an HTTP request and response to the Burp Scanner tool to perform a 
+  # Send an HTTP request and response to the Burp Scanner tool to perform a
   # passive vulnerability scan.
-  #  * host = The hostname of the remote HTTP server.
-  #  * port = The port of the remote HTTP server.
-  #  * https = Flags whether the protocol is HTTPS or HTTP.
-  #  * req  = The full HTTP request. (String or Java bytes[])
-  #  * rsp  = The full HTTP response. (String or Java bytes[])
-  def doPassiveScan(host, port, https, req, rsp)
-    req = req.to_java_bytes if req.is_a? String
-    rsp = rsp.to_java_bytes if rsp.is_a? String
-    _check_cb.doPassiveScan(host, port, https, req, rsp)
+  # @overload doPassiveScan(host, port, useHttps, request, response)
+  #   @param [String, java.net.URL, URI] host The hostname of the remote HTTP
+  #     server.
+  #   @param [Fixnum] port The port of the remote HTTP server.
+  #   @param [Boolean] useHttps Flags whether the protocol is HTTPS or HTTP.
+  #   @param [String, Array<byte>, IHttpRequestResponse] request The full HTTP request.
+  #   @param [String, Array<byte>, IHttpRequestResponse] response The full HTTP response.
+  # @overload doPassiveScan(host, port, useHttps, request_response)
+  #   @param [String, java.net.URL, URI] host The hostname of the remote HTTP
+  #     server.
+  #   @param [Fixnum] port The port of the remote HTTP server.
+  #   @param [Boolean] useHttps Flags whether the protocol is HTTPS or HTTP.
+  #   @param [String, Array<byte>, IHttpRequestResponse] request The full HTTP request and response.
+  # @overload doPassiveScan(service, request, response)
+  #   @param [IHttpService] service Object describing host, port and protocol
+  #     for scan.
+  #   @param [IHttpRequestResponse, String, Array<byte>] request Request object
+  #     containing details about the request to scan.
+  #   @param [IHttpRequestResponse, String, Array<byte>] request Request object
+  #     containing details about the response to scan.
+  # @overload doPassiveScan(service, request_response)
+  #   @param [IHttpService] service Object describing host, port and protocol
+  #     for scan.
+  #   @param [IHttpRequestResponse, String, Array<byte>] request Request object
+  #     containing details about the request to scan.
+  # @return [IScanQueueItem] The resulting scan queue item.
+  # @overload doPassiveScan(request)
+  #   @param [IHttpRequestResponse] request Request object containing details
+  #     about the request to scan.
+  #
+  def doPassiveScan(*args)
+    raise ArgumentError, "wrong number of arguments calling '#{__callee__}' (#{args.size} for 1..4)" unless (1..4).include?(args.size)
+    host, port, https, req, resp = *args
+    case args.size
+    when 1
+      req = args.first
+      host = req.getHost
+      port = req.getPort
+      https = req.getProtocol
+      resp = req.getResponse
+    when 2, 3
+      serv, req = *args
+      host = serv.getHost
+      port = serv.getPort
+      https = req.getProtocol
+      resp = (resp && resp.getResponse) || req.getResponse
+    when 4
+      resp = req.response
+    else
+      # nop
+    end
+
+    https = case https.to_s.downcase
+    when 'https'
+      true
+    when 'http'
+      false
+    else
+      !!https
+    end
+
+    port ||= https ? 443 : 80
+    port = https ? 443 : 80 if port < 0
+    host = host.host if host.respond_to? :host
+
+    req = req.request if req.respond_to? :request
+    req = req.to_java_bytes if req.respond_to? :to_java_bytes
+
+    resp = resp.response if resp.respond_to? :response
+    resp = resp.to_java_bytes if resp.respond_to? :to_java_bytes
+
+    Buby::Implants::ScanQueueItem.implant(_check_and_callback(:doPassiveScan, host, port, https, req, resp))
   end
   alias do_passive_scan doPassiveScan
   alias passive_scan doPassiveScan
 
   # Exclude the specified URL from the Suite-wide scope.
-  #  * url = The URL to exclude from the Suite-wide scope.
-  def excludeFromScope(url)
-    url = Java::JavaNet::URL.new(url) if url.is_a? String
-    _check_cb.excludeFromScope(url)
+  # @overload excludeFromScope(url)
+  #   @param [java.net.URL, URI, String] url The URL to exclude from the
+  #     Suite-wide scope.
+  # @overload excludeFromScope(req)
+  #   @param [IHttpRequestResponse] req The request to exclude from the
+  #     Suite-wide scope.
+  # @overload excludeFromScope(req_info)
+  #   @param [IRequestInfo] req_info The request information to exclude from
+  #     the Suite-wide scope.
+  # @overload excludeFromScope(serv, req)
+  #   @param [IHttpService] serv The HTTP service to exclude from the Suite-wide
+  #     scope.
+  #   @param [Array<byte>, String] req The request to exclude
+  #
+  # @return [void]
+  def excludeFromScope(*args)
+    url, req = args
+    case args.size
+    when 1
+      case url
+      when Java::Burp::IHttpRequestResponse,  Java::Burp::IRequestInfo
+        url = url.getUrl
+      else
+        url = Java::JavaNet::URL.new(url.to_s) unless url.is_a? Java::JavaNet::URL
+      end
+    when 2
+      url = getHelpers.__analyzeRequest(url, req).getUrl
+    else
+      raise ArgumentError, "wrong number of arguments calling '#{__callee__}' (#{args.size} for 1,2)"
+    end
+    _check_and_callback :excludeFromScope, url
   end
   alias exclude_from_scope excludeFromScope
   alias exclude_scope excludeFromScope
 
   # Include the specified URL in the Suite-wide scope.
-  #  * url = The URL to exclude in the Suite-wide scope.
-  def includeInScope(url)
-    url = Java::JavaNet::URL.new(url) if url.is_a? String
-    _check_cb.includeInScope(url)
+  # @overload includeInScope(url)
+  #   @param [java.net.URL, URI, String] url The URL to include in the
+  #     Suite-wide scope.
+  # @overload includeInScope(req)
+  #   @param [IHttpRequestResponse] req The request to include in the Suite-wide
+  #     scope.
+  # @overload includeInScope(req_info)
+  #   @param [IRequestInfo] req_info The request information to include in
+  #     the Suite-wide scope.
+  # @overload includeInScope(serv, req)
+  #   @param [IHttpService] serv The HTTP service to include in the Suite-wide
+  #     scope.
+  #   @param [Array<byte>, String] req The request to include
+  #
+  # @return [void]
+  def includeInScope(*args)
+    url, req = args
+    case args.size
+    when 1
+      case url
+      when Java::Burp::IHttpRequestResponse,  Java::Burp::IRequestInfo
+        url = url.getUrl
+      else
+        url = Java::JavaNet::URL.new(url.to_s) unless url.is_a? Java::JavaNet::URL
+      end
+    when 2
+      url = getHelpers.__analyzeRequest(url, req).getUrl
+    else
+      raise ArgumentError, "wrong number of arguments calling '#{__callee__}' (#{args.size} for 1,2)"
+    end
+    _check_and_callback :includeInScope, url
   end
-  alias include_in_scope includeInScope 
-  alias include_scope includeInScope 
+  alias include_in_scope includeInScope
+  alias include_scope includeInScope
 
   # Query whether a specified URL is within the current Suite-wide scope.
-  #  * url = The URL to query
-  #
-  # Returns: true / false
-  def isInScope(url)
-    url = Java::JavaNet::URL.new(url) if url.is_a? String
-    _check_cb.isInScope(url)
+  # @overload isInScope(url)
+  #   @param [java.net.URL, URI, String] url The URL to query
+  # @overload isInScope(req)
+  #   @param [IHttpRequestResponse] req The request to query
+  # @overload isInScope(req_info)
+  #   @param [IRequestInfo] req_info The request info to query
+  # @overload isInScope(serv, req)
+  #   @param [IHttpService] serv The HTTP service to query
+  #   @param [Array<byte>, String] req The request to query
+  #
+  # @return [Boolean]
+  def isInScope(*args)
+    url, req = args
+    case args.size
+    when 1
+      case url
+      when Java::Burp::IHttpRequestResponse,  Java::Burp::IRequestInfo
+        url = url.getUrl
+      else
+        url = Java::JavaNet::URL.new(url.to_s) unless url.is_a? Java::JavaNet::URL
+      end
+    when 2
+      url = getHelpers.__analyzeRequest(url, req).getUrl
+    else
+      raise ArgumentError, "wrong number of arguments calling '#{__callee__}' (#{args.size} for 1,2)"
+    end
+    _check_and_callback :isInScope, url
   end
   alias is_in_scope isInScope
   alias in_scope? isInScope
 
   # Display a message in the Burp Suite alerts tab.
-  #  * msg =  The alert message to display.
+  # @param [#to_s] msg The alert message to display.
+  # @return [void]
   def issueAlert(msg)
-    _check_cb.issueAlert(msg.to_s)
+    _check_and_callback :issueAlert, msg.to_s
   end
   alias issue_alert issueAlert
   alias alert issueAlert
 
   # Issue an arbitrary HTTP request and retrieve its response
-  #  * host  = The hostname of the remote HTTP server.
-  #  * port  = The port of the remote HTTP server.
-  #  * https = Flags whether the protocol is HTTPS or HTTP.
-  #  * req   = The full HTTP request. (String or Java bytes[])
-  #
-  # also may be called with new IHttpService as an argument
-  #  * service = IHttpService object with host, port, etc.
-  #  * request = request string
-  # @return The full response retrieved from the remote server.
+  # @overload makeHttpRequest(host, port, https, request)
+  #   @param [String, java.net.URL, URI] host The hostname of the remote HTTP
+  #     server.
+  #   @param [Fixnum] port The port of the remote HTTP server.
+  #   @param [Boolean] useHttps Flags whether the protocol is HTTPS or HTTP.
+  #   @param [String, Array<byte>, IHttpRequestResponse] request The full HTTP
+  #     request.
+  # @overload makeHttpRequest(request)
+  #   @param [IHttpRequestResponse] request The full HTTP request
+  # @overload makeHttpRequest(url)
+  #   @param [String, URI, java.net.URL] url The url to make a GET request to.
+  #     The request is built with {ExtensionHelpers#buildHttpRequest}
+  # @overload makeHttpRequest(service, request)
+  #   @param [IHttpService] service Object with host, port, etc.
+  #   @param [String, Array<byte>, IHttpRequestResponse] request The full HTTP
+  #     request.
+  # @return [String] The full response retrieved from the remote server.
   #
   def makeHttpRequest(*args)
-    ret = case args.size
+    raise ArgumentError, "wrong number of arguments calling '#{__callee__}' (#{args.size} for 1,2,4)" unless [1,2,4].include?(args.size)
+    host, port, https, req, serv = args
+
+    case args.size
+    when 1
+      case host
+      when Java::Burp::IHttpRequestResponse
+        req = host
+        serv = req.getHttpService
+      else
+        host = Java::JavaNet::URL.new host.to_s unless host.kind_of?(Java::JavaNet::URL)
+        port = host.port
+        https = host.protocol
+        req = getHelpers.__buildHttpRequest host
+        https = case https.to_s.downcase
+        when 'https'
+          true
+        when 'http'
+          false
+        else
+          !!https
+        end
+
+        port ||= https ? 443 : 80
+        port = https ? 443 : 80 if port < 0
+
+        host = host.host if host.respond_to? :host
+        serv = getHelpers.buildHttpService(host, port, https)
+      end
     when 2
-      service, req = args
-      req = req.to_java_bytes if req.is_a? String
-      _check_and_callback(:makeHttpRequst, service, req)
+      serv, req = args
     when 4
-      host, port, https, req = args
-      req = req.to_java_bytes if req.is_a? String
-      _check_cb.makeHttpRequest(host, port, https, req)
+      # nop
     else
       raise ArgumentError
     end
-    String.from_java_bytes(ret)
+
+    req = req.request if req.respond_to? :request
+    req = req.to_java_bytes if req.respond_to? :to_java_bytes
+
+    ret = if serv
+      _check_and_callback(:makeHttpRequest, serv, req)
+    else
+      String.from_java_bytes _check_and_callback(:makeHttpRequest, host, port, https, req)
+    end
   end
   alias make_http_request makeHttpRequest
   alias make_request makeHttpRequest
 
   # Send an HTTP request to the Burp Intruder tool
-  #  * host  = The hostname of the remote HTTP server.
-  #  * port  = The port of the remote HTTP server.
-  #  * https = Flags whether the protocol is HTTPS or HTTP.
-  #  * req   = The full HTTP request.  (String or Java bytes[])
-  #  * ip_off = A list of index pairs representing the
-  #  * positions of the insertion points that should be scanned. Each item in
-  #  * the list must be an int[2] array containing the start and end offsets
-  #  * for the insertion point. *1.4.04+* only
-  #  * 
-  def sendToIntruder(host, port, https, req, ip_off)
-    req = req.to_java_bytes if req.is_a? String
+  #
+  # @overload sendToIntruder(host, port, https, req, ip_off=nil)
+  #   @param [String] host The hostname of the remote HTTP server.
+  #   @param [Fixnum] port The port of the remote HTTP server.
+  #   @param [Boolean, #to_s] https Flags whether the protocol is HTTPS or HTTP.
+  #   @param [String, Array<byte>, IHttpRequestResponse] req The full HTTP
+  #     request.
+  #   @param [Array<Array<Fixnum>>] ip_off A list of index pairs representing
+  #     the positions of the insertion points that should be scanned. Each item
+  #     in the list must be an +int[2]+ array containing the start and end
+  #     offsets for the insertion point.
+  # @overload sendToIntruder(request, ip_off=nil)
+  #   @param [IHttpRequestResponse] request The complete request to send to
+  #     Intruder.
+  #   @param [Array<Array<Fixnum>>] ip_off A list of index pairs representing
+  #     the positions of the insertion points that should be scanned. Each item
+  #     in the list must be an +int[2]+ array containing the start and end
+  #     offsets for the insertion point.
+  # @overload sendToIntruder(service, request, ip_off=nil)
+  #   @param [IHttpService] service The HTTP service description for the request
+  #   @param [IHttpRequestResponse, String, Array<byte>] request The complete
+  #     request to send to Intruder. If +String+ or +Array<byte>+ the request
+  #     will first be analyzed with #analyzeRequest to obtain the required
+  #     information
+  #   @param [Array<Array<Fixnum>>] ip_off A list of index pairs representing
+  #     the positions of the insertion points that should be scanned. Each item
+  #     in the list must be an +int[2]+ array containing the start and end
+  #     offsets for the insertion point.
+  #
+  # @return [void]
+  def sendToIntruder(*args)
+    host, port, https, req, ip_off = nil
+    case args.first
+    when String
+      raise ArgumentError, "wrong number/type of arguments calling '#{__callee__}' (#{args.size} for 1..5)" unless [4,5].include?(args.size)
+      host, port, https, req, ip_off = *args
+    when Java::Burp::IHttpRequestResponse
+      raise ArgumentError, "wrong number/type of arguments calling '#{__callee__}' (#{args.size} for 1..5)" unless [1,2].include?(args.size)
+      req, ip_off = *args
+      port  = req.port
+      https = req.protocol
+      host  = req.host
+    when Java::Burp::IHttpService
+      raise ArgumentError, "wrong number/type of arguments calling '#{__callee__}' (#{args.size} for 1..5)" unless [2,3].include?(args.size)
+      serv, req, ip_off = *args
+      port  = serv.port
+      https = serv.protocol
+      host  = serv.host
+    else
+      raise ArgumentError, "wrong number/type of arguments calling '#{__callee__}' (#{args.size} for 1..5)"
+    end
+
+    https = case https.to_s.downcase
+    when 'https'
+      true
+    when 'http'
+      false
+    else
+      !!https
+    end
+
+    req = req.request if req.respond_to?(:request)
+    req = req.to_java_bytes if req.respond_to?(:to_java_bytes)
     if self.getBurpVersion.to_a[1..-1].join(".") < "1.4.04"
-      _check_cb.sendToIntruder(host, port, https, req)
+      _check_and_callback :sendToIntruder, host, port, https, req
     else
-      _check_cb.sendToIntruder(host, port, https, req, ip_off)
+      _check_and_callback :sendToIntruder, host, port, https, req, ip_off
     end
   end
   alias send_to_intruder sendToIntruder
   alias intruder sendToIntruder
 
+  # This method can be used to send data to the Comparer tool.
+  #
+  # @overload sendToComparer(data)
+  #   @param [Array<Byte>, String] data The data to be sent to Comparer.
+  # @overload sendToComparer(data, use_req=nil)
+  #   @param [IHttpRequestResponse] data Request/Response to be sent to Comparer.
+  #   @param [Boolean] use_req Use request instead of response
+  #
+  def sendToComparer(data, use_req=nil)
+    if data.kind_of? Java::Burp::IHttpRequestResponse
+      data = use_req ? data.request : data.response
+    end
+    data = data.to_java_bytes if data.respond_to? :to_java_bytes
+    _check_and_callback(:sendToComparer, data)
+  end
+  alias send_to_comparer sendToComparer
+  alias comparer sendToComparer
+
   # Send an HTTP request to the Burp Repeater tool.
-  #  * host  = The hostname of the remote HTTP server.
-  #  * port  = The port of the remote HTTP server.
-  #  * https = Flags whether the protocol is HTTPS or HTTP.
-  #  * req   = The full HTTP request. (String or Java bytes[])
-  #  * tab   = The tab caption displayed in Repeater. (default: auto-generated)
-  def sendToRepeater(host, port, https, req, tab=nil)
-    req = req.to_java_bytes if req.is_a? String
-    _check_cb.sendToRepeater(host, port, https, req, tab)
+  #
+  # @overload sendToRepeater(host, port, https, req, tab=nil)
+  #   @param [String] host The hostname of the remote HTTP server.
+  #   @param [Fixnum] port The port of the remote HTTP server.
+  #   @param [Boolean, #to_s] https Flags whether the protocol is HTTPS or HTTP.
+  #   @param [String, Array<byte>, IHttpRequestResponse] req The full HTTP
+  #     request. (String or Java +byte[]+)
+  #   @param [String] tab The tab caption displayed in Repeater. (default:
+  #     auto-generated)
+  # @overload sendToRepeater(service, request, tab=nil)
+  #   @param [IHttpService] service The HTTP service description for the request
+  #   @param [IHttpRequestResponse, String, Array<byte>] request The complete
+  #     request to send to Intruder. If +String+ or +Array<byte>+ the request
+  #     will first be analyzed with #analyzeRequest to obtain the required
+  #     information
+  #   @param [String] tab The tab caption displayed in Repeater. (default:
+  #     auto-generated)
+  # @overload sendToRepeater(request, tab=nil)
+  #   @param [IHttpRequestResponse] request The request to be sent to Repeater
+  #     containing all the required information.
+  #   @param [String] tab The tab caption displayed in Repeater. (default:
+  #     auto-generated)
+  # @return [void]
+  def sendToRepeater(*args)
+    host, port, https, req, tab = nil
+    case args.first
+    when String
+      raise ArgumentError, "wrong number/type of arguments calling '#{__callee__}' (#{args.size} for 1..5)" unless [4,5].include?(args.size)
+      host, port, https, req, tab = *args
+    when Java::Burp::IHttpRequestResponse
+      raise ArgumentError, "wrong number/type of arguments calling '#{__callee__}' (#{args.size} for 1..5)" unless [1,2].include?(args.size)
+      req, tab = *args
+      port  = req.port
+      https = req.protocol
+      host  = req.host
+    when Java::Burp::IHttpService
+      raise ArgumentError, "wrong number/type of arguments calling '#{__callee__}' (#{args.size} for 1..5)" unless [2,3].include?(args.size)
+      serv, req, tab = *args
+      port  = serv.port
+      https = serv.protocol
+      host  = serv.host
+    else
+      raise ArgumentError, "wrong number/type of arguments calling '#{__callee__}' (#{args.size} for 1..5)"
+    end
+
+    https = case https.to_s.downcase
+    when 'https'
+      true
+    when 'http'
+      false
+    else
+      !!https
+    end
+
+    req = req.request if req.kind_of?(Java::Burp::IHttpRequestResponse)
+    req = req.to_java_bytes if req.respond_to?(:to_java_bytes)
+    _check_and_callback :sendToRepeater, host, port, https, req, tab
   end
   alias send_to_repeater sendToRepeater
   alias repeater sendToRepeater
 
   # Send a seed URL to the Burp Spider tool.
-  #  * url = The new seed URL to begin spidering from.
+  #  @param [String, URI, java.net.URL, IHttpRequestResponse] url The new seed URL to begin
+  #    spidering from.
+  #  @return [void]
   def sendToSpider(url)
-    url = Java::JavaNet::URL.new(url) if url.is_a? String
-    _check_cb.sendToSpider(url)
+    url = url.url if url.respond_to? :url
+    url = Java::JavaNet::URL.new(url.to_s) unless url.kind_of?(Java::JavaNet::URL)
+    _check_and_callback :sendToSpider, url
   end
   alias send_to_spider sendToSpider
   alias spider sendToSpider
@@ -354,17 +674,18 @@ class Buby
   # * meth = string or symbol name of method
   # * args = variable length array of arguments to pass to meth
   def _check_and_callback(meth, *args, &block)
-    cb = _check_cb
-    unless cb.respond_to?(meth)
+    begin
+      _check_cb.__send__ meth, *args, &block
+    rescue NoMethodError
       raise "#{meth} is not available in your version of Burp"
     end
-    cb.__send__ meth, *args, &block
   end
 
 
-  # Returns a Java array of IHttpRequestResponse objects pulled directly from 
+  # Returns a Java array of IHttpRequestResponse objects pulled directly from
   # the Burp proxy history.
   # @todo Bring IHttpRequestResponse helper up to date
+  # @return [HttpRequestResponseList]
   def getProxyHistory
     HttpRequestResponseList.new(_check_and_callback(:getProxyHistory))
   end
@@ -372,23 +693,26 @@ class Buby
   alias get_proxy_history getProxyHistory
 
 
-  # Returns a Java array of IHttpRequestResponse objects pulled directly from 
-  # the Burp site map for all urls matching the specified literal prefix. 
+  # Returns a Java array of IHttpRequestResponse objects pulled directly from
+  # the Burp site map for all urls matching the specified literal prefix.
   # The prefix can be nil to return all objects.
   # @todo Bring IHttpRequestResponse helper up to date
+  # @param [String, java.net.URL, URI, nil] urlprefix
+  # @return [HttpRequestResponseList]
   def getSiteMap(urlprefix=nil)
-    HttpRequestResponseList.new(_check_and_callback(:getSiteMap, urlprefix))
+    HttpRequestResponseList.new(_check_and_callback(:getSiteMap, urlprefix && urlprefix.to_s))
   end
   alias site_map getSiteMap
   alias get_site_map getSiteMap
 
 
-  # This method returns all of the current scan issues for URLs matching the 
+  # This method returns all of the current scan issues for URLs matching the
   # specified literal prefix. The prefix can be nil to match all issues.
   #
-  # IMPORTANT: This method is only available with Burp 1.2.15 and higher.
+  # @param [String, java.net.URL, URI, nil] urlprefix
+  # @return [ScanIssuesList]
   def getScanIssues(urlprefix=nil)
-    ScanIssuesList.new( _check_and_callback(:getScanIssues, urlprefix) )
+    ScanIssuesList.new( _check_and_callback(:getScanIssues, urlprefix && urlprefix.to_s) )
   end
   alias scan_issues getScanIssues
   alias get_scan_issues getScanIssues
@@ -399,7 +723,9 @@ class Buby
   #
   # IMPORTANT: This method is only available with Burp 1.2.09 and higher.
   #
-  # * filename = path and filename of the file to restore from
+  # @param [String, java.io.File] filename path and filename of the file to
+  #   restore from
+  # @return [void]
   def restoreState(filename)
     _check_and_callback(:restoreState, Java::JavaIo::File.new(filename))
   end
@@ -410,25 +736,25 @@ class Buby
   #
   # IMPORTANT: This method is only available with Burp 1.2.09 and higher.
   #
-  # * filename = path and filename of the file to save to
+  # @param [String, java.io.File] filename path and filename of the file to
+  #   save to
+  # @return [void]
   def saveState(filename)
     _check_and_callback(:saveState, Java::JavaIo::File.new(filename))
   end
   alias save_state saveState
 
 
-  # Parses a raw HTTP request message and returns an associative array 
-  # containing parameters as they are structured in the 'Parameters' tab in the 
+  # Parses a raw HTTP request message and returns an associative array
+  # containing parameters as they are structured in the 'Parameters' tab in the
   # Burp request UI.
   #
-  # IMPORTANT: This method is only available with Burp 1.2.09+ and deprecated in 1.5.01
-  #
   # This method parses the specified request and returns details of each
   # request parameter.
   #
-  # @param request The request to be parsed.
-  # @return An array of:
-  #   <code>String[] { name, value, type }</code> containing details of the
+  # @note This method is only available with Burp 1.2.09+ and is deprecated in 1.5.01+
+  # @param [Array<btye>, String] request The request to be parsed.
+  # @return [Array<Array<String{ name, value, type }>>] details of the
   #   parameters contained within the request.
   # @deprecated Use +IExtensionHelpers.analyzeRequest()+ instead.
   #
@@ -441,19 +767,17 @@ class Buby
 
 
   # Parses a raw HTTP message (request or response ) and returns an associative
-  # array containing the headers as they are structured in the 'Headers' tab 
+  # array containing the headers as they are structured in the 'Headers' tab
   # in the Burp request/response viewer UI.
   #
-  # IMPORTANT: This method is only available with Burp 1.2.09+ and is deprecated in 1.5.01
-  #
   # This method parses the specified request and returns details of each HTTP
   # header.
   #
-  # @param message The request to be parsed.
-  # @return An array of HTTP headers.
-  # @deprecated Use
-  # <code>IExtensionHelpers.analyzeRequest()</code> or
-  # <code>IExtensionHelpers.analyzeResponse()</code> instead.
+  # @note This method is only available with Burp 1.2.09+ and is deprecated in 1.5.01+
+  # @param [Array<byte>, String] message The request to be parsed.
+  # @return [Array<Array<String>>] An array of HTTP headers.
+  # @deprecated Use +IExtensionHelpers.analyzeRequest+ or
+  #   +IExtensionHelpers.analyzeResponse()+ instead.
   #
   def getHeaders(message)
     message = message.to_java_bytes if message.is_a? String
@@ -464,8 +788,10 @@ class Buby
 
   # Shuts down Burp programatically. If the method returns the user cancelled
   # the shutdown prompt.
+  # @param [Boolean] prompt_user Display a dialog to confirm shutdown
+  # @return [void]
   def exitSuite(prompt_user=false)
-    _check_and_callback(:exitSuite, prompt_user ? true : false)
+    _check_and_callback(:exitSuite, prompt_user)
   end
   alias exit_suite exitSuite
   alias close exitSuite
@@ -478,8 +804,7 @@ class Buby
   # @param menuItemHandler The handler to be invoked when the user clicks on
   # the menu item.
   # @deprecated Use {#registerContextMenuFactory} instead.
-  #
-  # This method is only available with Burp 1.3.07+ and is deprecated in 1.5.01.
+  # @note This method is only available with Burp 1.3.07+ and is deprecated in 1.5.01.
   #
   def registerMenuItem(menuItemCaption, menuItemHandler = nil, &block)
     ret = if block_given?
@@ -497,8 +822,9 @@ class Buby
   # This method can be used to add an item to Burp's site map with the
   # specified request/response details. This will overwrite the details
   # of any existing matching item in the site map.
-  # 
-  # @param item Details of the item to be added to the site map
+  #
+  # @param [IHttpRequestResponse] item Details of the item to be added to the
+  #   site map
   #
   # This method is only available with Burp 1.3.09+
   def addToSiteMap(item)
@@ -509,8 +835,8 @@ class Buby
   # This method causes Burp to save all of its current configuration as a
   # Map of name/value Strings.
   #
-  # @return A Map of name/value Strings reflecting Burp's current
-  # configuration.
+  # @return [java.util.Map] A Map of name/value Strings reflecting Burp's
+  #   current configuration.
   #
   # This method is only available with Burp 1.3.09+
   def saveConfig
@@ -523,14 +849,15 @@ class Buby
   # name/value Strings provided. Any settings not specified in the Map will
   # be restored to their default values. To selectively update only some
   # settings and leave the rest unchanged, you should first call
-  # <code>saveConfig</code> to obtain Burp's current configuration, modify
-  # the relevant items in the Map, and then call <code>loadConfig</code>
-  # with the same Map.
+  # +saveConfig+ to obtain Burp's current configuration, modify the relevant
+  # items in the Map, and then call +loadConfig+ with the same Map.
   #
-  # @param config A map of name/value Strings to use as Burp's new
-  # configuration.
+  # @param [Hash, java.util.Map] config A map of name/value Strings to use as
+  #   Burp's new configuration.
+  # @return [void]
   #
   # This method is only available with Burp 1.3.09+
+  # @todo updateConfig
   def loadConfig(config)
     _check_and_callback(:loadConfig, config)
   end
@@ -540,10 +867,11 @@ class Buby
   ## 1.4 methods ##
 
   # This method sets the interception mode for Burp Proxy.
-  # 
-  # @param enabled Indicates whether interception of proxy messages should 
-  # be enabled.
-  # 
+  #
+  # @param [Boolean] enabled Indicates whether interception of proxy messages
+  #   should be enabled.
+  # @return [void]
+  #
   def setProxyInterceptionEnabled(enabled)
     _check_and_callback(:setProxyInterceptionEnabled, enabled)
   end
@@ -551,8 +879,7 @@ class Buby
   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.
-  # @return String array containing the product name, major version, and minor version.
+  # @return [Array<String>] the product name, major version, and minor version.
   def getBurpVersion
     begin
       _check_and_callback(:getBurpVersion)
@@ -614,6 +941,29 @@ class Buby
   alias stderr getStderr
   alias get_stderr getStderr
 
+
+  # This method prints a line of output to the current extension's standard
+  # output stream.
+  #
+  # @param output The message to print.
+  # @return [void]
+  #
+  def printOutput(output)
+    _check_and_callback(:printOutput, output)
+  end
+  alias print_output printOutput
+
+  # This method prints a line of output to the current extension's standard
+  # error stream.
+  #
+  # @param error The message to print.
+  # @return [void]
+  #
+  def printError(error)
+    _check_and_callback(:printError, error)
+  end
+  alias print_error printError
+
   # This method is used to register a listener which 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
@@ -636,6 +986,31 @@ class Buby
   end
   alias register_extension_state_listener registerExtensionStateListener
 
+
+  # This method is used to retrieve the extension state listeners that are
+  # registered by the extension.
+  #
+  # @return [Array<IExtensionStateListener>] A list of extension state listeners
+  #   that are currently registered by this extension.
+  #
+  def getExtensionStateListeners
+    _check_and_callback(:getExtensionStateListeners)
+  end
+  alias get_extension_state_listeners getExtensionStateListeners
+  alias extension_state_listeners getExtensionStateListeners
+
+
+  # This method is used to remove an extension state listener that has been
+  # registered by the extension.
+  #
+  # @param listener The extension state listener to be removed.
+  # @return [void]
+  #
+  def removeExtensionStateListener(listener)
+    _check_and_callback(:removeExtensionStateListener, listener)
+  end
+  alias remove_extension_state_listener removeExtensionStateListener
+
   # This method is used to register a listener which will be notified of
   # requests and responses made by any Burp tool. Extensions can perform
   # custom analysis or modification of these messages by registering an HTTP
@@ -656,6 +1031,29 @@ class Buby
   end
   alias register_http_listener registerHttpListener
 
+  # This method is used to retrieve the HTTP listeners that are registered by
+  # the extension.
+  #
+  # @return [Array<IHttpListener>] A list of HTTP listeners that are currently
+  #   registered by this extension.
+  #
+  def getHttpListeners
+    _check_and_callback(:getHttpListeners)
+  end
+  alias get_http_listeners getHttpListeners
+  alias http_listeners getHttpListeners
+
+  # This method is used to remove an HTTP listener that has been registered
+  # by the extension.
+  #
+  # @param listener The HTTP listener to be removed.
+  # @return [void]
+  #
+  def removeHttpListener(listener)
+    _check_and_callback(:removeHttpListener, listener)
+  end
+  alias remove_http_listener removeHttpListener
+
   # This method is used to register a listener which will be notified of
   # requests and responses being processed by the Proxy tool. Extensions can
   # perform custom analysis or modification of these messages, and control
@@ -676,6 +1074,29 @@ class Buby
   end
   alias register_proxy_listener registerProxyListener
 
+  # This method is used to retrieve the Proxy listeners that are registered
+  # by the extension.
+  #
+  # @return [Array<IProxyListener>] A list of Proxy listeners that are currently
+  #   registered by this extension.
+  #
+  def getProxyListeners
+    _check_and_callback(:getProxyListeners)
+  end
+  alias get_proxy_listeners getProxyListeners
+  alias proxy_listeners getProxyListeners
+
+  # This method is used to remove a Proxy listener that has been registered
+  # by the extension.
+  #
+  # @param [IProxyListener] listener The Proxy listener to be removed.
+  # @return [void]
+  #
+  def removeProxyListener(listener)
+    _check_and_callback(:removeProxyListener, listener)
+  end
+  alias remove_proxy_listener removeProxyListener
+
   # This method is used to register a listener which will be notified of new
   # issues that are reported by the Scanner tool. Extensions can perform
   # custom analysis or logging of Scanner issues by registering a Scanner
@@ -696,6 +1117,29 @@ class Buby
   end
   alias register_scanner_listener registerScannerListener
 
+  # This method is used to retrieve the Scanner listeners that are registered
+  # by the extension.
+  #
+  # @return [Array<IScannerListener>] A list of Scanner listeners that are
+  #   currently registered by this extension.
+  #
+  def getScannerListeners
+    _check_and_callback(:getScannerListeners)
+  end
+  alias get_scanner_listeners getScannerListeners
+
+
+  # This method is used to remove a Scanner listener that has been registered
+  # by the extension.
+  #
+  # @param listener The Scanner listener to be removed.
+  # @return void
+  #
+  def removeScannerListener(listener)
+    _check_and_callback(:removeScannerListener, listener)
+  end
+  alias remove_scanner_listener removeScannerListener
+
   # This method is used to register a listener which will be notified of
   # changes to Burp's suite-wide target scope.
   #
@@ -713,6 +1157,30 @@ class Buby
     end
   end
 
+  # This method is used to retrieve the scope change listeners that are
+  # registered by the extension.
+  #
+  # @return [Array<IScopeChangeListener>] A list of scope change listeners that
+  #   are currently registered by this extension.
+  #
+  def getScopeChangeListeners
+    _check_and_callback(:getScopeChangeListeners)
+  end
+  alias get_scope_change_listeners getScopeChangeListeners
+  alias scope_change_listeners getScopeChangeListeners
+
+  # This method is used to remove a scope change listener that has been
+  # registered by the extension.
+  #
+  # @param [IScopeChangeListener] listener The scope change listener to be
+  #   removed.
+  # @return [void]
+  #
+  def removeScopeChangeListener(listener)
+    _check_and_callback(:removeScopeChangeListener, listener)
+  end
+  alias remove_scope_change_listener removeScopeChangeListener
+
   # This method is used to register a factory for custom context menu items.
   # When the user invokes a context menu anywhere within Burp, the factory
   # will be passed details of the invocation event, and asked to provide any
@@ -737,6 +1205,29 @@ class Buby
   end
   alias register_context_menu_factory registerContextMenuFactory
 
+  # This method is used to retrieve the context menu factories that are
+  # registered by the extension.
+  #
+  # @return [Array<IContextMenuFactory>] A list of context menu factories that
+  #   are currently registered by this extension.
+  #
+  def getContextMenuFactories
+    _check_and_callback(:getContextMenuFactories)
+  end
+  alias get_context_menu_factories getContextMenuFactories
+  alias context_menu_factories getContextMenuFactories
+
+  # This method is used to remove a context menu factory that has been
+  # registered by the extension.
+  #
+  # @param [IContextMenuFactory] factory The context menu factory to be removed.
+  # @return [void]
+  #
+  def removeContextMenuFactory(factory)
+    _check_and_callback(:removeContextMenuFactory, factory)
+  end
+  alias remove_context_menu_factory removeContextMenuFactory
+
   # This method is used to register a factory for custom message editor tabs.
   # For each message editor that already exists, or is subsequently created,
   # within Burp, the factory will be asked to provide a new instance of an
@@ -762,6 +1253,30 @@ class Buby
   end
   alias register_message_editor_tab_factory registerMessageEditorTabFactory
 
+  # This method is used to retrieve the message editor tab factories that are
+  # registered by the extension.
+  #
+  # @return [Array<IMessageEditorTabFactory>] A list of message editor tab
+  #   factories that are currently registered by this extension.
+  #
+  def getMessageEditorTabFactories
+    _check_and_callback(:getMessageEditorTabFactories)
+  end
+  alias get_message_editor_tab_factories getMessageEditorTabFactories
+  alias message_editor_tab_factories getMessageEditorTabFactories
+
+  # This method is used to remove a message editor tab factory that has been
+  # registered by the extension.
+  #
+  # @param [IMessageEditorTabFactory] factory The message editor tab factory to
+  #   be removed.
+  # @return [void]
+  #
+  def removeMessageEditorTabFactory(factory)
+    _check_and_callback(:removeMessageEditorTabFactory, factory)
+  end
+  alias remove_message_editor_tab_factory removeMessageEditorTabFactory
+
   # This method is used to register a provider of Scanner insertion points.
   # For each base request that is actively scanned, Burp will ask the
   # provider to provide any custom scanner insertion points that are
@@ -783,6 +1298,29 @@ class Buby
   end
   alias register_scanner_insertion_point_provider registerScannerInsertionPointProvider
 
+  # This method is used to retrieve the Scanner insertion point providers
+  # that are registered by the extension.
+  #
+  # @return [Array<IScannerInsertionPointProvider>] A list of Scanner insertion
+  #   point providers that are currently registered by this extension.
+  #
+  def getScannerInsertionPointProviders
+    _check_and_callback(:getScannerInsertionPointProviders)
+  end
+  alias get_scanner_insertion_point_providers getScannerInsertionPointProviders
+  alias scanner_insertion_point_providers getScannerInsertionPointProviders
+
+  # This method is used to remove a Scanner insertion point provider that has
+  # been registered by the extension.
+  #
+  # @param [IScannerInsertionPointProvider] provider The Scanner insertion point provider to be removed.
+  # @return [void]
+  #
+  def removeScannerInsertionPointProvider(provider)
+    _check_and_callback(:removeScannerInsertionPointProvider, provider)
+  end
+  alias remove_scanner_insertion_point_provider removeScannerInsertionPointProvider
+
   # This method is used to register a custom Scanner check. When performing
   # scanning, Burp will ask the check to perform active or passive scanning
   # on the base request, and report any Scanner issues that are identified.
@@ -798,6 +1336,29 @@ class Buby
   end
   alias register_scanner_check registerScannerCheck
 
+  # This method is used to retrieve the Scanner checks that are registered by
+  # the extension.
+  #
+  # @return [Array<IScannerCheck>] A list of Scanner checks that are currently
+  #   registered by this extension.
+  #
+  def getScannerChecks
+    _check_and_callback(:getScannerChecks)
+  end
+  alias get_scanner_checks getScannerChecks
+  alias scanner_checks getScannerChecks
+
+  # This method is used to remove a Scanner check that has been registered by
+  # the extension.
+  #
+  # @param [IScannerCheck] check The Scanner check to be removed.
+  # @return [void]
+  #
+  def removeScannerCheck(check)
+    _check_and_callback(:removeScannerCheck, check)
+  end
+  alias remove_scanner_check removeScannerCheck
+
   # This method is used to register a factory for Intruder payloads. Each
   # registered factory will be available within the Intruder UI for the user
   # to select as the payload source for an attack. When this is selected, the
@@ -818,6 +1379,29 @@ class Buby
   end
   alias register_intruder_payload_generator_factory registerIntruderPayloadGeneratorFactory
 
+  # This method is used to retrieve the Intruder payload generator factories
+  # that are registered by the extension.
+  #
+  # @return [Array<IIntruderPayloadGeneratorFactory>] A list of Intruder payload
+  #   generator factories that are currently registered by this extension.
+  #
+  def getIntruderPayloadGeneratorFactories
+    _check_and_callback(:getIntruderPayloadGeneratorFactories)
+  end
+  alias get_intruder_payload_generator_factories getIntruderPayloadGeneratorFactories
+  alias intruder_payload_generator_factories getIntruderPayloadGeneratorFactories
+
+  # This method is used to remove an Intruder payload generator factory that
+  # has been registered by the extension.
+  #
+  # @param [IIntruderPayloadGeneratorFactory] factory The Intruder payload
+  #   generator factory to be removed.
+  #
+  def removeIntruderPayloadGeneratorFactory(factory)
+    _check_and_callback(:removeIntruderPayloadGeneratorFactory, factory)
+  end
+  alias remove_intruder_payload_generator_factory removeIntruderPayloadGeneratorFactory
+
   # This method is used to register a custom Intruder payload processor. Each
   # registered processor will be available within the Intruder UI for the
   # user to select as the action for a payload processing rule.
@@ -835,6 +1419,30 @@ class Buby
   end
   alias register_intruder_payload_processor registerIntruderPayloadProcessor
 
+  # This method is used to retrieve the Intruder payload processors that are
+  # registered by the extension.
+  #
+  # @return [Array<IIntruderPayloadProcessor>] A list of Intruder payload
+  #   processors that are currently registered by this extension.
+  #
+  def getIntruderPayloadProcessors
+    _check_and_callback(:getIntruderPayloadProcessors)
+  end
+  alias get_intruder_payload_processors getIntruderPayloadProcessors
+  alias intruder_payload_processors getIntruderPayloadProcessors
+
+  # This method is used to remove an Intruder payload processor that has been
+  # registered by the extension.
+  #
+  # @param [IIntruderPayloadProcessor] processor The Intruder payload processor
+  #   to be removed.
+  # @return [void]
+  #
+  def removeIntruderPayloadProcessor(processor)
+    _check_and_callback(:removeIntruderPayloadProcessor, processor)
+  end
+  alias remove_intruder_payload_processor removeIntruderPayloadProcessor
+
   # This method is used to register a custom session handling action. Each
   # registered action will be available within the session handling rule UI
   # for the user to select as a rule action. Users can choose to invoke an
@@ -852,6 +1460,29 @@ class Buby
   end
   alias register_session_handling_action registerSessionHandlingAction
 
+  # This method is used to retrieve the session handling actions that are
+  # registered by the extension.
+  #
+  # @return [Array<ISessionHandlingAction>] A list of session handling actions
+  #   that are currently registered by this extension.
+  #
+  def getSessionHandlingActions
+    _check_and_callback(:getSessionHandlingActions)
+  end
+  alias get_session_handling_actions getSessionHandlingActions
+  alias session_handling_actions getSessionHandlingActions
+
+  # This method is used to remove a session handling action that has been
+  # registered by the extension.
+  #
+  # @param action The extension session handling action to be removed.
+  # @return [void]
+  #
+  def removeSessionHandlingAction(action)
+    _check_and_callback(:removeSessionHandlingAction, action)
+  end
+  alias remove_session_handling_action removeSessionHandlingAction
+
   # This method is used to add a custom tab to the main Burp Suite window.
   #
   # @param [ITab] tab A tab to be added to the suite's user interface.
@@ -932,7 +1563,7 @@ class Buby
   #
   # @return [ITextEditor] A new text editor the extension can use in its own UI.
   #
-  def createTextEditor()
+  def createTextEditor
     _check_and_callback(:createTextEditor)
   end
   alias create_text_editor createTextEditor
@@ -952,9 +1583,9 @@ class Buby
   alias cookie_jar_contents getCookieJarContents
 
   # This method is used to update the contents of Burp's session handling
-  # cookie jar. Extensions that provide an
-  # <code>ISessionHandlingAction</code> can query and update the cookie jar
-  # in order to handle unusual session handling mechanisms.
+  # cookie jar. Extensions that provide an +ISessionHandlingAction+ can query
+  # and update the cookie jar in order to handle unusual session handling
+  # mechanisms.
   #
   # @param [ICookie] cookie An object containing details of the cookie to be
   #   updated. If the cookie jar already contains a cookie that matches the
@@ -973,9 +1604,11 @@ class Buby
   # This method is used to create a temporary file on disk containing the
   # provided data. Extensions can use temporary files for long-term storage
   # of runtime data, avoiding the need to retain that data in memory.
-  # Not strictly needed in JRuby (use Tempfile class in stdlib instead) but might see use.
+  # Not strictly needed in JRuby (use Tempfile class in stdlib instead) but
+  # might see use.
   #
-  # @param [String, Array<byte>] buffer The data to be saved to a temporary file.
+  # @param [String, Array<byte>] buffer The data to be saved to a temporary
+  #   file.
   # @return [ITempFile] A reference to the temp file.
   #
   def saveToTempFile(buffer)
@@ -1010,13 +1643,15 @@ class Buby
   # @param [Array<Array<Fixnum>>] requestMarkers A list of index pairs
   #   representing the offsets of markers to be applied to the request message.
   #   Each item in the list must be an +int[2]+ array containing the start and
-  #   end offsets for the marker. This parameter is optional and may be +nil+ if
-  #   no request markers are required.
+  #   end offsets for the marker. The markers in the list should be in sequence
+  #   and not overlapping. This parameter is optional and may be +nil+ if no
+  #   response markers are required.
   # @param [Array<Array<Fixnum>>] responseMarkers A list of index pairs
   #   representing the offsets of markers to be applied to the response message.
   #   Each item in the list must be an +int[2]+ array containing the start and
-  #   end offsets for the marker. This parameter is optional and may be +nil+ if
-  #   no response markers are required.
+  #   end offsets for the marker. The markers in the list should be in sequence
+  #   and not overlapping. This parameter is optional and may be +nil+ if no
+  #   response markers are required.
   # @return [IHttpRequestResponseWithMarkers] A marked request/response pair.
   #
   # @todo Bring IHttpRequestResponse helper up to date
@@ -1028,11 +1663,12 @@ class Buby
   # This method is used to obtain the descriptive name for the Burp tool
   # identified by the tool flag provided.
   #
-  # @param [Fixnum] toolFlag A flag identifying a Burp tool (+TOOL_PROXY+, +TOOL_SCANNER+, etc.). Tool flags are defined within this interface.
+  # @param [Fixnum] toolFlag A flag identifying a Burp tool (+TOOL_PROXY+,
+  #   +TOOL_SCANNER+, etc.). Tool flags are defined within this interface.
   # @return [String] The descriptive name for the specified tool.
   #
   def getToolName(toolFlag)
-    _check_and_callback(:getToolName, toolFlag)
+    @tool_names[toolFlag] ||= _check_and_callback(:getToolName, toolFlag)
   end
   alias get_tool_name getToolName
 
@@ -1054,9 +1690,9 @@ class Buby
   ### Event Handlers ###
   # @todo move basic event handler logic to extender side
 
-  # This method is called by the BurpExtender java implementation upon 
+  # This method is called by the BurpExtender java implementation upon
   # initialization of the BurpExtender instance for Burp. The args parameter
-  # is passed with a instance of the newly initialized BurpExtender instance 
+  # is passed with a instance of the newly initialized BurpExtender instance
   # so that implementations can access and extend its public interfaces.
   #
   # The return value is ignored.
@@ -1075,13 +1711,14 @@ class Buby
   # @return [void]
   def extender_initialize ext
     @burp_extender = ext
+    @tool_names = {}
     pp([:got_extender, ext]) if $DEBUG
   end
 
   # This method is called by the BurpExtender implementation Burp startup.
-  # The args parameter contains main()'s argv command-line arguments array. 
+  # The args parameter contains main()'s argv command-line arguments array.
   #
-  # Note: This maps to the 'setCommandLineArgs' method in the java 
+  # Note: This maps to the 'setCommandLineArgs' method in the java
   # implementation of BurpExtender.
   #
   # The return value is ignored.
@@ -1158,11 +1795,12 @@ class Buby
   # ruby. Otherwise there's flakiness when converting certain binary non-ascii
   # sequences. As long as we do it here, it should be fine.
   #
-  # Note: This method maps to the 'processProxyMessage' method in the java 
+  # Note: This method maps to the 'processProxyMessage' method in the java
   # implementation of BurpExtender.
   #
   # This method just handles the conversion to and from evt_proxy_message
-  # which expects a message string 
+  # which expects a message string
+  # @deprecated
   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
 
@@ -1175,25 +1813,25 @@ class Buby
 
   # This method is called by BurpExtender while proxying HTTP messages and
   # before passing them through the Burp proxy. Implementations can use this
-  # method to implement arbitrary processing upon HTTP requests and responses 
+  # method to implement arbitrary processing upon HTTP requests and responses
   # such as interception, logging, modification, and so on.
   #
   # The 'is_req' parameter indicates whether it is a response or request.
   #
-  # Note: This method maps to the 'processProxyMessage' method in the java 
+  # Note: This method maps to the 'processProxyMessage' method in the java
   # implementation of BurpExtender.
-  # 
+  #
   # See also, evt_proxy_message_raw which is actually called before this
   # in the BurpExtender processProxyMessage handler.
   #
-  # Below are the parameters descriptions based on the IBurpExtender 
-  # javadoc. Where applicable, decriptions have been modified for 
+  # Below are the parameters descriptions based on the IBurpExtender
+  # javadoc. Where applicable, decriptions have been modified for
   # local parameter naming and other ruby-specific details added.
   #
   # * msg_ref:
-  #   An identifier which is unique to a single request/response pair. This 
-  #   can be used to correlate details of requests and responses and perform 
-  #   processing on the response message accordingly. This number also 
+  #   An identifier which is unique to a single request/response pair. This
+  #   can be used to correlate details of requests and responses and perform
+  #   processing on the response message accordingly. This number also
   #   corresponds to the Burp UI's proxy "history" # column.
   #
   # * is_req: (true/false)
@@ -1215,28 +1853,28 @@ class Buby
   #   The requested URL. Set in both the request and response.
   #
   # * resourceType:
-  #   The filetype of the requested resource, or nil if the resource has no 
+  #   The filetype of the requested resource, or nil if the resource has no
   #   filetype.
   #
   # * status:
-  #   The HTTP status code returned by the server. This value is nil for 
+  #   The HTTP status code returned by the server. This value is nil for
   #   request messages.
   #
   # * req_content_type:
-  #   The content-type string returned by the server. This value is nil for 
+  #   The content-type string returned by the server. This value is nil for
   #   request messages.
   #
   # * message:
-  #   The full HTTP message.  
-  #   **Ruby note: 
-  #     For convenience, the message is received and returned as a ruby 
-  #     String object. Internally within Burp it is handled as a java byte[] 
+  #   The full HTTP message.
+  #   **Ruby note:
+  #     For convenience, the message is received and returned as a ruby
+  #     String object. Internally within Burp it is handled as a java byte[]
   #     array. See also the notes about the return object below.
   #
   # * action:
-  #   An array containing a single integer, allowing the implementation to 
-  #   communicate back to Burp Proxy a non-default interception action for 
-  #   the message. The default value is ACTION_FOLLOW_RULES (or 0). 
+  #   An array containing a single integer, allowing the implementation to
+  #   communicate back to Burp Proxy a non-default interception action for
+  #   the message. The default value is ACTION_FOLLOW_RULES (or 0).
   #   Possible values include:
   #     ACTION_FOLLOW_RULES = 0
   #     ACTION_DO_INTERCEPT = 1
@@ -1248,25 +1886,25 @@ class Buby
   #
   # Return Value:
   #   Implementations should return either (a) the same object received
-  #   in the message paramater, or (b) a different object containing a 
-  #   modified message. 
+  #   in the message paramater, or (b) a different object containing a
+  #   modified message.
   #
   # **IMPORTANT RUBY NOTE:
   # Always be sure to return a new object if making modifications to messages.
   #
-  # Explanation: 
-  # The (a) and (b) convention above is followed rather literally during type 
+  # Explanation:
+  # The (a) and (b) convention above is followed rather literally during type
   # conversion on the return value back into the java BurpExtender.
   #
-  # When determining whether a change has been made in the message or not, 
+  # When determining whether a change has been made in the message or not,
   # the decision is made based on whether the object returned is the same
-  # as the object submitted in the call to evt_proxy_message. 
+  # as the object submitted in the call to evt_proxy_message.
   #
   #
-  # So, for example, using in-place modification of the message using range 
-  # substring assignments or destructive method variations like String.sub!() 
-  # and String.gsub! alone won't work because the same object gets returned 
-  # to BurpExtender. 
+  # So, for example, using in-place modification of the message using range
+  # substring assignments or destructive method variations like String.sub!()
+  # and String.gsub! alone won't work because the same object gets returned
+  # to BurpExtender.
   #
   # In short, this means that if you want modifications to be made, be sure
   # to return a different String than the one you got in your handler.
@@ -1297,19 +1935,19 @@ class Buby
   #   {Buby::ProxyListener}
   def evt_proxy_message msg_ref, is_req, rhost, rport, is_https, http_meth, url, resourceType, status, req_content_type, message, action
     pp([ (is_req)? :got_proxy_request : :got_proxy_response,
-         [:msg_ref, msg_ref], 
-         [:is_req, is_req], 
-         [:rhost, rhost], 
-         [:rport, rport], 
-         [:is_https, is_https], 
-         [:http_meth, http_meth], 
-         [:url, url], 
-         [:resourceType, resourceType], 
-         [:status, status], 
-         [:req_content_type, req_content_type], 
-         [:message, message], 
+         [:msg_ref, msg_ref],
+         [:is_req, is_req],
+         [:rhost, rhost],
+         [:rport, rport],
+         [:is_https, is_https],
+         [:http_meth, http_meth],
+         [:url, url],
+         [:resourceType, resourceType],
+         [:status, status],
+         [:req_content_type, req_content_type],
+         [:message, message],
          [:action, action[0]] ]) if $DEBUG
-    
+
     return message
   end
 
@@ -1329,22 +1967,22 @@ class Buby
     Buby::Implants::InterceptedProxyMessage.implant message
   end
 
-  # This method is invoked whenever any of Burp's tools makes an HTTP request 
-  # or receives a response. This is effectively a generalised version of the 
-  # pre-existing evt_proxy_message method, and can be used to intercept and 
+  # This method is invoked whenever any of Burp's tools makes an HTTP request
+  # or receives a response. This is effectively a generalised version of the
+  # pre-existing evt_proxy_message method, and can be used to intercept and
   # modify the HTTP traffic of all Burp tools.
   #
-  # IMPORTANT: This event handler is only used in Burp version 1.2.09 and 
+  # IMPORTANT: This event handler is only used in Burp version 1.2.09 and
   # higher.
-  # 
+  #
   # Note: this method maps to the processHttpMessage BurpExtender Java method.
   #
   # This method should be overridden if you wish to implement functionality
   # relating to generalized requests and responses from any BurpSuite tool.
   #
   # You may want to use evt_proxy_message if you only intend to work on
-  # proxied messages. Note, however, the IHttpRequestResponse Java object is 
-  # not used in evt_proxy_message and gives evt_http_message a somewhat 
+  # proxied messages. Note, however, the IHttpRequestResponse Java object is
+  # not used in evt_proxy_message and gives evt_http_message a somewhat
   # nicer interface to work with.
   #
   # Parameters:
@@ -1384,11 +2022,11 @@ class Buby
     pp([:got_process_http_message, toolFlag, messageIsRequest, messageInfo]) if $DEBUG
   end
 
-  # This method is invoked whenever Burp Scanner discovers a new, unique 
-  # issue, and can be used to perform customised reporting or logging of 
+  # This method is invoked whenever Burp Scanner discovers a new, unique
+  # issue, and can be used to perform customised reporting or logging of
   # detected issues.
   #
-  # IMPORTANT: This event handler is only used in Burp version 1.2.09 and 
+  # IMPORTANT: This event handler is only used in Burp version 1.2.09 and
   # higher.
   #
   # Note: this method maps to the BurpExtender Java method.
@@ -1424,14 +2062,14 @@ class Buby
   # application. Implementations can use this method to perform cleanup
   # tasks such as closing files or databases before exit.
   # @deprecated
-  def evt_application_closing 
+  def evt_application_closing
     pp([:got_app_close]) if $DEBUG
   end
 
   # This method is called by BurpExtender right before closing the
   # application. Implementations can use this method to perform cleanup
   # tasks such as closing files or databases before exit.
-  def application_closing 
+  def application_closing
     pp([:got_app_close]) if $DEBUG
   end
 
@@ -1460,11 +2098,43 @@ class Buby
   alias get_command_line_arguments getCommandLineArguments
   alias command_line_arguments getCommandLineArguments
 
+  # This method is used to generate a report for the specified Scanner
+  # issues. The report format can be specified. For all other reporting
+  # options, the default settings that appear in the reporting UI wizard are
+  # used.
+  #
+  # @param [String] format The format to be used in the report. Accepted values
+  #   are HTML and XML.
+  # @param [Array<IScanIssue>] issues The Scanner issues to be reported.
+  # @param [String, java.io.File] file The file to which the report will be saved.
+  # @return [void]
+  #
+  def generateScanReport(format, issues, file)
+    file = Java::JavaIo::File.new file if file.kind_of?(String)
+    _check_and_callback(:generateScanReport, format, issues, file)
+  end
+  alias generate_scan_report generateScanReport
+
   ### Sugar/Convenience methods
 
-  # This is a convenience wrapper which can load a given burp state file and 
-  # lets its caller to perform actions inside of a block on the site map 
-  # contained in the loaded session. 
+  # so things will just work for most new interface changes.
+  def method_missing(meth, *args, &block)
+    if _check_cb.respond_to?(meth)
+      warn 'this method may not be implemented fully, punting'
+      self.class.class_exec do |meth|
+        define_method(meth) do |*argv, &blck|
+          _check_and_callback(meth, *argv, &blck)
+        end
+      end
+      __send__ meth, *args, &block
+    else
+      super
+    end
+  end
+
+  # This is a convenience wrapper which can load a given burp state file and
+  # lets its caller to perform actions inside of a block on the site map
+  # contained in the loaded session.
   #
   # If a statefile argument isn't specified current burp session state is used.
   #
@@ -1475,9 +2145,9 @@ class Buby
     end
   end
 
-  # This is a convenience wrapper which can load a given burp state file and 
-  # lets its caller to perform actions inside of a block on the proxy history 
-  # contained in the loaded session. 
+  # This is a convenience wrapper which can load a given burp state file and
+  # lets its caller to perform actions inside of a block on the proxy history
+  # contained in the loaded session.
   #
   # If a statefile argument isn't specified current burp session state is used.
   #
@@ -1489,10 +2159,10 @@ class Buby
   end
 
   # This is a convenience wrapper which loads a given burp statefile and lets
-  # its caller perform actions via burp while its loaded on it inside of a 
+  # its caller perform actions via burp while its loaded on it inside of a
   # block. The old state is restored after the block completes.
   #
-  # It can safely be run with a nil statefile argument in which the 
+  # It can safely be run with a nil statefile argument in which the
   # current burp session state is used.
   def with_statefile(statefile=nil)
     if statefile
@@ -1515,7 +2185,7 @@ class Buby
     end
   end
 
-  # Searches the proxy history for the url's matched by the specified 
+  # Searches the proxy history for the url's matched by the specified
   # regular expression (returns them all if urlrx is nil).
   #
   # A statefile to search in can optionally be specified or the existing
@@ -1542,13 +2212,13 @@ class Buby
   #               and harvest from.
   #
   # Takes an optional block as additional 'select' criteria for cookies.
-  # The block return value of true/false will determine whether a cookie 
+  # The block return value of true/false will determine whether a cookie
   # string is selected.
   def harvest_cookies_from_history(cookie=nil, urlrx=nil, statefile=nil)
     ret = []
     search_proxy_history(statefile, urlrx) do |hrr|
       if (resp = hrr.response)
-        ret += helpers.analyzeResponse(resp).getCookies.select do |c| 
+        ret += helpers.analyzeResponse(resp).getCookies.select do |c|
           (cookie.nil? or c.match(cookie)) && (not block_given? or yield(c))
         end
       end
@@ -1594,7 +2264,7 @@ class Buby
     self.start(extender, h_class, init_args, args)
   end
 
-  # Attempts to load burp with require and confirm it provides the required 
+  # Attempts to load burp with require and confirm it provides the required
   # class in the Java namespace.
   #
   # Returns: true/false depending on whether the required jar provides us