ronin-support 0.4.0 → 0.4.1

data/lib/ronin/network/ssl.rb

@@ -22,6 +22,7 @@ require 'ronin/network/tcp'
 begin
   require 'openssl'
 rescue ::LoadError
+  $stderr.puts "WARNING: Ruby was not compiled with OpenSSL support"
 end
 
 module Ronin
@@ -30,7 +31,7 @@ module Ronin
     # Provides helper methods for communicating with SSL-enabled services.
     #
     module SSL
-      extend TCP
+      include TCP
 
       # Maps SSL verify modes to `OpenSSL::SSL::VERIFY_*` constants.
       #
@@ -53,130 +54,134 @@ module Ronin
 
         hash[key] = OpenSSL::SSL.const_get(verify_const)
       end
-    end
 
-    #
-    # Establishes a SSL connection.
-    #
-    # @param [String] host
-    #   The host to connect to.
-    #
-    # @param [Integer] port
-    #   The port to connect to.
-    #
-    # @param [Hash] options
-    #   Additional options.
-    #
-    # @option options [String] :local_host
-    #   The local host to bind to.
-    #
-    # @option options [Integer] :local_port
-    #   The local port to bind to.
-    #
-    # @option options [Symbol] :verify
-    #   Specifies whether to verify the SSL certificate.
-    #   May be one of the following:
-    #
-    #   * `:none`
-    #   * `:peer`
-    #   * `:client_once`
-    #   * `:fail_if_no_peer_cert`
-    #
-    # @option options [String] :cert
-    #   The path to the SSL certificate.
-    #
-    # @option options [String] :key
-    #   The path to the SSL key.
-    #
-    # @yield [ssl_socket]
-    #   The given block will be passed the new SSL Socket.
-    #
-    # @yieldparam [OpenSSL::SSL::SSLSocket] ssl_socket
-    #   The new SSL Socket.
-    #
-    # @return [OpenSSL::SSL::SSLSocket]
-    #   the new SSL Socket.
-    #
-    # @example
-    #   socket = ssl_connect('twitter.com',443)
-    #
-    # @api public
-    #
-    def ssl_connect(host,port,options={})
-      local_host = options[:local_host]
-      local_port = options[:local_port]
+      #
+      # Establishes a SSL connection.
+      #
+      # @param [String] host
+      #   The host to connect to.
+      #
+      # @param [Integer] port
+      #   The port to connect to.
+      #
+      # @param [Hash] options
+      #   Additional options.
+      #
+      # @option options [String] :local_host
+      #   The local host to bind to.
+      #
+      # @option options [Integer] :local_port
+      #   The local port to bind to.
+      #
+      # @option options [Symbol] :verify
+      #   Specifies whether to verify the SSL certificate.
+      #   May be one of the following:
+      #
+      #   * `:none`
+      #   * `:peer`
+      #   * `:client_once`
+      #   * `:fail_if_no_peer_cert`
+      #
+      # @option options [String] :cert
+      #   The path to the SSL certificate.
+      #
+      # @option options [String] :key
+      #   The path to the SSL key.
+      #
+      # @yield [ssl_socket]
+      #   The given block will be passed the new SSL Socket.
+      #
+      # @yieldparam [OpenSSL::SSL::SSLSocket] ssl_socket
+      #   The new SSL Socket.
+      #
+      # @return [OpenSSL::SSL::SSLSocket]
+      #   the new SSL Socket.
+      #
+      # @example
+      #   socket = ssl_connect('twitter.com',443)
+      #
+      # @see http://rubydoc.info/stdlib/openssl/OpenSSL/SSL/SSLSocket
+      #
+      # @api public
+      #
+      def ssl_connect(host,port,options={})
+        local_host = options[:local_host]
+        local_port = options[:local_port]
 
-      socket = tcp_connect(host,port,local_host,local_port)
+        socket = tcp_connect(host,port,local_host,local_port)
 
-      ssl_context = OpenSSL::SSL::SSLContext.new()
-      ssl_context.verify_mode = SSL::VERIFY[options[:verify]]
+        ssl_context = OpenSSL::SSL::SSLContext.new()
+        ssl_context.verify_mode = SSL::VERIFY[options[:verify]]
 
-      if options[:cert]
-        cert_file = File.new(options[:cert])
-        ssl_context.cert = OpenSSL::X509::Certificate.new(cert_file)
-      end
+        if options[:cert]
+          cert_file = File.new(options[:cert])
+          ssl_context.cert = OpenSSL::X509::Certificate.new(cert_file)
+        end
 
-      if options[:key]
-        key_file = File.new(options[:key])
-        ssl_context.key = OpenSSL::PKey::RSA.new(key_file)
-      end
+        if options[:key]
+          key_file = File.new(options[:key])
+          ssl_context.key = OpenSSL::PKey::RSA.new(key_file)
+        end
 
-      ssl_socket = OpenSSL::SSL::SSLSocket.new(socket,ssl_context)
-      ssl_socket.sync_close = true
-      ssl_socket.connect
+        ssl_socket = OpenSSL::SSL::SSLSocket.new(socket,ssl_context)
+        ssl_socket.sync_close = true
+        ssl_socket.connect
 
-      yield ssl_socket if block_given?
-      return ssl_socket
-    end
+        yield ssl_socket if block_given?
+        return ssl_socket
+      end
 
-    #
-    # Creates a new temporary SSL connection.
-    #
-    # @param [String] host
-    #   The host to connect to.
-    #
-    # @param [Integer] port
-    #   The port to connect to.
-    #
-    # @param [Hash] options
-    #   Additional options.
-    #
-    # @option options [String] :local_host
-    #   The local host to bind to.
-    #
-    # @option options [Integer] :local_port
-    #   The local port to bind to.
-    #
-    # @option options [Symbol] :verify
-    #   Specifies whether to verify the SSL certificate.
-    #
-    # @option options [String] :cert
-    #   The path to the SSL certificate.
-    #
-    # @option options [String] :key
-    #   The path to the SSL key.
-    #
-    # @yield [ssl_socket]
-    #   The given block will be passed the temporary SSL Socket.
-    #
-    # @yieldparam [OpenSSL::SSL::SSLSocket] ssl_socket
-    #   The temporary SSL Socket.
-    #
-    # @return [nil]
-    #
-    # @example
-    #   ssl_session('twitter.com',443) do |sock|
-    #     sock.write("GET /\n\n")
-    #
-    #     sock.each_line { |line| puts line }
-    #   end
-    #
-    # @api public
-    #
-    def ssl_session(host,port,options={},&block)
-      ssl_socket = ssl_connect(host,port,options,&block)
-      ssl_socket.close
-      return nil
+      #
+      # Creates a new temporary SSL connection.
+      #
+      # @param [String] host
+      #   The host to connect to.
+      #
+      # @param [Integer] port
+      #   The port to connect to.
+      #
+      # @param [Hash] options
+      #   Additional options.
+      #
+      # @option options [String] :local_host
+      #   The local host to bind to.
+      #
+      # @option options [Integer] :local_port
+      #   The local port to bind to.
+      #
+      # @option options [Symbol] :verify
+      #   Specifies whether to verify the SSL certificate.
+      #
+      # @option options [String] :cert
+      #   The path to the SSL certificate.
+      #
+      # @option options [String] :key
+      #   The path to the SSL key.
+      #
+      # @yield [ssl_socket]
+      #   The given block will be passed the temporary SSL Socket.
+      #
+      # @yieldparam [OpenSSL::SSL::SSLSocket] ssl_socket
+      #   The temporary SSL Socket.
+      #
+      # @return [nil]
+      #
+      # @example
+      #   ssl_session('twitter.com',443) do |sock|
+      #     sock.write("GET / HTTP/1.1\n\r\n\r")
+      #
+      #     sock.each_line { |line| puts line }
+      #   end
+      #
+      # @see http://rubydoc.info/stdlib/openssl/OpenSSL/SSL/SSLSocket
+      #
+      # @api public
+      #
+      def ssl_session(host,port,options={},&block)
+        ssl_socket = ssl_connect(host,port,options,&block)
+        ssl_socket.close
+        return nil
+      end
     end
   end
 end

data/lib/ronin/network/tcp.rb

@@ -54,7 +54,7 @@ module Ronin
       #
       # @example
       #   tcp_connect('www.wired.com',80) do |socket|
-      #     socket.write("GET /\n\n")
+      #     socket.write("GET / HTTP/1.1\n\r\n\r")
       #
       #     puts socket.readlines
       #     socket.close
@@ -62,7 +62,7 @@ module Ronin
       #
       # @api public
       #
-      def tcp_connect(host,port,local_host=nil,local_port=nil)
+      def tcp_connect(host,port,local_host=nil,local_port=0)
         host       = host.to_s
         local_host = (local_host || '0.0.0.0').to_s
 
@@ -99,7 +99,7 @@ module Ronin
       #
       # @api public
       #
-      def tcp_connect_and_send(data,host,port,local_host=nil,local_port=nil)
+      def tcp_connect_and_send(data,host,port,local_host=nil,local_port=0)
         socket = tcp_connect(host,port,local_host,local_port)
         socket.write(data)
 
@@ -134,7 +134,7 @@ module Ronin
       #
       # @api public
       #
-      def tcp_session(host,port,local_host=nil,local_port=nil)
+      def tcp_session(host,port,local_host=nil,local_port=0)
         socket = tcp_connect(host,port,local_host,local_port)
 
         yield socket if block_given?
@@ -173,7 +173,7 @@ module Ronin
       #
       # @api public
       #
-      def tcp_banner(host,port,local_host=nil,local_port=nil)
+      def tcp_banner(host,port,local_host=nil,local_port=0)
         banner = nil
 
         tcp_session(host,port,local_host,local_port) do |socket|
@@ -213,7 +213,7 @@ module Ronin
       #
       # @api public
       #
-      def tcp_send(data,host,port,local_host=nil,local_port=nil)
+      def tcp_send(data,host,port,local_host=nil,local_port=0)
         tcp_session(host,port,local_host,local_port) do |socket|
           socket.write(data)
         end
@@ -238,7 +238,7 @@ module Ronin
       #
       # @api public
       #
-      def tcp_server(port=nil,host=nil)
+      def tcp_server(port=0,host=nil)
         host = (host || '0.0.0.0').to_s
 
         server = TCPServer.new(host,port)
@@ -279,7 +279,7 @@ module Ronin
       #
       # @api public
       #
-      def tcp_server_session(port=nil,host=nil,&block)
+      def tcp_server_session(port=0,host=nil,&block)
         server = tcp_server(port,host,&block)
         server.close()
         return nil
@@ -305,7 +305,7 @@ module Ronin
       #
       # @api public
       #
-      def tcp_single_server(port=nil,host=nil)
+      def tcp_single_server(port=0,host=nil)
         host = host.to_s
 
         server = TCPServer.new(host,port)

data/lib/ronin/network/telnet.rb

@@ -243,7 +243,7 @@ module Ronin
       #     movie.each_line { |line| puts line }
       #   end
       #
-      # @see telnet_session
+      # @see #telnet_connect
       #
       # @api public
       #

data/lib/ronin/network/udp.rb

@@ -60,7 +60,7 @@ module Ronin
       #
       # @api public
       #
-      def udp_connect(host,port,local_host=nil,local_port=nil)
+      def udp_connect(host,port,local_host=nil,local_port=0)
         host       = host.to_s
         local_host = (local_host || '0.0.0.0').to_s
 
@@ -102,7 +102,7 @@ module Ronin
       #
       # @api public
       #
-      def udp_connect_and_send(data,host,port,local_host=nil,local_port=nil)
+      def udp_connect_and_send(data,host,port,local_host=nil,local_port=0)
         socket = udp_connect(host,port,local_host,local_port)
         socket.write(data)
 
@@ -137,7 +137,7 @@ module Ronin
       #
       # @api public
       #
-      def udp_session(host,port,local_host=nil,local_port=nil)
+      def udp_session(host,port,local_host=nil,local_port=0)
         socket = udp_connect(host,port,local_host,local_port)
 
         yield socket if block_given?
@@ -177,7 +177,7 @@ module Ronin
       #
       # @since 0.4.0
       #
-      def udp_send(data,host,port,local_host=nil,local_port=nil)
+      def udp_send(data,host,port,local_host=nil,local_port=0)
         udp_session(host,port,local_host,local_port) do |socket|
           socket.write(data)
         end
@@ -211,7 +211,7 @@ module Ronin
       #
       # @api public
       #
-      def udp_banner(host,port,local_host=nil,local_port=nil)
+      def udp_banner(host,port,local_host=nil,local_port=0)
         banner = nil
 
         udp_session(host,port,local_host,local_port) do |socket|
@@ -239,7 +239,7 @@ module Ronin
       #
       # @api public
       #
-      def udp_server(port=nil,host=nil)
+      def udp_server(port=0,host=nil)
         host   = (host || '0.0.0.0').to_s
         server = UDPSocket.new
 
@@ -274,7 +274,7 @@ module Ronin
       #
       # @api public
       #
-      def udp_server_session(port=nil,host=nil,&block)
+      def udp_server_session(port=0,host=nil,&block)
         server = udp_server(port,host,&block)
 
         server.close()

data/lib/ronin/support/support.rb

@@ -29,6 +29,7 @@ module Ronin
     include Network::DNS
     include Network::TCP
     include Network::UDP
+    include Network::SSL
     include Network::SMTP
     include Network::ESMTP
     include Network::POP3

data/lib/ronin/support/version.rb

@@ -20,6 +20,6 @@
 module Ronin
   module Support
     # ronin-support version
-    VERSION = '0.4.0'
+    VERSION = '0.4.1'
   end
 end

data/lib/ronin/ui/output/output.rb

@@ -32,7 +32,7 @@ module Ronin
                 :quiet
               end
 
-      @handler = if STDOUT.tty?
+      @handler = if $stdout.tty?
                    Terminal::Color
                  else
                    Terminal::Raw

data/lib/ronin/ui/output/terminal/color.rb

@@ -52,7 +52,7 @@ module Ronin
           # @api private
           #
           def self.write(data)
-            STDOUT.write(data)
+            $stdout.write(data)
           end
 
           #
@@ -66,7 +66,7 @@ module Ronin
           # @api private
           #
           def self.print_info(message)
-            puts "#{GREEN}[-] #{message}#{CLEAR}"
+            $stdout.puts "#{GREEN}[-] #{message}#{CLEAR}"
           end
 
           #
@@ -80,7 +80,7 @@ module Ronin
           # @api private
           #
           def self.print_debug(message)
-            puts "#{CYAN}[=] #{message}#{CLEAR}"
+            $stdout.puts "#{CYAN}[=] #{message}#{CLEAR}"
           end
 
           #
@@ -94,7 +94,7 @@ module Ronin
           # @api private
           #
           def self.print_warning(message)
-            puts "#{YELLOW}[*] #{message}#{CLEAR}"
+            $stdout.puts "#{YELLOW}[*] #{message}#{CLEAR}"
           end
 
           #
@@ -108,7 +108,7 @@ module Ronin
           # @api private
           #
           def self.print_error(message)
-            puts "#{RED}[!] #{message}#{CLEAR}"
+            $stdout.puts "#{RED}[!] #{message}#{CLEAR}"
           end
 
         end