ronin 0.0.9 → 0.1.0

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

@@ -42,18 +42,6 @@ module Net
     return sock
   end
 
-  #
-  # Creates a new UDPSocket object with the specified _rhost_ 
-  # _rport_, and the given _lhost_ and _lport_. The specified _block_
-  # will be passed the first line received from the UDPSocket object.
-  # The newly created UDPSocket object will be returned.
-  #
-  def Net.udp_connect_and_recv(rhost,rport,lhost=nil,lport=nil,&block)
-    Net.udp_connect(rhost,rport,lhost,lport) do |sock|
-      block.call(sock.read) if block
-    end
-  end
-
   #
   # Creates a new UDPSocket object with the specified _rhost_ 
   # _rport_, and the given _lhost_ and _lport_. The specified _data_ will

data/lib/ronin/objects.rb

@@ -24,6 +24,4 @@
 require 'ronin/extensions/kernel'
 require 'ronin/object_context'
 
-module Ronin
-  ronin_require 'ronin/objects'
-end
+ronin_require 'ronin/objects'

data/lib/ronin/parameters/parameters.rb

@@ -43,13 +43,13 @@ module Ronin
         #
         #   parameter 'var'
         #
-        #   parameter 'var', :value => 3, :description => 'my variable' 
+        #   parameter 'var', :default => 3, :description => 'my variable' 
         #
         def parameter(name,options={})
           name = name.to_sym
 
           # add the parameter to the class params list
-          params[name] = ClassParam.new(name,options[:description],options[:value])
+          params[name] = ClassParam.new(name,options[:description],options[:default])
 
           # define the reader class method for the parameter
           meta_def(name) do
@@ -73,10 +73,10 @@ module Ronin
         def get_param(name)
           name = name.to_sym
 
-          ancestors.each do |superclass|
-            if superclass.include?(Parameters)
-              if superclass.params.has_key?(name)
-                return superclass.params[name]
+          ancestors.each do |ancestor|
+            if ancestor.include?(Parameters)
+              if ancestor.params.has_key?(name)
+                return ancestor.params[name]
               end
             end
           end
@@ -91,9 +91,9 @@ module Ronin
         def has_param?(name)
           name = name.to_sym
 
-          ancestors.each do |superclass|
-            if superclass.include?(Parameters)
-              return true if superclass.params.has_key?(name)
+          ancestors.each do |ancestor|
+            if ancestor.include?(Parameters)
+              return true if ancestor.params.has_key?(name)
             end
           end
 
@@ -105,9 +105,9 @@ module Ronin
         # specified _block_.
         #
         def each_param(&block)
-          ancestors.each do |superclass|
-            if superclass.include?(Parameters)
-              superclass.params.each_value(&block)
+          ancestors.each do |ancestor|
+            if ancestor.include?(Parameters)
+              ancestor.params.each_value(&block)
             end
           end
 
@@ -159,13 +159,13 @@ module Ronin
     #
     #   obj.parameter('var')
     #
-    #   obj.parameter('var',:value => 3, :description => 'my variable')
+    #   obj.parameter('var',:default => 3, :description => 'my variable')
     #
     def parameter(name,options={})
       name = name.to_sym
 
       # set the instance variable
-      instance_variable_set("@#{name}",options[:value])
+      instance_variable_set("@#{name}",options[:default])
 
       # add the new parameter
       params[name] = InstanceParam.new(self,name,options[:description])
@@ -247,8 +247,19 @@ module Ronin
       get_param(name).value
     end
 
-    protected
+    #
+    # Sets the values of the parameters listed in the specified _values_.
+    #
+    #   obj.set_params(:rhost => 'www.example.com', :rport => 80)
+    #   # => {:rhost=>"www.example.com", :rport=>80}
+    #
+    def set_params(values={})
+      values.each do |name,value|
+        get_param(name).value = value
+      end
+    end
 
+    protected
 
     #
     # Initializes the specified class _param_.

data/lib/ronin/platform.rb

@@ -37,6 +37,9 @@ module Ronin
     # Version of the Operating System
     property :version, String
 
+    # Validates
+    validates_present :os, :version
+
     #
     # Returns the String form of the Platform.
     #
@@ -72,7 +75,7 @@ module Ronin
       method_name = name.to_method_name
 
       meta_def(method_name) do
-        Platform.find_or_new(:os => name)
+        Platform.new(:os => name)
       end
 
       meta_def("#{method_name}_version") do |version|

data/lib/ronin/product.rb

@@ -41,6 +41,9 @@ module Ronin
     # Venders
     property :vendor, String
 
+    # Validates
+    validates_present :name, :version
+
     #
     # Returns the String form of the product.
     #

data/lib/ronin/runner/program/program.rb

@@ -113,9 +113,11 @@ module Ronin
         else
           puts 'Available commands:'
 
-          Program.commands.each do |cmd|
+          Program.commands.sort_by { |cmd|
+            cmd.command_names.first
+          }.each { |cmd|
             puts "  #{cmd.command_names.join(', ')}"
-          end
+          }
         end
       end
 

data/lib/ronin/sessions/esmtp.rb

@@ -26,10 +26,10 @@ require 'ronin/network/esmtp'
 
 module Ronin
   module Sessions
-    module SMTP
+    module ESMTP
       include Session
 
-      ESMTP_SESSION = proc do
+      setup_session do
         parameter :esmtp_host, :description => 'ESMTP host'
         parameter :esmtp_port, :description => 'ESMTP port'
 
@@ -38,14 +38,6 @@ module Ronin
         parameter :esmtp_password, :description => 'ESMTP password'
       end
 
-      def self.included(base)
-        Session.setup_class(base,&ESMTP_SESSION)
-      end
-
-      def self.extended(obj)
-        Session.setup_object(obj,&ESMTP_SESSION)
-      end
-
       protected
 
       def esmtp_message(options={},&block)

data/lib/ronin/sessions/imap.rb

@@ -29,7 +29,7 @@ module Ronin
     module IMAP
       include Session
 
-      IMAP_SESSION = proc do
+      setup_session do
         parameter :imap_host, :description => 'IMAP host'
         parameter :imap_port, :description => 'IMAP port'
 
@@ -38,14 +38,6 @@ module Ronin
         parameter :imap_password, :description => 'IMAP password'
       end
 
-      def self.included(base)
-        Session.setup_class(base,&IMAP_SESSION)
-      end
-
-      def self.extended(obj)
-        Session.setup_object(obj,&IMAP_SESSION)
-      end
-
       protected
 
       def imap_connect(options={},&block)

data/lib/ronin/sessions/pop3.rb

@@ -29,7 +29,7 @@ module Ronin
     module POP3
       include Session
 
-      POP3_SESSION = proc do
+      setup_session do
         parameter :pop3_host, :description => 'POP3 host'
         parameter :pop3_port, :description => 'POP3 port'
 
@@ -37,14 +37,6 @@ module Ronin
         parameter :pop3_password, :description => 'POP3 password'
       end
 
-      def self.included(base)
-        Session.setup_class(base,&POP3_SESSION)
-      end
-
-      def self.extended(obj)
-        Session.setup_object(obj,&POP3_SESSION)
-      end
-
       protected
 
       def pop3_connect(options={},&block)

data/lib/ronin/sessions/session.rb

@@ -21,31 +21,32 @@
 #++
 #
 
+require 'ronin/extensions/meta'
 require 'ronin/parameters'
 
 module Ronin
   module Sessions
     module Session
-      #
-      # Includes Parameters and runs the _block_ in the specified
-      # _base_class_.
-      #
-      def Session.setup_class(base_class,&block)
-        base_class.module_eval { include Parameters }
-        base_class.module_eval(&block)
+      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
 
-        return base_class
-      end
-
-      #
-      # Extends Parameters and runs the specified _block_ in the specified
-      # _obj_.
-      #
-      def Session.setup_object(obj,&block)
-        obj.extend(Parameters)
-        obj.instance_eval(&block)
-
-        return obj
+            #
+            # Extends Parameters and runs the specified _block_.
+            #
+            metaclass_def(:extended) do |base_obj|
+              base_obj.extend Parameters
+              base_obj.instance_eval(&block)
+            end
+          end
+        end
       end
     end
   end

data/lib/ronin/sessions/smtp.rb

@@ -29,7 +29,7 @@ module Ronin
     module SMTP
       include Session
 
-      SMTP_SESSION = proc do
+      setup_session do
         parameter :smtp_host, :description => 'SMTP host'
         parameter :smtp_port, :description => 'SMTP port'
 
@@ -38,14 +38,6 @@ module Ronin
         parameter :smtp_password, :description => 'SMTP password'
       end
 
-      def self.included(base)
-        Session.setup_class(base,&SMTP_SESSION)
-      end
-
-      def self.extended(obj)
-        Session.setup_object(obj,&SMTP_SESSION)
-      end
-
       protected
 
       def smtp_message(options={},&block)

data/lib/ronin/sessions/tcp.rb

@@ -29,7 +29,7 @@ module Ronin
     module TCP
       include Session
 
-      TCP_SESSION = proc do
+      setup_session do
         parameter :lhost, :description => 'TCP local host'
         parameter :lport, :description => 'TCP local port'
 
@@ -37,14 +37,6 @@ module Ronin
         parameter :rport, :description => 'TCP remote port'
       end
 
-      def self.included(base)
-        Session.setup_class(base,&TCP_SESSION)
-      end
-
-      def self.extended(obj)
-        Session.setup_object(obj,&TCP_SESSION)
-      end
-
       protected
 
       def tcp_connect(&block)
@@ -59,18 +51,6 @@ module Ronin
         return ::Net.tcp_connect(@rhost,@rport,@lhost,@lport,&block)
       end
 
-      def tcp_connect_and_recv(&block)
-        unless @rhost
-          raise(ParamNotFound,"Missing parameter '#{describe_param(:rhost)}'",caller)
-        end
-
-        unless @rport
-          raise(ParamNotFound,"Missing parameter '#{describe_param(:rport)}'",caller)
-        end
-
-        return ::Net.tcp_connect_and_recv(@rhost,@rport,@lhost,@lport,&block)
-      end
-
       def tcp_connect_and_send(data,&block)
         unless @rhost
           raise(ParamNotFound,"Missing parameter '#{describe_param(:rhost)}'",caller)

data/lib/ronin/sessions/telnet.rb

@@ -29,7 +29,7 @@ module Ronin
     module TELNET
       include Session
 
-      TELNET_SESSION = proc do
+      setup_session do
         parameter :telnet_host, :description => 'Telnet host'
         parameter :telnet_port, :value => Network::Telnet.default_port, :description => 'Telnet port'
 
@@ -40,14 +40,6 @@ module Ronin
         parameter :telnet_ssl, :description => 'Telnet SSL options'
       end
 
-      def self.included(base)
-        Session.setup_class(base,&TELNET_SESSION)
-      end
-
-      def self.extended(obj)
-        Session.setup_object(obj,&TELNET_SESSION)
-      end
-
       protected
 
       def telnet_connect(options={},&block)

data/lib/ronin/sessions/udp.rb

@@ -29,7 +29,7 @@ module Ronin
     module UDP
       include Parameters
 
-      UDP_SESSION = proc do
+      setup_session do
         parameter :lhost, :description => 'local host'
         parameter :lport, :description => 'local port'
 
@@ -37,14 +37,6 @@ module Ronin
         parameter :rport, :description => 'remote port'
       end
 
-      def self.included(base)
-        Session.setup_class(base,&UDP_SESSION)
-      end
-
-      def self.extended(obj)
-        Session.setup_object(obj,&UDP_SESSION)
-      end
-
       protected
 
       def udp_connect(&block)
@@ -59,18 +51,6 @@ module Ronin
         return ::Net.udp_connect(@rhost,@rport,@lhost,@lport,&block)
       end
 
-      def udp_connect_and_recv(&block)
-        unless @rhost
-          raise(ParamNotFound,"Missing '#{describe_param(:rhost)}' parameter",caller)
-        end
-
-        unless @rport
-          raise(ParamNotFound,"Missing '#{describe_param(:rport)}' parameter",caller)
-        end
-
-        return ::Net.udp_connect_and_recv(@rhost,@rport,@lhost,@lport,&block)
-      end
-
       def udp_connect_and_send(data,&block)
         unless @rhost
           raise(ParamNotFound,"Missing '#{describe_param(:rhost)}' parameter",caller)

data/lib/ronin/sessions/web.rb

@@ -29,19 +29,11 @@ module Ronin
     module Web
       include Session
 
-      WEB_SESSION = proc do
+      setup_session do
         parameter :web_proxy, :value => Ronin::Web.proxy, :description => 'Web Proxy'
         parameter :web_user_agent, :value => Ronin::Web.user_agent, :description => 'Web User-Agent'
       end
 
-      def self.included(base)
-        Session.setup_class(base,&WEB_SESSION)
-      end
-
-      def self.extended(obj)
-        Session.setup_object(obj,&WEB_SESSION)
-      end
-
       protected
 
       def web_agent(options={},&block)