ronin-support 0.4.0 → 0.4.1

data/ChangeLog.md

@@ -1,3 +1,20 @@
+### 0.4.1 / 2012-04-01
+
+* Added "WARNING" messages for when ronin-support cannot load `openssl` or
+  `zlib`.
+* Added YARD `@see` tags to all methods defined in {Ronin::Network::Mixins}.
+* Use `$stdout`, `$stderr` instead of `STDOUT`, `STDERR`, respectively.
+* Included {Ronin::Network::DNS} into {Net} as well.
+* Included {Ronin::Network::TCP} into {Ronin::Network::SSL}.
+* Require `ronin/network/ssl` in `ronin/network`.
+* Require `ronin/network/extensions/ssl` in `ronin/network/extensions`.
+* Included {Ronin::Network::SSL} into {Ronin::Support}.
+* Default all `local_port` variables to `0` instead of `nil`. Workaround
+  for JRuby bug [#6574](http://jira.codehaus.org/browse/JRUBY-6574).
+* Fixed a major syntax error in `ronin/network/ssl`, that caused the `ssl_*`
+  methods to not be defined in {Ronin::Network::SSL}.
+* Fixed YARD `@see` tags in the {Ronin::Network} modules.
+
 ### 0.4.0 / 2012-02-12
 
 * Require uri-query_params ~> 0.6.

data/Gemfile

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 gemspec
 
 platforms :jruby do
-  gem 'jruby-openssl',	'~> 0.7.0'
+  gem 'jruby-openssl',	'~> 0.7'
 end
 
 group :development do
@@ -17,12 +17,12 @@ end
 
 group :test do
   gem 'i18n',           '~> 0.4'
-  gem 'tzinfo',         '~> 0.3.0'
+  gem 'tzinfo',         '~> 0.3'
 
   INFLECTORS = {
-    'activesupport' => '~> 3.0.0',
-    'dm-core' => '~> 1.0',
-    'extlib' => '~> 0.9.15'
+    'activesupport' => '~> 3.0',
+    'dm-core'       => '~> 1.0',
+    'extlib'        => '~> 0.9'
   }
 
   inflector = ENV.fetch('INFLECTOR','dm-core')

data/README.md

@@ -1,8 +1,8 @@
 # Ronin Support
 
-* [Source](http://github.com/ronin-ruby/ronin-support)
-* [Issues](http://github.com/ronin-ruby/ronin-support/issues)
-* [Documentation](http://rubydoc.info/gems/ronin-support/frames)
+* [Source](https://github.com/ronin-ruby/ronin-support)
+* [Issues](https://github.com/ronin-ruby/ronin-support/issues)
+* [Documentation](http://ronin-ruby.github.com/docs/ronin-support/frames)
 * [Mailing List](http://groups.google.com/group/ronin-ruby)
 * [irc.freenode.net #ronin](http://webchat.freenode.net/?channels=ronin&uio=Mj10cnVldd)
 
@@ -31,6 +31,7 @@ or payloads over many common Source-Code-Management (SCM) systems.
     * DNS
     * TCP
     * UDP
+    * SSL
     * SMTP / ESMTP
     * POP3
     * Imap
@@ -57,17 +58,17 @@ please see [Everyday Ronin](http://ronin-ruby.github.com/guides/everyday_ronin.h
 ## Requirements
 
 * [Ruby](http://www.ruby-lang.org/) >= 1.8.7
-* [chars](http://github.com/postmodern/chars#readme)
+* [chars](https://github.com/postmodern/chars#readme)
   ~> 0.2
-* [hexdump](http://github.com/postmodern/hexdump#readme)
+* [hexdump](https://github.com/postmodern/hexdump#readme)
   ~> 0.1
-* [combinatorics](http://github.com/postmodern/combinatorics#readme)
+* [combinatorics](https://github.com/postmodern/combinatorics#readme)
   ~> 0.4
-* [uri-query_params](http://github.com/postmodern/uri-query_params#readme)
+* [uri-query_params](https://github.com/postmodern/uri-query_params#readme)
   ~> 0.6
-* [data_paths](http://github.com/postmodern/data_paths#readme)
+* [data_paths](https://github.com/postmodern/data_paths#readme)
   ~> 0.3
-* [parameters](http://github.com/postmodern/parameters#readme)
+* [parameters](https://github.com/postmodern/parameters#readme)
   ~> 0.4
 
 ## Install

data/Rakefile

@@ -36,3 +36,4 @@ task :default => :spec
 
 require 'yard'
 YARD::Rake::YardocTask.new
+task :docs => :yard

data/gemspec.yml

@@ -22,5 +22,5 @@ dependencies:
 
 development_dependencies:
   bundler: ~> 1.0
-  yard: ~> 0.7.0
-  yard-parameters: ~> 0.1.0
+  yard: ~> 0.7
+  yard-parameters: ~> 0.1

data/lib/ronin/formatting/extensions/binary/string.rb

@@ -25,9 +25,8 @@ require 'enumerator'
 
 begin
   require 'zlib'
-rescue Gem::LoadError => e
-  raise(e)
 rescue ::LoadError
+  $stderr.puts "WARNING: Ruby was not compiled with zlib support"
 end
 
 class String

data/lib/ronin/network.rb

@@ -20,6 +20,7 @@
 require 'ronin/network/dns'
 require 'ronin/network/tcp'
 require 'ronin/network/udp'
+require 'ronin/network/ssl'
 require 'ronin/network/smtp'
 require 'ronin/network/esmtp'
 require 'ronin/network/pop3'

data/lib/ronin/network/extensions.rb

@@ -17,8 +17,10 @@
 # along with Ronin Support.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+require 'ronin/network/extensions/dns'
 require 'ronin/network/extensions/tcp'
 require 'ronin/network/extensions/udp'
+require 'ronin/network/extensions/ssl'
 require 'ronin/network/extensions/smtp'
 require 'ronin/network/extensions/esmtp'
 require 'ronin/network/extensions/pop3'

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

@@ -0,0 +1,20 @@
+#
+# Copyright (c) 2006-2012 Hal Brodigan (postmodern.mod3 at gmail.com)
+#
+# This file is part of Ronin Support.
+#
+# Ronin Support is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published
+# by the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Ronin Support is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with Ronin Support.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+require 'ronin/network/extensions/dns/net'

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

@@ -0,0 +1,24 @@
+#
+# Copyright (c) 2006-2012 Hal Brodigan (postmodern.mod3 at gmail.com)
+#
+# This file is part of Ronin Support.
+#
+# Ronin Support is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published
+# by the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Ronin Support is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with Ronin Support.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+require 'ronin/network/dns'
+
+module Net
+  extend Ronin::Network::DNS
+end

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

@@ -17,209 +17,211 @@
 # along with Ronin Support.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-require 'ronin/network/extensions/http/net'
+require 'ronin/network/http'
 
 require 'uri/http'
 
 module URI
   class HTTP < Generic
 
+    include Ronin::Network::HTTP
+
     #
-    # @see Net.http_request
+    # @see Ronin::Network::HTTP#http_request
     #
     # @since 0.3.0
     #
     def request(options={},&block)
-      Net.http_request(options.merge(:url => self),&block)
+      http_request(options.merge(:url => self),&block)
     end
 
     #
-    # @see Net.http_status
+    # @see Ronin::Network::HTTP#http_status
     #
     # @since 0.3.0
     #
     def status(options={})
-      Net.http_status(options.merge(:url => self))
+      http_status(options.merge(:url => self))
     end
 
     #
-    # @see Net.http_ok?
+    # @see Ronin::Network::HTTP#http_ok?
     #
     # @since 0.3.0
     #
     def ok?(options={})
-      Net.http_ok?(options.merge(:url => self))
+      http_ok?(options.merge(:url => self))
     end
 
     #
-    # @see Net.http_server
+    # @see Ronin::Network::HTTP#http_server
     #
     # @since 0.3.0
     #
     def server(options={})
-      Net.http_server(options.merge(:url => self))
+      http_server(options.merge(:url => self))
     end
 
     #
-    # @see Net.http_powered_by
+    # @see Ronin::Network::HTTP#http_powered_by
     #
     # @since 0.3.0
     #
     def powered_by(options={})
-      Net.http_powered_by(options.merge(:url => self))
+      http_powered_by(options.merge(:url => self))
     end
 
     #
-    # @see Net.http_copy
+    # @see Ronin::Network::HTTP#http_copy
     #
     # @since 0.3.0
     #
     def copy(options={},&block)
-      Net.http_copy(options.merge(:url => self),&block)
+      http_copy(options.merge(:url => self),&block)
     end
 
     #
-    # @see Net.http_delete
+    # @see Ronin::Network::HTTP#http_delete
     #
     # @since 0.3.0
     #
     def delete(options={},&block)
-      Net.http_delete(options.merge(:url => self),&block)
+      http_delete(options.merge(:url => self),&block)
     end
 
     #
-    # @see Net.http_get
+    # @see Ronin::Network::HTTP#http_get
     #
     # @since 0.3.0
     #
     def get(options={},&block)
-      Net.http_get(options.merge(:url => self),&block)
+      http_get(options.merge(:url => self),&block)
     end
 
     #
-    # @see Net.http_get_headers
+    # @see Ronin::Network::HTTP#http_get_headers
     #
     # @since 0.3.0
     #
     def get_headers(options={},&block)
-      Net.http_get_headers(options.merge(:url => self),&block)
+      http_get_headers(options.merge(:url => self),&block)
     end
 
     #
-    # @see Net.http_get_body
+    # @see Ronin::Network::HTTP#http_get_body
     #
     # @since 0.3.0
     #
     def get_body(options={},&block)
-      Net.http_get_body(options.merge(:url => self),&block)
+      http_get_body(options.merge(:url => self),&block)
     end
 
     #
-    # @see Net.http_head
+    # @see Ronin::Network::HTTP#http_head
     #
     # @since 0.3.0
     #
     def head(options={},&block)
-      Net.http_head(options.merge(:url => self),&block)
+      http_head(options.merge(:url => self),&block)
     end
 
     #
-    # @see Net.http_lock
+    # @see Ronin::Network::HTTP#http_lock
     #
     # @since 0.3.0
     #
     def lock(options={},&block)
-      Net.http_lock(options.merge(:url => self),&block)
+      http_lock(options.merge(:url => self),&block)
     end
 
     #
-    # @see Net.http_mkcol
+    # @see Ronin::Network::HTTP#http_mkcol
     #
     # @since 0.3.0
     #
     def mkcol(options={},&block)
-      Net.http_mkcol(options.merge(:url => self),&block)
+      http_mkcol(options.merge(:url => self),&block)
     end
 
     #
-    # @see Net.http_move
+    # @see Ronin::Network::HTTP#http_move
     #
     # @since 0.3.0
     #
     def move(options={},&block)
-      Net.http_move(options.merge(:url => self),&block)
+      http_move(options.merge(:url => self),&block)
     end
 
     #
-    # @see Net.http_options
+    # @see Ronin::Network::HTTP#http_options
     #
     # @since 0.3.0
     #
     def options(options={},&block)
-      Net.http_options(options.merge(:url => self),&block)
+      http_options(options.merge(:url => self),&block)
     end
 
     #
-    # @see Net.http_post
+    # @see Ronin::Network::HTTP#http_post
     #
     # @since 0.3.0
     #
     def post(options={},&block)
-      Net.http_post(options.merge(:url => self),&block)
+      http_post(options.merge(:url => self),&block)
     end
 
     #
-    # @see Net.http_post_headers
+    # @see Ronin::Network::HTTP#http_post_headers
     #
     # @since 0.3.0
     #
     def post_headers(options={},&block)
-      Net.http_post_headers(options.merge(:url => self),&block)
+      http_post_headers(options.merge(:url => self),&block)
     end
 
     #
-    # @see Net.http_post_body
+    # @see Ronin::Network::HTTP#http_post_body
     #
     # @since 0.3.0
     #
     def post_body(options={},&block)
-      Net.http_post_body(options.merge(:url => self),&block)
+      http_post_body(options.merge(:url => self),&block)
     end
 
     #
-    # @see Net.http_prop_find
+    # @see Ronin::Network::HTTP#http_prop_find
     #
     # @since 0.3.0
     #
     def prop_find(options={},&block)
-      Net.http_prop_find(options.merge(:url => self),&block)
+      http_prop_find(options.merge(:url => self),&block)
     end
 
     #
-    # @see Net.http_prop_match
+    # @see Ronin::Network::HTTP#http_prop_match
     #
     # @since 0.3.0
     #
     def prop_match(options={},&block)
-      Net.http_prop_match(options.merge(:url => self),&block)
+      http_prop_match(options.merge(:url => self),&block)
     end
 
     #
-    # @see Net.http_trace
+    # @see Ronin::Network::HTTP#http_trace
     #
     # @since 0.3.0
     #
     def trace(options={},&block)
-      Net.http_trace(options.merge(:url => self),&block)
+      http_trace(options.merge(:url => self),&block)
     end
 
     #
-    # @see Net.http_unlock
+    # @see Ronin::Network::HTTP#http_unlock
     #
     # @since 0.3.0
     #
     def unlock(options={},&block)
-      Net.http_unlock(options.merge(:url => self),&block)
+      http_unlock(options.merge(:url => self),&block)
     end
 
   end

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

@@ -27,6 +27,7 @@ require 'net/http'
 begin
   require 'net/https'
 rescue ::LoadError
+  $stderr.puts "WARNING: could not load 'net/https'"
 end
 
 module Ronin
@@ -137,7 +138,7 @@ module Ronin
                              else
                                '/'
                              end
-        new_options[:path] += "?#{URI.escape(url.query)}" if url.query
+        new_options[:path] += "?#{url.query}" if url.query
 
         return new_options
       end
@@ -457,7 +458,7 @@ module Ronin
       #
       # @return [nil]
       #
-      # @see http_connect
+      # @see #http_connect
       #
       # @api public
       #
@@ -513,7 +514,7 @@ module Ronin
       # @return [Net::HTTP::Response]
       #   The response of the HTTP request.
       #
-      # @see http_session
+      # @see #http_session
       #
       # @api public
       #
@@ -549,7 +550,7 @@ module Ronin
       # @return [Integer]
       #   The HTTP Response Status.
       #
-      # @see http_request
+      # @see #http_request
       #
       # @since 0.2.0
       #
@@ -573,7 +574,7 @@ module Ronin
       # @return [Boolean]
       #   Specifies whether the response had an HTTP OK status code or not.
       #
-      # @see http_status
+      # @see #http_status
       #
       # @api public
       #
@@ -593,7 +594,7 @@ module Ronin
       # @return [String]
       #   The HTTP `Server` header.
       #
-      # @see http_request
+      # @see #http_request
       #
       # @api public
       #
@@ -615,7 +616,7 @@ module Ronin
       # @return [String]
       #   The HTTP `X-Powered-By` header.
       #
-      # @see http_request
+      # @see #http_request
       #
       # @api public
       #
@@ -641,7 +642,7 @@ module Ronin
       # @return [Net::HTTP::Response]
       #   The response of the HTTP request.
       #
-      # @see http_request
+      # @see #http_request
       #
       # @api public
       #
@@ -668,7 +669,7 @@ module Ronin
       # @return [Net::HTTP::Response]
       #   The response of the HTTP request.
       #
-      # @see http_request
+      # @see #http_request
       #
       # @api public
       #
@@ -704,7 +705,7 @@ module Ronin
       # @return [Net::HTTP::Response]
       #   The response of the HTTP request.
       #
-      # @see http_request
+      # @see #http_request
       #
       # @api public
       #
@@ -724,7 +725,7 @@ module Ronin
       # @return [Hash{String => Array<String>}]
       #   The Headers of the HTTP response.
       #
-      # @see http_get
+      # @see #http_get
       #
       # @since 0.2.0
       #
@@ -749,7 +750,7 @@ module Ronin
       # @return [String]
       #   The body of the HTTP response.
       #
-      # @see http_get
+      # @see #http_get
       #
       # @api public
       #
@@ -773,7 +774,7 @@ module Ronin
       # @return [Net::HTTP::Response]
       #   The response of the HTTP request.
       #
-      # @see http_request
+      # @see #http_request
       #
       # @api public
       #
@@ -800,7 +801,7 @@ module Ronin
       # @return [Net::HTTP::Response]
       #   The response of the HTTP request.
       #
-      # @see http_request
+      # @see #http_request
       #
       # @api public
       #
@@ -827,7 +828,7 @@ module Ronin
       # @return [Net::HTTP::Response]
       #   The response of the HTTP request.
       #
-      # @see http_request
+      # @see #http_request
       #
       # @api public
       #
@@ -854,7 +855,7 @@ module Ronin
       # @return [Net::HTTP::Response]
       #   The response of the HTTP request.
       #
-      # @see http_request
+      # @see #http_request
       #
       # @api public
       #
@@ -881,7 +882,7 @@ module Ronin
       # @return [Net::HTTP::Response]
       #   The response of the HTTP request.
       #
-      # @see http_request
+      # @see #http_request
       #
       # @api public
       #
@@ -911,7 +912,7 @@ module Ronin
       # @return [Net::HTTP::Response]
       #   The response of the HTTP request.
       #
-      # @see http_request
+      # @see #http_request
       #
       # @api public
       #
@@ -934,7 +935,7 @@ module Ronin
       # @return [Hash{String => Array<String>}]
       #   The headers of the HTTP response.
       #
-      # @see http_post
+      # @see #http_post
       #
       # @since 0.2.0
       #
@@ -962,7 +963,7 @@ module Ronin
       # @return [String]
       #   The body of the HTTP response.
       #
-      # @see http_post
+      # @see #http_post
       #
       # @api public
       #
@@ -992,7 +993,7 @@ module Ronin
       # @return [Net::HTTP::Response]
       #   The response of the HTTP request.
       #
-      # @see http_request
+      # @see #http_request
       #
       # @since 0.4.0
       #
@@ -1021,7 +1022,7 @@ module Ronin
       # @return [Net::HTTP::Response]
       #   The response of the HTTP request.
       #
-      # @see http_request
+      # @see #http_request
       #
       # @api public
       #
@@ -1057,7 +1058,7 @@ module Ronin
       # @return [Net::HTTP::Response]
       #   The response of the HTTP request.
       #
-      # @see http_request
+      # @see #http_request
       #
       # @api public
       #
@@ -1084,7 +1085,7 @@ module Ronin
       # @return [Net::HTTP::Response]
       #   The response of the HTTP request.
       #
-      # @see http_request
+      # @see #http_request
       #
       # @api public
       #
@@ -1111,7 +1112,7 @@ module Ronin
       # @return [Net::HTTP::Response]
       #   The response of the HTTP request.
       #
-      # @see http_request
+      # @see #http_request
       #
       # @api public
       #