ronin 1.0.0 → 1.1.0.rc1

data/lib/ronin/ip_address_mac_address.rb

@@ -18,13 +18,12 @@
 #
 
 require 'ronin/model'
+require 'ronin/ip_address'
+require 'ronin/mac_address'
 
 require 'dm-timestamps'
 
 module Ronin
-  autoload :IPAddress, 'ronin/ip_address'
-  autoload :MACAddress, 'ronin/mac_address'
-
   #
   # Associates an {IPAddress} with a {MACAddress}.
   #

data/lib/ronin/license.rb

@@ -42,7 +42,7 @@ module Ronin
     property :description, Text, :required => true
 
     # URL of the License document
-    property :url, String
+    property :url, String, :length => 256
 
     # Berkeley Software Distribution License
     predefine :bsd,

data/lib/ronin/mac_address.rb

@@ -18,12 +18,10 @@
 #
 
 require 'ronin/address'
-require 'ronin/model'
+require 'ronin/ip_address'
+require 'ronin/ip_address_mac_address'
 
 module Ronin
-  autoload :IPAddressMACAddress, 'ronin/ip_address_mac_address'
-  autoload :IPAddress, 'ronin/ip_address'
-
   #
   # Represents MAC addresses that can be stored in the {Database}.
   #
@@ -49,6 +47,8 @@ module Ronin
     #
     # @since 1.0.0
     #
+    # @api public
+    #
     def recent_ip_address
       self.ip_address_mac_addresses.all(
         :order => [:created_at.desc]
@@ -63,6 +63,8 @@ module Ronin
     #
     # @since 1.0.0
     #
+    # @api public
+    #
     def to_i
       self.address.split(':').inject(0) do |bits,char|
         bits = ((bits << 8) | char.hex)

data/lib/ronin/model/class_methods.rb

@@ -34,6 +34,8 @@ module Ronin
       #
       # @since 1.0.0
       #
+      # @api semipublic
+      #
       def relationship_name
         name = Support::Inflector.underscore(self.name.split('::').last)
 
@@ -43,6 +45,8 @@ module Ronin
       #
       # Loads and initialize the resources.
       #
+      # @api private
+      #
       def load(records,query)
         resources = super(records,query)
         resources.each { |resource| resource.send :initialize }

data/lib/ronin/model/has_authors/class_methods.rb

@@ -34,6 +34,8 @@ module Ronin
         # @return [Array<Model>]
         #   The resources written by the author.
         #
+        # @api public
+        #
         def written_by(name)
           all('authors.name.like' => "%#{name}%")
         end
@@ -47,6 +49,8 @@ module Ronin
         # @return [Array<Model>]
         #   The resources associated with the organization.
         #
+        # @api public
+        #
         def written_for(name)
           all('authors.organization.like' => "%#{name}%")
         end

data/lib/ronin/model/has_authors/has_authors.rb

@@ -33,6 +33,8 @@ module Ronin
       # @param [Class] base
       #   The model.
       #
+      # @api semipublic
+      #
       def self.included(base)
         base.send :include, Model
         base.send :extend, ClassMethods
@@ -58,6 +60,8 @@ module Ronin
       #          :email => 'anon@example.com',
       #          :organization => 'Anonymous LLC'
       #
+      # @api public
+      #
       def author(attributes)
         self.authors.new(attributes)
       end

data/lib/ronin/model/has_description/class_methods.rb

@@ -38,6 +38,8 @@ module Ronin
         # @example
         #   Exploit.describing 'bypass'
         #
+        # @api public
+        #
         def describing(fragment)
           all(:description.like => "%#{fragment}%")
         end

data/lib/ronin/model/has_description/has_description.rb

@@ -33,6 +33,8 @@ module Ronin
       # @param [Class] base
       #   The model.
       #
+      # @api semipublic
+      #
       def self.included(base)
         base.send :include, Model
         base.send :extend, ClassMethods

data/lib/ronin/model/has_license/class_methods.rb

@@ -48,6 +48,8 @@ module Ronin
         #
         # @since 1.0.0
         #
+        # @api public
+        #
         def licensed_under(license)
           license = case license
                     when License

data/lib/ronin/model/has_license/has_license.rb

@@ -33,6 +33,8 @@ module Ronin
       # @param [Class] base
       #   The model.
       #
+      # @api semipublic
+      #
       def self.included(base)
         base.send :include, Model
         base.send :extend, ClassMethods
@@ -59,6 +61,8 @@ module Ronin
       #
       # @since 1.0.0
       #
+      # @api public
+      #
       def license!(name)
         self.license = Ronin::License.predefined_resource(name)
       end

data/lib/ronin/model/has_name/class_methods.rb

@@ -37,6 +37,8 @@ module Ronin
         # @example
         #   Exploit.named 'ProFTP'
         #
+        # @api public
+        #
         def named(fragment)
           all(:name.like => "%#{fragment}%")
         end

data/lib/ronin/model/has_name/has_name.rb

@@ -32,6 +32,8 @@ module Ronin
       # @param [Class] base
       #   The model.
       #
+      # @api semipublic
+      #
       def self.included(base)
         base.send :include, Model
         base.send :extend, ClassMethods
@@ -50,6 +52,8 @@ module Ronin
       #
       # @since 1.0.0
       #
+      # @api public
+      #
       def to_s
         self.name.to_s
       end

data/lib/ronin/model/has_title/class_methods.rb

@@ -37,6 +37,8 @@ module Ronin
         # @example
         #   Vuln.titled 'bypass'
         #
+        # @api public
+        #
         def titled(fragment)
           all(:title.like => "%#{fragment}%")
         end

data/lib/ronin/model/has_title/has_title.rb

@@ -32,6 +32,8 @@ module Ronin
       # @param [Class] base
       #   The model.
       #
+      # @api semipublic
+      #
       def self.included(base)
         base.send :include, Model
         base.send :extend, ClassMethods

data/lib/ronin/model/has_unique_name/class_methods.rb

@@ -32,6 +32,8 @@ module Ronin
         #
         # @since 1.0.0
         #   
+        # @api public
+        #
         def [](key)
           case key
           when String, Symbol

data/lib/ronin/model/has_unique_name/has_unique_name.rb

@@ -33,6 +33,8 @@ module Ronin
       # @param [Class] base
       #   The model.
       #
+      # @api semipublic
+      #
       def self.included(base)
         base.send :include, Model
         base.send :extend, HasName::ClassMethods,
@@ -52,6 +54,8 @@ module Ronin
       #
       # @since 1.0.0
       #
+      # @api public
+      #
       def to_s
         self.name.to_s
       end
@@ -64,8 +68,10 @@ module Ronin
       #
       # @since 1.0.0
       #
+      # @api public
+      #
       def inspect
-        "#<#{self.class}:#{self.name}>"
+        "#<#{self.class}: #{self.name}>"
       end
     end
   end

data/lib/ronin/model/has_version/class_methods.rb

@@ -34,6 +34,8 @@ module Ronin
         # @return [Array]
         #   The models with the specific version.
         #
+        # @api public
+        #
         def revision(version)
           all(:version => version.to_s)
         end
@@ -41,6 +43,8 @@ module Ronin
         #
         # Finds latest version of the model.
         #
+        # @api public
+        #
         def latest
           first(:order => [:version.desc])
         end

data/lib/ronin/model/has_version/has_version.rb

@@ -32,6 +32,8 @@ module Ronin
       # @param [Class] base
       #   The model.
       #
+      # @api semipublic
+      #
       def self.included(base)
         base.send :include, Model
         base.send :extend, ClassMethods

data/lib/ronin/model/model.rb

@@ -78,6 +78,8 @@ module Ronin
     # @return [Hash{String => String}]
     #   A hash of the humanly readable names and values of the attributes.
     #
+    # @api semipublic
+    #
     def humanize_attributes(options={})
       exclude = [:id, :type]
 

data/lib/ronin/model/types.rb

@@ -17,10 +17,4 @@
 # along with Ronin.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-module Ronin
-  module Model
-    module Types
-      autoload :Description, 'ronin/model/types/description'
-    end
-  end
-end
+require 'ronin/model/types/description'

data/lib/ronin/model/types/description.rb

@@ -43,6 +43,8 @@ module Ronin
         #
         # @since 1.0.0
         #
+        # @api private
+        #
         def typecast(value)
           case value
           when nil

data/lib/ronin/network/mixins/esmtp.rb

@@ -18,6 +18,8 @@
 #
 
 require 'ronin/network/esmtp'
+require 'ronin/ui/output/helpers'
+require 'ronin/mixin'
 
 require 'parameters'
 
@@ -27,46 +29,55 @@ module Ronin
       #
       # Adds ESMTP convenience methods and connection parameters to a class.
       #
+      # Defines the following parameters:
+      #
+      # * `host` (`String`) - ESMTP host.
+      # * `port` (`Integer`) - ESMTP port.
+      # * `esmtp_login` (`String`) - ESMTP authentication method to use.
+      # * `esmtp_user` (`String`) - ESMTP user to login as.
+      # * `esmtp_password` (`String`) - ESMTP password to login with.
+      #
       module ESMTP
-        include Parameters
+        include Mixin
 
-        # ESMTP host
-        parameter :host,
-                  :type => String,
-                  :description => 'ESMTP host'
+        mixin UI::Output::Helpers, Parameters
 
-        # ESMTP port
-        parameter :port,
-                  :type => Integer,
-                  :description => 'ESMTP port'
+        mixin do
+          # ESMTP host
+          parameter :host, :type => String,
+                           :description => 'ESMTP host'
 
-        # ESMTP authentication method to use
-        parameter :esmtp_login,
-                  :type => String,
-                  :description => 'ESMTP authentication method to use'
+          # ESMTP port
+          parameter :port, :type => Integer,
+                           :description => 'ESMTP port'
 
-        # ESMTP user to login as
-        parameter :esmtp_user,
-                  :type => String,
-                  :description => 'ESMTP user to login as'
+          # ESMTP authentication method to use
+          parameter :esmtp_login, :type => String,
+                                  :description => 'ESMTP authentication method to use'
 
-        # ESMTP password to login with
-        parameter :esmtp_password,
-                  :type => String,
-                  :description => 'ESMTP password to login with'
+          # ESMTP user to login as
+          parameter :esmtp_user, :type => String,
+                                 :description => 'ESMTP user to login as'
+
+          # ESMTP password to login with
+          parameter :esmtp_password, :type => String,
+                                     :description => 'ESMTP password to login with'
+        end
 
         protected
 
         #
         # @see Ronin::Network::SMTP.message.
         #
+        # @api public
+        #
         def esmtp_message(options={},&block)
           Network::SMTP.message(options,&block)
         end
 
         #
-        # Creates a connection to the ESMTP server. The {#host}, {#port},
-        # {#esmtp_login}, {#esmtp_user} and {#esmtp_password} parameters
+        # Creates a connection to the ESMTP server. The `host`, `port`,
+        # `esmtp_login`, `esmtp_user` and `esmtp_password` parameters
         # will also be used to connect to the ESMTP server.
         #
         # @param [Hash] options
@@ -98,6 +109,8 @@ module Ronin
         # @return [Net::SMTP]
         #   The ESMTP enabled session.
         #
+        # @api public
+        #
         def esmtp_connect(options={},&block)
           options[:port] ||= self.port
           options[:login] ||= self.esmtp_login
@@ -114,8 +127,8 @@ module Ronin
         end
 
         #
-        # Starts a session with the ESMTP server. The {#host}, {#port},
-        # {#esmtp_login}, {#esmtp_user} and {#esmtp_password} parameters
+        # Starts a session with the ESMTP server. The `host`, `port`,
+        # `esmtp_login`, `esmtp_user` and `esmtp_password` parameters
         # will also be used to connect to the ESMTP server.
         #
         # @param [Hash] options
@@ -131,6 +144,8 @@ module Ronin
         #
         # @see esmtp_connect
         #
+        # @api public
+        #
         def esmtp_session(options={})
           esmtp_connect(options) do |sess|
             yield sess if block_given?

data/lib/ronin/network/mixins/http.rb

@@ -18,6 +18,8 @@
 #
 
 require 'ronin/network/http'
+require 'ronin/ui/output/helpers'
+require 'ronin/mixin'
 
 require 'parameters'
 
@@ -27,48 +29,57 @@ module Ronin
       #
       # Adds HTTP convenience methods and connection parameters to a class.
       #
+      # Defines the following parameters:
+      #
+      # * `host` (`String`) - HTTP host.
+      # * `port` (`Integer`) - HTTP port. Defaults to `Net::HTTP.default_port`.
+      # * `http_vhost` (`String`) - HTTP Host header to send.
+      # * `http_user` (`String`) - HTTP user to authenticate as.
+      # * `http_password` (`String`) - HTTP password to authenticate with.
+      # * `http_proxy` - HTTP proxy information.
+      # * `http_user_agent` (`String`) - HTTP User-Agent header to send.
+      #
       module HTTP
-        include Parameters
-
-        # HTTP host
-        parameter :host,
-                  :type => String,
-                  :description => 'HTTP host'
-
-        # HTTP port
-        parameter :port,
-                  :type => Integer,
-                  :description => 'HTTP port'
-
-        # HTTP `Host` header to send
-        parameter :http_vhost,
-                  :type => String,
-                  :description => 'HTTP Host header to send'
-
-        # HTTP user to authenticate as
-        parameter :http_user,
-                  :type => String,
-                  :description => 'HTTP user to authenticate as'
-
-        # HTTP password to authenticate with
-        parameter :http_password,
-                  :type => String,
-                  :description => 'HTTP password to authenticate with'
-
-        # HTTP proxy information
-        parameter :http_proxy,
-                  :description => 'HTTP proxy information'
-
-        # HTTP `User-Agent` header to send
-        parameter :http_user_agent,
-                  :type => String,
-                  :description => 'HTTP User-Agent header to send'
+        include Mixin
+
+        mixin UI::Output::Helpers, Parameters
+
+        mixin do
+          # HTTP host
+          parameter :host, :type => String,
+                           :description => 'HTTP host'
+
+          # HTTP port
+          parameter :port, :default => Net::HTTP.default_port,
+                           :description => 'HTTP port'
+
+          # HTTP `Host` header to send
+          parameter :http_vhost, :type => String,
+                                 :description => 'HTTP Host header to send'
+
+          # HTTP user to authenticate as
+          parameter :http_user, :type => String,
+                                :description => 'HTTP user to authenticate as'
+
+          # HTTP password to authenticate with
+          parameter :http_password, :type => String,
+                                    :description => 'HTTP password to authenticate with'
+
+          # HTTP proxy information
+          parameter :http_proxy, :description => 'HTTP proxy information'
+
+          # HTTP `User-Agent` header to send
+          parameter :http_user_agent, :type => String,
+                                      :description => 'HTTP User-Agent header to send'
+        end
 
         protected
 
         #
         # Resets the HTTP proxy settings.
         #
+        # @api public
+        #
         def disable_http_proxy
           @http_proxy = nil
         end
@@ -109,8 +120,19 @@ module Ronin
         # @return [Net::HTTP]
         #   The HTTP session object.
         #
-        def http_session(options={},&block)
-          Net.http_session(http_merge_options(options),&block)
+        # @api public
+        #
+        def http_session(options={})
+          options = http_merge_options(options)
+          host_port = "#{options[:host]}:#{options[:port]}"
+
+          Net.http_session(options) do |http|
+            print_info "Starting HTTP Session with #{host_port}"
+
+            yield http
+
+            print_info "Closing HTTP Session with #{host_port}"
+          end
         end
 
         #
@@ -138,10 +160,127 @@ module Ronin
         # @return [Net::HTTP::Response]
         #   The response of the HTTP request.
         #
-        # @see http_session
+        # @see #http_session
+        #
+        # @api public
         #
         def http_request(options={},&block)
-          Net.http_request(http_merge_options(options),&block)
+          options = http_merge_options(options)
+          print_info "HTTP #{options[:method]} #{http_options_to_s(options)}"
+
+          return Net.http_request(options,&block)
+        end
+
+        #
+        # Returns the Status Code of the Response.
+        #
+        # @param [Hash] options
+        #   Additional options.
+        #
+        # @option options [Symbol, String] :method (:head)
+        #   The method to use for the request.
+        #
+        # @return [Integer]
+        #   The HTTP Response Status.
+        #
+        # @see #http_request
+        #
+        # @since 1.1.0
+        #
+        # @api public
+        #
+        def http_status(options={})
+          options = http_merge_options(options)
+
+          if (result = Net.http_status(options))
+            print_debug "HTTP #{result} #{http_options_to_s(options)}"
+          end
+
+          return result
+        end
+
+        #
+        # Checks if the response has an HTTP OK status code.
+        #
+        # @param [Hash] options
+        #   Additional options.
+        #
+        # @option options [Symbol, String] :method (:head)
+        #   The method to use for the request.
+        #
+        # @return [Boolean]
+        #   Specifies wether the response had an HTTP OK status code or not.
+        #
+        # @see #http_status
+        #
+        # @since 1.1.0
+        #
+        # @api public
+        #
+        def http_ok?(options={})
+          options = http_merge_options(options)
+
+          if (result = Net.http_ok?(options))
+            print_debug "HTTP 200 OK #{http_options_to_s(options)}"
+          end
+
+          return result
+        end
+
+        #
+        # Sends a HTTP Head request and returns the HTTP Server header.
+        #
+        # @param [Hash] options
+        #   Additional options.
+        #
+        # @option options [Symbol, String] :method (:head)
+        #   The method to use for the request.
+        #
+        # @return [String]
+        #   The HTTP `Server` header.
+        #
+        # @see #http_request
+        #
+        # @since 1.1.0
+        #
+        # @api public
+        #
+        def http_server(options={})
+          options = http_merge_options(options)
+
+          if (result = Net.http_server(options))
+            print_debug "HTTP Server: #{result}"
+          end
+
+          return result
+        end
+
+        #
+        # Sends an HTTP Head request and returns the HTTP X-Powered-By header.
+        #
+        # @param [Hash] options
+        #   Additional options.
+        #
+        # @option options [Symbol, String] :method (:get)
+        #   The method to use for the request.
+        #
+        # @return [String]
+        #   The HTTP `X-Powered-By` header.
+        #
+        # @see #http_request
+        #
+        # @since 1.1.0
+        #
+        # @api public
+        #
+        def http_powered_by(options={})
+          options = http_merge_options(options)
+
+          if (result = Net.http_powered_by(options))
+            print_debug "HTTP X-Powered-By: #{result}"
+          end
+
+          return result
         end
 
         #
@@ -157,10 +296,15 @@ module Ronin
         # @return [Net::HTTP::Response]
         #   The response of the HTTP request.
         #
-        # @see http_request
+        # @see #http_request
+        #
+        # @api public
         #
         def http_copy(options={},&block)
-          Net.http_copy(http_merge_options(options),&block)
+          options = http_merge_options(options)
+          print_info "HTTP COPY #{http_options_to_s(options)}"
+
+          return Net.http_copy(options,&block)
         end
 
         #
@@ -176,10 +320,15 @@ module Ronin
         # @return [Net::HTTP::Response]
         #   The response of the HTTP request.
         #
-        # @see http_request
+        # @see #http_request
+        #
+        # @api public
         #
         def http_delete(options={},&block)
-          Net.http_delete(http_merge_options(options),&block)
+          options = http_merge_options(options)
+          print_info "HTTP DELETE #{http_options_to_s(options)}"
+
+          return Net.http_delete(options,&block)
         end
 
         #
@@ -195,10 +344,15 @@ module Ronin
         # @return [Net::HTTP::Response]
         #   The response of the HTTP request.
         #
-        # @see http_request
+        # @see #http_request
+        #
+        # @api public
         #
         def http_get(options={},&block)
-          Net.http_get(http_merge_options(options),&block)
+          options = http_merge_options(options)
+          print_info "HTTP GET #{http_options_to_s(options)}"
+
+          return Net.http_get(options,&block)
         end
 
         #
@@ -214,10 +368,15 @@ module Ronin
         # @return [String]
         #   The body of the HTTP Get request.
         #
-        # @see http_get
+        # @see #http_get
+        #
+        # @api public
         #
         def http_get_body(options={},&block)
-          Net.http_get_body(http_merge_options(options),&block)
+          options = http_merge_options(options)
+          print_info "HTTP GET #{http_options_to_s(options)}"
+
+          return Net.http_get_body(options,&block)
         end
 
         #
@@ -233,10 +392,15 @@ module Ronin
         # @return [Net::HTTP::Response]
         #   The response of the HTTP request.
         #
-        # @see http_request
+        # @see #http_request
+        #
+        # @api public
         #
         def http_head(options={},&block)
-          Net.http_head(http_merge_options(options),&block)
+          options = http_merge_options(options)
+          print_info "HTTP HEAD #{http_options_to_s(options)}"
+
+          return Net.http_head(options,&block)
         end
 
         #
@@ -252,10 +416,15 @@ module Ronin
         # @return [Net::HTTP::Response]
         #   The response of the HTTP request.
         #
-        # @see http_request
+        # @see #http_request
+        #
+        # @api public
         #
         def http_lock(options={},&block)
-          Net.http_lock(http_merge_options(options),&block)
+          options = http_merge_options(options)
+          print_info "HTTP LOCK #{http_options_to_s(options)}"
+
+          return Net.http_lock(options,&block)
         end
 
         #
@@ -271,10 +440,15 @@ module Ronin
         # @return [Net::HTTP::Response]
         #   The response of the HTTP request.
         #
-        # @see http_request
+        # @see #http_request
+        #
+        # @api public
         #
         def http_mkcol(options={},&block)
-          Net.http_mkcol(http_merge_options(options),&block)
+          options = http_merge_options(options)
+          print_info "HTTP MKCOL #{http_options_to_s(options)}"
+
+          return Net.http_mkcol(options,&block)
         end
 
         #
@@ -290,10 +464,15 @@ module Ronin
         # @return [Net::HTTP::Response]
         #   The response of the HTTP request.
         #
-        # @see http_request
+        # @see #http_request
+        #
+        # @api public
         #
         def http_move(options={},&block)
-          Net.http_move(http_merge_options(options),&block)
+          options = http_merge_options(options)
+          print_info "HTTP MOVE #{http_options_to_s(options)}"
+
+          return Net.http_move(options,&block)
         end
 
         #
@@ -309,10 +488,15 @@ module Ronin
         # @return [Net::HTTP::Response]
         #   The response of the HTTP request.
         #
-        # @see http_request
+        # @see #http_request
+        #
+        # @api public
         #
         def http_options(options={},&block)
-          Net.http_options(http_merge_options(options),&block)
+          options = http_merge_options(options)
+          print_info "HTTP OPTIONS #{http_options_to_s(options)}"
+
+          return Net.http_options(options,&block)
         end
 
         #
@@ -334,10 +518,15 @@ module Ronin
         # @return [Net::HTTP::Response]
         #   The response of the HTTP request.
         #
-        # @see http_request
+        # @see #http_request
+        #
+        # @api public
         #
         def http_post(options={},&block)
-          Net.http_post(http_merge_options(options),&block)
+          options = http_merge_options(options)
+          print_info "HTTP POST #{http_options_to_s(options)}"
+
+          return Net.http_post(options,&block)
         end
 
         #
@@ -353,10 +542,15 @@ module Ronin
         # @return [String]
         #   The body of the Post request.
         #
-        # @see http_post
+        # @see #http_post
+        #
+        # @api public
         #
         def http_post_body(options={},&block)
-          Net.http_post_body(http_merge_options(options),&block)
+          options = http_merge_options(options)
+          print_info "HTTP POST #{http_options_to_s(options)}"
+
+          return Net.http_post_body(options,&block)
         end
 
         #
@@ -372,10 +566,15 @@ module Ronin
         # @return [Net::HTTP::Response]
         #   The response of the HTTP request.
         #
-        # @see http_request
+        # @see #http_request
+        #
+        # @api public
         #
         def http_prop_find(options={},&block)
-          Net.http_prop_find(http_merge_options(options),&block)
+          options = http_merge_options(options)
+          print_info "HTTP PROPFIND #{http_options_to_s(options)}"
+
+          return Net.http_prop_find(options,&block)
         end
 
         #
@@ -391,10 +590,15 @@ module Ronin
         # @return [Net::HTTP::Response]
         #   The response of the HTTP request.
         #
-        # @see http_request
+        # @see #http_request
+        #
+        # @api public
         #
         def http_prop_patch(options={},&block)
-          Net.http_prop_patch(http_merge_options(options),&block)
+          options = http_merge_options(options)
+          print_info "HTTP PROPPATCH #{http_options_to_s(options)}"
+
+          return Net.http_prop_patch(options,&block)
         end
 
         #
@@ -410,10 +614,15 @@ module Ronin
         # @return [Net::HTTP::Response]
         #   The response of the HTTP request.
         #
-        # @see http_request
+        # @see #http_request
+        #
+        # @api public
         #
         def http_trace(options={},&block)
-          Net.http_trace(http_merge_options(options),&block)
+          options = http_merge_options(options)
+          print_info "HTTP TRACE #{http_options_to_s(options)}"
+
+          return Net.http_trace(options,&block)
         end
 
         #
@@ -429,31 +638,85 @@ module Ronin
         # @return [Net::HTTP::Response]
         #   The response of the HTTP request.
         #
-        # @see http_request
+        # @see #http_request
+        #
+        # @api public
         #
         def http_unlock(options={},&block)
-          Net.http_unlock(http_merge_options(options),&block)
+          options = http_merge_options(options)
+          print_info "HTTP UNLOCK #{http_options_to_s(options)}"
+
+          return Net.http_unlock(options,&block)
         end
 
         private
 
+        #
+        # Merges the HTTP parameters into the HTTP options.
+        #
+        # @param [Hash] options
+        #   The HTTP options to merge into.
+        #
+        # @return [Hash]
+        #   The merged HTTP options.
+        #
+        # @since 1.0.0
+        #
+        # @api private
+        #
         def http_merge_options(options={})
           options[:host] ||= self.host if self.host
           options[:port] ||= self.port if self.port
 
-          options[:headers] ||= {}
-          headers = options[:headers]
+          if (self.http_vhost || self.http_user_agent)
+            headers = options.fetch(:headers,{})
+
+            headers[:host] ||= self.http_vhost if self.http_vhost
+            headers[:user_agent] ||= self.http_user_agent if self.http_user_agent
 
-          headers[:host] ||= self.http_vhost if self.http_vhost
+            options[:headers] = headers
+          end
 
           options[:user] ||= self.http_user if self.http_user
           options[:password] ||= self.http_password if self.http_password
 
           options[:proxy] ||= self.http_proxy if self.http_proxy
-          options[:user_agent] ||= self.http_user_agent if self.http_user_agent
 
           return options
         end
+
+        #
+        # Converts the HTTP options to a printable String.
+        #
+        # @param [Hash] options
+        #   HTTP options.
+        #
+        # @return [String]
+        #   The printable String.
+        #
+        # @since 1.1.0
+        #
+        # @api private
+        #
+        def http_options_to_s(options)
+          fields = ["#{options[:host]}:#{options[:port]}"]
+
+          if (options[:user] || options[:password])
+            fields << "#{options[:user]}:#{options[:password]}"
+          end
+
+          path = options[:path]
+          path += "?#{options[:query]}" if options[:query]
+
+          fields << path
+
+          if options[:headers]
+            fields << ("%p" % options[:headers])
+          end
+
+          return fields.join(' ')
+        end
+
       end
     end
   end