ronin 0.2.2 → 0.2.3

data/lib/ronin/rpc/exceptions/response_missing.rb

@@ -23,7 +23,7 @@
 
 module Ronin
   module RPC
-    class ResponseMissing < RuntimeError
+    class ResponseMissing < StandardError
     end
   end
 end

data/lib/ronin/sessions/esmtp.rb

@@ -29,15 +29,6 @@ module Ronin
     module ESMTP
       include Session
 
-      setup_session do
-        parameter :host, :description => 'ESMTP host'
-        parameter :port, :description => 'ESMTP port'
-
-        parameter :esmtp_login, :description => 'ESMTP login'
-        parameter :esmtp_user, :description => 'ESMTP user'
-        parameter :esmtp_password, :description => 'ESMTP password'
-      end
-
       protected
 
       def esmtp_message(options={},&block)
@@ -45,7 +36,7 @@ module Ronin
       end
 
       def esmtp_connect(options={},&block)
-        require_params :host
+        require_variable :host
 
         options[:port] ||= @port
         options[:login] ||= @esmtp_login

data/lib/ronin/{objectify.rb → sessions/exceptions.rb}

@@ -1,7 +1,7 @@
 #
 #--
-# Ronin - A Ruby platform designed for information security and data
-# exploration tasks.
+# Ronin - A ruby development platform designed for information security
+# and data exploration tasks.
 #
 # Copyright (c) 2006-2009 Hal Brodigan (postmodern.mod3 at gmail.com)
 #
@@ -21,4 +21,4 @@
 #++
 #
 
-require 'ronin/objectify/objectify'
+require 'ronin/sessions/exceptions/variable_missing'

data/lib/ronin/{objectify/exceptions/unknown_object_context.rb → sessions/exceptions/variable_missing.rb}

@@ -1,7 +1,7 @@
 #
 #--
-# Ronin - A Ruby platform designed for information security and data
-# exploration tasks.
+# Ronin - A ruby development platform designed for information security
+# and data exploration tasks.
 #
 # Copyright (c) 2006-2009 Hal Brodigan (postmodern.mod3 at gmail.com)
 #
@@ -22,8 +22,8 @@
 #
 
 module Ronin
-  module Objectify
-    class UnknownObjectContext < RuntimeError
+  module Sessions
+    class VariableMissing < RuntimeError
     end
   end
 end

data/lib/ronin/sessions/http.rb

@@ -23,22 +23,12 @@
 
 require 'ronin/sessions/session'
 require 'ronin/network/http'
-require 'ronin/network/extensions/http'
 
 module Ronin
   module Sessions
     module HTTP
       include Session
 
-      setup_session do
-        parameter :http_user, :description => 'HTTP user'
-        parameter :http_password, :description => 'HTTP password'
-
-        parameter :http_proxy, :description => 'HTTP Proxy'
-
-        parameter :http_user_agent, :description => 'Web User-Agent'
-      end
-
       protected
 
       #
@@ -131,6 +121,9 @@ module Ronin
       private
 
       def http_merge_options(options={})
+        options[:host] ||= @http_host if @http_host
+        options[:port] ||= @http_port if @http_port
+
         options[:user] ||= @http_user if @http_user
         options[:password] ||= @http_password if @http_password
 

data/lib/ronin/sessions/imap.rb

@@ -29,19 +29,10 @@ module Ronin
     module IMAP
       include Session
 
-      setup_session do
-        parameter :host, :description => 'IMAP host'
-        parameter :port, :description => 'IMAP port'
-
-        parameter :imap_auth, :description => 'IMAP authentication mode'
-        parameter :imap_user, :description => 'IMAP user'
-        parameter :imap_password, :description => 'IMAP password'
-      end
-
       protected
 
       def imap_connect(options={},&block)
-        require_params :host
+        require_variable :host
 
         options[:port] ||= @port
         options[:auth] ||= @imap_auth

data/lib/ronin/sessions/pop3.rb

@@ -29,18 +29,10 @@ module Ronin
     module POP3
       include Session
 
-      setup_session do
-        parameter :host, :description => 'POP3 host'
-        parameter :port, :description => 'POP3 port'
-
-        parameter :pop3_user, :description => 'POP3 user'
-        parameter :pop3_password, :description => 'POP3 password'
-      end
-
       protected
 
       def pop3_connect(options={},&block)
-        require_params :host
+        require_variable :host
 
         options[:port] ||= @port
         options[:user] ||= @pop3_user

data/lib/ronin/sessions/session.rb

@@ -21,33 +21,23 @@
 #++
 #
 
-require 'ronin/extensions/meta'
-
-require 'parameters'
+require 'ronin/sessions/exceptions/variable_missing'
 
 module Ronin
   module Sessions
     module Session
-      def self.included(base)
-        base.module_eval do
-          def self.setup_session(&block)
-            #
-            # Includes Parameters and runs the _block_.
-            #
-            metaclass_def(:included) do |base_class|
-              base_class.class_eval { include Parameters }
-              base_class.class_eval(&block)
-            end
+      protected
 
-            #
-            # Extends Parameters and runs the specified _block_.
-            #
-            metaclass_def(:extended) do |base_obj|
-              base_obj.extend Parameters
-              base_obj.instance_eval(&block)
-            end
-          end
+      #
+      # Raises a VariableMissing exception if the instance variable with
+      # the specified _name_ is not defined, returns +true+ otherwise.
+      #
+      def require_variable(name)
+        if instance_variable_get("@#{name}").nil?
+          raise(VariableMissing,"the session variable @#{name} was not set",caller)
         end
+
+        return true
       end
     end
   end

data/lib/ronin/sessions/smtp.rb

@@ -29,15 +29,6 @@ module Ronin
     module SMTP
       include Session
 
-      setup_session do
-        parameter :host, :description => 'SMTP host'
-        parameter :port, :description => 'SMTP port'
-
-        parameter :smtp_login, :description => 'SMTP login'
-        parameter :smtp_user, :description => 'SMTP user'
-        parameter :smtp_password, :description => 'SMTP password'
-      end
-
       protected
 
       def smtp_message(options={},&block)
@@ -45,7 +36,7 @@ module Ronin
       end
 
       def smtp_connect(options={},&block)
-        require_params :host
+        require_variable :host
 
         options[:port] ||= @port
         options[:login] ||= @smtp_login

data/lib/ronin/sessions/tcp.rb

@@ -29,14 +29,6 @@ module Ronin
     module TCP
       include Session
 
-      setup_session do
-        parameter :local_host, :description => 'TCP local host'
-        parameter :local_port, :description => 'TCP local port'
-
-        parameter :host, :description => 'TCP remote host'
-        parameter :port, :description => 'TCP remote port'
-      end
-
       protected
 
       #
@@ -48,7 +40,8 @@ module Ronin
       # object.
       #
       def tcp_connect(&block)
-        require_params :host, :port
+        require_variable :host
+        require_variable :port
 
         return ::Net.tcp_connect(@host,@port,@local_host,@local_port,&block)
       end
@@ -59,7 +52,8 @@ module Ronin
       # it will be passed the newly created TCPSocket object.
       #
       def tcp_connect_and_send(data,&block)
-        require_params :host, :port
+        require_variable :host
+        require_variable :port
 
         return ::Net.tcp_connect_and_send(data,@host,@port,@local_host,@local_port,&block)
       end
@@ -71,7 +65,8 @@ module Ronin
       # has returned, the TCPSocket object will be closed.
       #
       def tcp_session(&block)
-        require_params :host, :port
+        require_variable :host
+        require_variable :port
 
         return Net.tcp_session(@host,@port,@local_host,@local_port,&block)
       end
@@ -83,7 +78,8 @@ module Ronin
       # banner String.
       #
       def tcp_banner(&block)
-        require_params :host, :port
+        require_variable :host
+        require_variable :port
 
         return ::Net.tcp_banner(@host,@port,@local_host,@local_port,&block)
       end
@@ -94,7 +90,8 @@ module Ronin
       # connection. Returns +true+ if the data was successfully sent.
       #
       def tcp_send(data)
-        require_params :host, :port
+        require_variable :host
+        require_variable :port
 
         return ::Net.tcp_send(data,@host,@port,@local_host,@local_port)
       end

data/lib/ronin/sessions/telnet.rb

@@ -26,28 +26,13 @@ require 'ronin/network/telnet'
 
 module Ronin
   module Sessions
-    module TELNET
+    module Telnet
       include Session
 
-      setup_session do
-        parameter :host, :description => 'Telnet host'
-        parameter :port,
-                  :default => lambda {
-                    Ronin::Network::Telnet.default_port
-                  },
-                  :description => 'Telnet port'
-
-        parameter :telnet_user, :description => 'Telnet user'
-        parameter :telnet_password, :description => 'Telnet password'
-
-        parameter :telnet_proxy, :description => 'Telnet proxy'
-        parameter :telnet_ssl, :description => 'Telnet SSL options'
-      end
-
       protected
 
       def telnet_connect(options={},&block)
-        require_params :host
+        require_variable :host
 
         options[:port] ||= @port
         options[:user] ||= @telnet_user

data/lib/ronin/sessions/udp.rb

@@ -29,14 +29,6 @@ module Ronin
     module UDP
       include Session
 
-      setup_session do
-        parameter :local_host, :description => 'local host'
-        parameter :local_port, :description => 'local port'
-
-        parameter :host, :description => 'remote host'
-        parameter :port, :description => 'remote port'
-      end
-
       protected
 
       #
@@ -46,7 +38,8 @@ module Ronin
       # of the UDP connection. A UDPSocket object will be returned.
       #
       def udp_connect(&block)
-        require_params :host, :port
+        require_variable :host
+        require_variable :port
 
         return ::Net.udp_connect(@host,@port,@local_host,@local_port,&block)
       end
@@ -57,7 +50,8 @@ module Ronin
       # it will be passed the newly created UDPSocket object.
       #
       def udp_connect_and_send(data,&block)
-        require_params :host, :port
+        require_variable :host
+        require_variable :port
 
         return ::Net.udp_connect_and_send(data,@host,@port,@local_host,@local_port,&block)
       end
@@ -69,7 +63,8 @@ module Ronin
       # has returned, the UDPSocket object will be closed.
       #
       def udp_session(&block)
-        require_params :host, :port
+        require_variable :host
+        require_variable :port
 
         return ::Net.udp_session(@host,@port,@local_host,@local_port,&block)
       end

data/lib/ronin/static/finders.rb

@@ -101,6 +101,14 @@ module Ronin
         return paths
       end
 
+      #
+      # Passes all matching static paths for the specified _path_ to the
+      # given _block_.
+      #
+      def each_static_path(path,&block)
+        static_find_all(path).each(&block)
+      end
+
       #
       # Returns all matching static files for the specified _path_.
       #
@@ -114,6 +122,14 @@ module Ronin
         return paths
       end
 
+      #
+      # Passes each matching static file for the specified _path_ to the
+      # given _block_.
+      #
+      def each_static_file(path,&block)
+        find_static_files(path).each(&block)
+      end
+
       #
       # Returns all matching static directories for the specified _path_.
       #
@@ -127,6 +143,14 @@ module Ronin
         return paths
       end
 
+      #
+      # Passes each matching static directory for the specified _path_ to
+      # the given _block_.
+      #
+      def each_static_dir(path,&block)
+        find_static_dirs(path).each(&block)
+      end
+
       #
       # Returns all matching static paths for the specified _pattern_.
       #

data/lib/ronin/ui/command_line/command_line.rb

@@ -22,28 +22,33 @@
 #
 
 require 'ronin/ui/command_line/exceptions/unknown_command'
-require 'ronin/ui/command_line/commands/console'
-require 'ronin/ui/console'
 
 require 'reverse_require'
+require 'extlib'
 
 module Ronin
   module UI
     module CommandLine
+      # Directory which stores the commands
+      COMMANDS_DIR = File.join('ronin','ui','command_line','commands')
+
+      # Name of the default to run
+      DEFAULT_COMMAND = 'console'
+
       #
       # Returns the commands registered with the command-line utility.
       #
       def CommandLine.commands
         unless class_variable_defined?('@@ronin_commands')
-          paths = Gem.find_resources('bin/ronin-*')
+          pattern = File.join('lib',COMMANDS_DIR,'*.rb')
+          paths = Gem.find_resources(pattern)
           
-          @@ronin_commands = {}
+          @@ronin_commands = []
             
           paths.each do |path|
-            next unless File.executable?(path)
-            name = File.basename(path).gsub(/^ronin-/,'')
+            name = File.basename(path).gsub(/\.rb$/,'')
 
-            @@ronin_commands[name] ||= path
+            @@ronin_commands << name unless @@ronin_commands.include?(name)
           end
         end
 
@@ -51,11 +56,11 @@ module Ronin
       end
 
       #
-      # Returns +true+ if the a Command with the specified _name_ was
-      # registered with the command-line utility.
+      # Returns +true+ if a command exists with the specified _name_,
+      # returns +false+ otherwise.
       #
       def CommandLine.has_command?(name)
-        CommandLine.commands.has_key?(name.to_s)
+        CommandLine.commands.include?(name.to_s)
       end
 
       #
@@ -65,11 +70,25 @@ module Ronin
       def CommandLine.get_command(name)
         name = name.to_s
 
-        unless CommandLine.has_command?(name)
+        begin
+          require File.join(COMMANDS_DIR,name)
+        rescue LoadError
+          raise(UnknownCommand,"unable to load the command #{name.dump}",caller)
+        end
+
+        class_name = name.to_const_string
+
+        unless Commands.const_defined?(class_name)
           raise(UnknownCommand,"unknown command #{name.dump}",caller)
         end
 
-        return CommandLine.commands[name]
+        command = Commands.const_get(class_name)
+
+        unless command.respond_to?(:run)
+          raise(UnknownCommand,"command #{name.dump} must provide a 'run' method",caller)
+        end
+
+        return command
       end
 
       #
@@ -78,18 +97,19 @@ module Ronin
       # attempt to find and execute the Command with the same name.
       #
       def CommandLine.run(*argv)
-        if (argv.empty? || argv[0][0..0]=='-')
-          Commands::Console.run(*argv)
+        if (argv.empty? || argv.first[0..0]=='-')
+          name = DEFAULT_COMMAND
+          argv = ARGV
         else
-          cmd = argv.first
+          name = argv.first
           argv = argv[1..-1]
+        end
 
-          begin
-            exec(CommandLine.get_command(cmd),*argv)
-          rescue UnknownCommand => e
-            STDERR.puts e
-            exit -1
-          end
+        begin
+          CommandLine.get_command(name).run(*argv)
+        rescue UnknownCommand => e
+          STDERR.puts e
+          exit -1
         end
 
         return true