ronin-support 0.4.0.rc1 → 0.4.0.rc2

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

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006-2011 Hal Brodigan (postmodern.mod3 at gmail.com)
+# Copyright (c) 2006-2012 Hal Brodigan (postmodern.mod3 at gmail.com)
 #
 # This file is part of Ronin Support.
 #

data/lib/ronin/network/extensions/http/net.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006-2011 Hal Brodigan (postmodern.mod3 at gmail.com)
+# Copyright (c) 2006-2012 Hal Brodigan (postmodern.mod3 at gmail.com)
 #
 # This file is part of Ronin Support.
 #

data/lib/ronin/network/extensions/http/uri/http.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006-2011 Hal Brodigan (postmodern.mod3 at gmail.com)
+# Copyright (c) 2006-2012 Hal Brodigan (postmodern.mod3 at gmail.com)
 #
 # This file is part of Ronin Support.
 #

data/lib/ronin/network/extensions/imap.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006-2011 Hal Brodigan (postmodern.mod3 at gmail.com)
+# Copyright (c) 2006-2012 Hal Brodigan (postmodern.mod3 at gmail.com)
 #
 # This file is part of Ronin Support.
 #

data/lib/ronin/network/extensions/imap/net.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006-2011 Hal Brodigan (postmodern.mod3 at gmail.com)
+# Copyright (c) 2006-2012 Hal Brodigan (postmodern.mod3 at gmail.com)
 #
 # This file is part of Ronin Support.
 #

data/lib/ronin/network/extensions/pop3.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006-2011 Hal Brodigan (postmodern.mod3 at gmail.com)
+# Copyright (c) 2006-2012 Hal Brodigan (postmodern.mod3 at gmail.com)
 #
 # This file is part of Ronin Support.
 #

data/lib/ronin/network/extensions/pop3/net.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006-2011 Hal Brodigan (postmodern.mod3 at gmail.com)
+# Copyright (c) 2006-2012 Hal Brodigan (postmodern.mod3 at gmail.com)
 #
 # This file is part of Ronin Support.
 #

data/lib/ronin/network/extensions/smtp.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006-2011 Hal Brodigan (postmodern.mod3 at gmail.com)
+# Copyright (c) 2006-2012 Hal Brodigan (postmodern.mod3 at gmail.com)
 #
 # This file is part of Ronin Support.
 #

data/lib/ronin/network/extensions/smtp/net.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006-2011 Hal Brodigan (postmodern.mod3 at gmail.com)
+# Copyright (c) 2006-2012 Hal Brodigan (postmodern.mod3 at gmail.com)
 #
 # This file is part of Ronin Support.
 #

data/lib/ronin/network/extensions/ssl.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006-2011 Hal Brodigan (postmodern.mod3 at gmail.com)
+# Copyright (c) 2006-2012 Hal Brodigan (postmodern.mod3 at gmail.com)
 #
 # This file is part of Ronin Support.
 #

data/lib/ronin/network/extensions/ssl/net.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006-2011 Hal Brodigan (postmodern.mod3 at gmail.com)
+# Copyright (c) 2006-2012 Hal Brodigan (postmodern.mod3 at gmail.com)
 #
 # This file is part of Ronin Support.
 #

data/lib/ronin/network/extensions/tcp.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006-2011 Hal Brodigan (postmodern.mod3 at gmail.com)
+# Copyright (c) 2006-2012 Hal Brodigan (postmodern.mod3 at gmail.com)
 #
 # This file is part of Ronin Support.
 #

data/lib/ronin/network/extensions/tcp/net.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006-2011 Hal Brodigan (postmodern.mod3 at gmail.com)
+# Copyright (c) 2006-2012 Hal Brodigan (postmodern.mod3 at gmail.com)
 #
 # This file is part of Ronin Support.
 #

data/lib/ronin/network/extensions/telnet.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006-2011 Hal Brodigan (postmodern.mod3 at gmail.com)
+# Copyright (c) 2006-2012 Hal Brodigan (postmodern.mod3 at gmail.com)
 #
 # This file is part of Ronin Support.
 #

data/lib/ronin/network/extensions/telnet/net.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006-2011 Hal Brodigan (postmodern.mod3 at gmail.com)
+# Copyright (c) 2006-2012 Hal Brodigan (postmodern.mod3 at gmail.com)
 #
 # This file is part of Ronin Support.
 #

data/lib/ronin/network/extensions/udp.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006-2011 Hal Brodigan (postmodern.mod3 at gmail.com)
+# Copyright (c) 2006-2012 Hal Brodigan (postmodern.mod3 at gmail.com)
 #
 # This file is part of Ronin Support.
 #

data/lib/ronin/network/extensions/udp/net.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006-2011 Hal Brodigan (postmodern.mod3 at gmail.com)
+# Copyright (c) 2006-2012 Hal Brodigan (postmodern.mod3 at gmail.com)
 #
 # This file is part of Ronin Support.
 #

data/lib/ronin/network/http.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006-2011 Hal Brodigan (postmodern.mod3 at gmail.com)
+# Copyright (c) 2006-2012 Hal Brodigan (postmodern.mod3 at gmail.com)
 #
 # This file is part of Ronin Support.
 #

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

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006-2011 Hal Brodigan (postmodern.mod3 at gmail.com)
+# Copyright (c) 2006-2012 Hal Brodigan (postmodern.mod3 at gmail.com)
 #
 # This file is part of Ronin Support.
 #

data/lib/ronin/network/http/exceptions/unknown_request.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006-2011 Hal Brodigan (postmodern.mod3 at gmail.com)
+# Copyright (c) 2006-2012 Hal Brodigan (postmodern.mod3 at gmail.com)
 #
 # This file is part of Ronin Support.
 #

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

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006-2011 Hal Brodigan (postmodern.mod3 at gmail.com)
+# Copyright (c) 2006-2012 Hal Brodigan (postmodern.mod3 at gmail.com)
 #
 # This file is part of Ronin Support.
 #
@@ -129,7 +129,7 @@ module Ronin
         new_options[:host] = url.host
         new_options[:port] = url.port
 
-        new_options[:user] = url.user if url.user
+        new_options[:user]     = url.user     if url.user
         new_options[:password] = url.password if url.password
 
         new_options[:path] = unless url.path.empty?
@@ -137,7 +137,7 @@ module Ronin
                              else
                                '/'
                              end
-        new_options[:path] += "?#{url.query}" if url.query
+        new_options[:path] += "?#{URI.escape(url.query)}" if url.query
 
         return new_options
       end
@@ -256,6 +256,12 @@ module Ronin
       # @option options [String] :path ('/')
       #   The path to request.
       #
+      # @option options [String] :query
+      #   The query-string to append to the request path.
+      #
+      # @option options [String] :query_params
+      #   The query-params to append to the request path.
+      #
       # @option options [String] :body
       #   The body of the request.
       #
@@ -297,7 +303,21 @@ module Ronin
         end
 
         headers = HTTP.headers(options[:headers])
-        path = (options[:path] || '/').to_s
+        path    = (options[:path] || '/').to_s
+        query   = if options[:query]
+                    URI.escape(options[:query])
+                  elsif options[:query_params]
+                    URI::QueryParams.dump(options[:query_params])
+                  end
+
+        if query
+          # append the query-string onto the path
+          path += if path.include?('?')
+                    "&#{query}"
+                  else
+                    "?#{query}"
+                  end
+        end
 
         request = Net::HTTP.const_get(name).new(path,headers)
 
@@ -309,12 +329,11 @@ module Ronin
           end
         end
 
-        if (user = options.delete(:user))
-          user = user.to_s
-
-          if (password = options.delete(:password))
-            password = password.to_s
-          end
+        if options[:user]
+          user     = options[:user].to_s
+          password = if options[:password]
+                       options[:password].to_s
+                     end
 
           request.basic_auth(user,password)
         end
@@ -352,11 +371,11 @@ module Ronin
       # @option :ssl [Symbol] :verify
       #   Specifies the SSL certificate verification mode.
       #   
-      # @yield [session]
+      # @yield [http]
       #   If a block is given, it will be passed the newly created HTTP
       #   session object.
       #
-      # @yieldparam [Net::HTTP] session
+      # @yieldparam [Net::HTTP] http
       #   The newly created HTTP session.
       #
       # @return [Net::HTTP]
@@ -367,36 +386,36 @@ module Ronin
       def http_connect(options={},&block)
         options = HTTP.expand_options(options)
 
-        host = options[:host].to_s
-        port = options[:port]
+        host  = options[:host].to_s
+        port  = options[:port]
         proxy = options[:proxy]
         proxy_host = if (proxy && proxy[:host])
                        proxy[:host].to_s
                      end
 
-        sess = Net::HTTP::Proxy(
+        http = Net::HTTP::Proxy(
           proxy_host,
           proxy[:port],
           proxy[:user],
           proxy[:password]
-        ).new(host.to_s,port)
+        ).new(host,port)
 
         if options[:ssl]
-          sess.use_ssl = true
-          sess.verify_mode = SSL::VERIFY[options[:ssl][:verify]]
+          http.use_ssl     = true
+          http.verify_mode = SSL::VERIFY[options[:ssl][:verify]]
         end
 
-        sess.start()
+        http.start()
 
         if block
           if block.arity == 2
-            block.call(sess,options)
+            block.call(http,options)
           else
-            block.call(sess)
+            block.call(http)
           end
         end
 
-        return sess
+        return http
       end
 
       #
@@ -429,11 +448,11 @@ module Ronin
       # @option :ssl [Symbol] :verify
       #   Specifies the SSL certificate verification mode.
       #   
-      # @yield [session]
+      # @yield [http]
       #   If a block is given, it will be passed the newly created HTTP
       #   session object.
       #
-      # @yieldparam [Net::HTTP] session
+      # @yieldparam [Net::HTTP] http
       #   The newly created HTTP session.
       #
       # @return [nil]
@@ -443,16 +462,16 @@ module Ronin
       # @api public
       #
       def http_session(options={},&block)
-        http_connect(options) do |sess,expanded_options|
+        http_connect(options) do |http,expanded_options|
           if block
             if block.arity == 2
-              block.call(sess,expanded_options)
+              block.call(http,expanded_options)
             else
-              block.call(sess)
+              block.call(http)
             end
           end
 
-          sess.finish
+          http.finish
         end
 
         return nil
@@ -499,7 +518,7 @@ module Ronin
       # @api public
       #
       def http_request(options={},&block)
-        resp = nil
+        response = nil
 
         http_session(options) do |http,expanded_options|
           req = HTTP.request(expanded_options)
@@ -512,10 +531,10 @@ module Ronin
             end
           end
 
-          resp = http.request(req)
+          response = http.request(req)
         end
 
-        return resp
+        return response
       end
 
       #
@@ -627,10 +646,10 @@ module Ronin
       # @api public
       #
       def http_copy(options={})
-        resp = http_request(options.merge(:method => :copy))
+        response = http_request(options.merge(:method => :copy))
 
-        yield resp if block_given?
-        return resp
+        yield response if block_given?
+        return response
       end
 
       #
@@ -663,10 +682,10 @@ module Ronin
           options[:header].merge!(original_headers)
         end
 
-        resp = http_request(options.merge(:method => :delete))
+        response = http_request(options.merge(:method => :delete))
 
-        yield resp if block_given?
-        return resp
+        yield response if block_given?
+        return response
       end
 
       #
@@ -690,10 +709,10 @@ module Ronin
       # @api public
       #
       def http_get(options={},&block)
-        resp = http_request(options.merge(:method => :get))
+        response = http_request(options.merge(:method => :get))
 
-        yield resp if block_given?
-        return resp
+        yield response if block_given?
+        return response
       end
 
       #
@@ -712,7 +731,13 @@ module Ronin
       # @api public
       #
       def http_get_headers(options={})
-        http_get(options).to_hash
+        headers = {}
+
+        http_get(options).each_header do |name,value|
+          headers[HTTP.header_name(name)] = value
+        end
+
+        return headers
       end
 
       #
@@ -753,10 +778,10 @@ module Ronin
       # @api public
       #
       def http_head(options={},&block)
-        resp = http_request(options.merge(:method => :head))
+        response = http_request(options.merge(:method => :head))
 
-        yield resp if block_given?
-        return resp
+        yield response if block_given?
+        return response
       end
 
       #
@@ -780,10 +805,10 @@ module Ronin
       # @api public
       #
       def http_lock(options={},&block)
-        resp = http_request(options.merge(:method => :lock))
+        response = http_request(options.merge(:method => :lock))
 
-        yield resp if block_given?
-        return resp
+        yield response if block_given?
+        return response
       end
 
       #
@@ -807,10 +832,10 @@ module Ronin
       # @api public
       #
       def http_mkcol(options={},&block)
-        resp = http_request(options.merge(:method => :mkcol))
+        response = http_request(options.merge(:method => :mkcol))
 
-        yield resp if block_given?
-        return resp
+        yield response if block_given?
+        return response
       end
 
       #
@@ -834,10 +859,10 @@ module Ronin
       # @api public
       #
       def http_move(options={},&block)
-        resp = http_request(options.merge(:method => :move))
+        response = http_request(options.merge(:method => :move))
 
-        yield resp if block_given?
-        return resp
+        yield response if block_given?
+        return response
       end
 
       #
@@ -861,10 +886,10 @@ module Ronin
       # @api public
       #
       def http_options(options={},&block)
-        resp = http_request(options.merge(:method => :options))
+        response = http_request(options.merge(:method => :options))
 
-        yield resp if block_given?
-        return resp
+        yield response if block_given?
+        return response
       end
 
       #
@@ -891,10 +916,10 @@ module Ronin
       # @api public
       #
       def http_post(options={},&block)
-        resp = http_request(options.merge(:method => :post))
+        response = http_request(options.merge(:method => :post))
 
-        yield resp if block_given?
-        return resp
+        yield response if block_given?
+        return response
       end
 
       #
@@ -916,7 +941,13 @@ module Ronin
       # @api public
       #
       def http_post_headers(options={})
-        http_post(options).to_hash
+        headers = {}
+
+        http_post(options).each_header do |name,value|
+          headers[HTTP.header_name(name)] = value
+        end
+
+        return headers
       end
 
       #
@@ -969,10 +1000,10 @@ module Ronin
           options[:header].merge!(original_headers)
         end
 
-        resp = http_request(options.merge(:method => :propfind))
+        response = http_request(options.merge(:method => :propfind))
 
-        yield resp if block_given?
-        return resp
+        yield response if block_given?
+        return response
       end
 
       #
@@ -996,10 +1027,10 @@ module Ronin
       # @api public
       #
       def http_prop_patch(options={},&block)
-        resp = http_request(options.merge(:method => :proppatch))
+        response = http_request(options.merge(:method => :proppatch))
 
-        yield resp if block_given?
-        return resp
+        yield response if block_given?
+        return response
       end
 
       #
@@ -1023,10 +1054,10 @@ module Ronin
       # @api public
       #
       def http_trace(options={},&block)
-        resp = http_request(options.merge(:method => :trace))
+        response = http_request(options.merge(:method => :trace))
 
-        yield resp if block_given?
-        return resp
+        yield response if block_given?
+        return response
       end
 
       #
@@ -1050,10 +1081,10 @@ module Ronin
       # @api public
       #
       def http_unlock(options={},&block)
-        resp = http_request(options.merge(:method => :unlock))
+        response = http_request(options.merge(:method => :unlock))
 
-        yield resp if block_given?
-        return resp
+        yield response if block_given?
+        return response
       end
     end
   end