ronin 0.2.2 → 0.2.3

data/lib/ronin/has_license.rb

@@ -31,7 +31,9 @@ module Ronin
         include Ronin::Model
 
         # The license
-        belongs_to :license, :class_name => 'Ronin::License'
+        belongs_to :license,
+                   :child_key => [:license_id],
+                   :class_name => 'Ronin::License'
 
         #
         # Returns all models having the predefined license with the
@@ -41,7 +43,7 @@ module Ronin
         #   # => [#<Ronin::LicensedModel: ...>, ...]
         #
         def self.licensed_under(name)
-          self.all(:license => Ronin::License[name])
+          self.all(:license_id => Ronin::License[name].id)
         end
       end
     end

data/lib/ronin/model.rb

@@ -24,7 +24,6 @@
 require 'dm-core'
 require 'dm-types'
 require 'dm-serializer'
-require 'dm-aggregates'
 require 'dm-validations'
 
 module Ronin

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

@@ -165,6 +165,33 @@ module Net
     Net.http_head(options).code == 200
   end
 
+  #
+  # Returns the HTTP Server header for the given _options_.
+  #
+  #   Net.http_server(:url => 'http://www.darkc0de.com/)
+  #   # => "Apache/2.2.11 (Unix) PHP/4.4.9 mod_ssl/2.2.11 OpenSSL/0.9.8c
+  #    mod_fastcgi/2.4.6 Phusion_Passenger/2.1.2 DAV/2 SVN/1.4.2"
+  #
+  def Net.http_server(options={})
+    Net.http_head(options)['server']
+  end
+
+  #
+  # Returns the HTTP X-Powered-By header for the given _options_.
+  #
+  #   Net.http_powered_by(:url => 'http://www.stalkdaily.com/')
+  #   # => "PHP/5.2.9"
+  #
+  def Net.http_powered_by(options={})
+    resp = Net.http_head(options)
+
+    if resp.code != 200
+      resp = Net.http_get(options)
+    end
+
+    return resp['x-powered-by']
+  end
+
   #
   # Performes an HTTP Lock request with the given _options_. If a _block_
   # is given, it will be passed the response from the HTTP server.
@@ -268,13 +295,13 @@ module Net
   end
 
   #
-  # Performes an HTTP Proppath request with the given _options_. If a
+  # Performes an HTTP Proppatch request with the given _options_. If a
   # _block_ is given, it will be passed the response from the HTTP server.
   # Returns the response from the HTTP server.
   #
-  def Net.http_prop_path(options={},&block)
+  def Net.http_prop_patch(options={},&block)
     Net.http_session(options) do |http|
-      resp = http.request(Ronin::Network::HTTP.request(:proppath,options),options[:body])
+      resp = http.request(Ronin::Network::HTTP.request(:proppatch,options),options[:body])
 
       block.call(resp) if block
       return resp

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

@@ -24,7 +24,6 @@
 require 'ronin/network/telnet'
 
 require 'net/telnet'
-require 'net/telnets'
 
 module Net
   #
@@ -67,13 +66,6 @@ module Net
   #                   <tt>Ronin::Network::Telnet.proxy</tt>, if not given.
   # <tt>:user</tt>:: The user to login with.
   # <tt>:password</tt>:: The password to login with.
-  # <tt>:ssl</tt>:: A Hash of SSL information to use for a SSLed
-  #                 Telnet session. This hash must contain the following
-  #                 keys.
-  #                 <tt>:certfile</tt>:: The SSL Certfile to use.
-  #                 <tt>:keyfile</tt>:: The SSL Key file to use.
-  #                 <tt>:cafile</tt>:: The SSL CAFile to use.
-  #                 <tt>:capath</tt>:: The SSL CAPath to use.
   #
   #   Telnet.connect('towel.blinkenlights.nl') # => Telnet
   #
@@ -97,16 +89,6 @@ module Net
     user = options[:user]
     passwd = options[:passwd]
 
-    if options[:ssl]
-      sess_opts['CertFile'] = options[:ssl][:certfile]
-      sess_opts['KeyFile'] = options[:ssl][:keyfile]
-      sess_opts['CAFile'] = options[:ssl][:cafile]
-      sess_opts['CAPath'] = options[:ssl][:capath]
-      sess_opts['VerifyMode'] = (options[:ssl][:verify] || SSL::VERIFY_PEER)
-      sess_opts['VerifyCallback'] = options[:ssl][:verify_callback]
-      sess_opts['VerifyDepth'] = options[:ssl][:verify_depth]
-    end
-
     sess = Net::Telnet.new(sess_opts)
     sess.login(user,passwd) if user
 

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

@@ -24,7 +24,7 @@
 module Ronin
   module Network
     module HTTP
-      class UnknownRequest < RuntimeError
+      class UnknownRequest < StandardError
       end
     end
   end

data/lib/ronin/platform/exceptions/extension_not_found.rb

@@ -23,7 +23,7 @@
 
 module Ronin
   module Platform
-    class ExtensionNotFound < RuntimeError
+    class ExtensionNotFound < StandardError
     end
   end
 end

data/lib/ronin/platform/exceptions/overlay_cached.rb

@@ -23,7 +23,7 @@
 
 module Ronin
   module Platform
-    class OverlayCached < RuntimeError
+    class OverlayCached < StandardError
     end
   end
 end

data/lib/ronin/platform/exceptions/overlay_not_found.rb

@@ -23,7 +23,7 @@
 
 module Ronin
   module Platform
-    class OverlayNotFound < RuntimeError
+    class OverlayNotFound < StandardError
     end
   end
 end

data/lib/ronin/platform/extension.rb

@@ -140,21 +140,36 @@ module Ronin
           # instance_eval the extension block
           context_block = Extension.load_context_block(extension_file)
 
-          instance_eval(&context_block) if context_block
+          if context_block
+            begin
+              instance_eval(&context_block)
+            rescue SyntaxError, RuntimeError, StandardError => e
+              STDERR.puts "#{e.class}: #{e}"
+              e.backtrace.each { |trace| STDERR.puts "\t#{trace}" }
+            end
+          end
         end
 
         block.call(self) if block
         return self
       end
 
+      #
+      # Returns the list of methods exposed by the extension.
+      #
+      def exposed_methods
+        methods(false).map { |name| name.to_sym }
+      end
+
       #
       # Returns +true+ if the extension context has a public instance method
       # of the matching _name_, returns +false+ otherwise.
       #
-      #   ext.has_method?(:console) # => true
+      #   ext.has_method?(:console)
+      #   # => true
       #
       def has_method?(name)
-        public_methods.include?(name.to_s)
+        exposed_methods.include?(name.to_sym)
       end
 
       #

data/lib/ronin/platform/extension_cache.rb

@@ -46,7 +46,13 @@ module Ronin
         block.call(self) if block
       end
 
-      alias names keys
+      #
+      # Returns the sorted names of the extensions within the cache.
+      #
+      def names
+        keys.sort
+      end
+
       alias extensions values
       alias each_extension each_value
 

data/lib/ronin/platform/object_cache.rb

@@ -21,7 +21,7 @@
 #++
 #
 
-require 'ronin/objectify'
+require 'ronin/cacheable'
 
 module Ronin
   module Platform
@@ -31,7 +31,7 @@ module Ronin
       # to object files.
       #
       def ObjectCache.paths(directory)
-        Dir[File.join(directory,'**','*.rb')]
+        Dir[File.join(File.expand_path(directory),'**','*.rb')]
       end
 
       #
@@ -41,10 +41,10 @@ module Ronin
         attributes = {}
 
         if directory
-          attributes.merge!(:object_path.like => File.join(directory,'%'))
+          attributes.merge!(:cached_path.like => File.join(directory,'%'))
         end
 
-        Objectify.object_contexts.each_value do |base|
+        Cacheable.models.each do |base|
           base.all(attributes).each(&block)
         end
 
@@ -57,35 +57,36 @@ module Ronin
       #
       def ObjectCache.cache(directory)
         ObjectCache.paths(directory).each do |path|
-          Objectify.cache_objects(path)
+          Cacheable.cache(path)
         end
 
         return true
       end
 
       #
-      # Mirror all objects that were previously cached from paths within
+      # Syncs all objects that were previously cached from paths within
       # the specified _directory_. Also cache objects which have yet to
       # be cached.
       #
-      def ObjectCache.mirror(directory)
+      def ObjectCache.sync(directory)
         new_paths = ObjectCache.paths(directory)
 
         ObjectCache.each(directory) do |obj|
-          new_paths.delete(obj.object_path)
+          new_paths.delete(obj.cached_path)
 
-          obj.mirror
+          obj.sync!
         end
 
         # cache the remaining new paths
-        new_paths.each { |path| Objectify.cache_objects(path) }
+        new_paths.each { |path| Cacheable.cache(path) }
         return true
       end
 
       #
-      # Deletes all cached objects that existed in the specified _directory_.
+      # Deletes all cached objects that existed in the specified
+      # _directory_.
       #
-      def ObjectCache.expunge(directory)
+      def ObjectCache.clean(directory)
         ObjectCache.each(directory) { |obj| obj.destroy }
         return true
       end

data/lib/ronin/platform/overlay.rb

@@ -41,6 +41,9 @@ module Ronin
       # Overlay lib/ directory
       LIB_DIR = 'lib'
 
+      # The init.rb file to load from the LIB_DIR
+      INIT_FILE = 'init.rb'
+
       # Overlay static/ directory
       STATIC_DIR = 'static'
 
@@ -162,24 +165,29 @@ module Ronin
 
       #
       # Activates the overlay by adding the lib_dirs to the
-      # <tt>$LOAD_PATH</tt>.
+      # <tt>$LOAD_PATH</tt> global variable.
       #
       def activate!
+        # add the static/ directory
+        Static.directory(@static_dir) if File.directory?(@static_dir)
+
         # add the lib/ directories
         lib_dirs.each do |path|
           $LOAD_PATH << path unless $LOAD_PATH.include?(path)
         end
 
-        # add the static/ directory
-        Static.directory(@static_dir) if File.directory?(@static_dir)
+        # load the lib/init.rb file
+        init_path = File.join(@path,LIB_DIR,INIT_FILE)
+        load init_path if File.file?(init_path)
+
         return true
       end
 
       #
-      # Deactivates the overlay by removing the lib_dirs to the
-      # <tt>$LOAD_PATH</tt>.
+      # Deactivates the overlay by removing the lib_dirs from the
+      # <tt>$LOAD_PATH</tt> global variable.
       #
-      def deactive!
+      def deactivate!
         Static.static_dirs.reject! { |dir| dir == @static_dir }
 
         paths = lib_dirs

data/lib/ronin/platform/overlay_cache.rb

@@ -53,7 +53,7 @@ module Ronin
         @dirty = false
 
         if File.file?(@path)
-          descriptions = YAML.load(File.read(@path))
+          descriptions = YAML.load_file(@path)
 
           if descriptions.kind_of?(Array)
             descriptions.each do |overlay|
@@ -83,7 +83,13 @@ module Ronin
         @dirty == true
       end
 
-      alias names keys
+      #
+      # Returns the sorted names of the overlays within the cache.
+      #
+      def names
+        keys.sort
+      end
+
       alias overlays values
       alias each_overlay each_value
 
@@ -151,7 +157,7 @@ module Ronin
           end
         end
 
-        return ext_names
+        return ext_names.sort
       end
 
       #
@@ -219,7 +225,7 @@ module Ronin
       #
       def update(&block)
         overlays.each do |overlay|
-          overlay.deactive!
+          overlay.deactivate!
           overlay.update(&block)
           overlay.active!
         end
@@ -243,7 +249,7 @@ module Ronin
         name = name.to_s
 
         overlay = get(name)
-        overlay.deactive!
+        overlay.deactivate!
 
         delete_if { |key,value| key == name }
         dirty!

data/lib/ronin/product.rb

@@ -45,14 +45,31 @@ module Ronin
     # Validates
     validates_present :name, :version
 
+    #
+    # Creates a new Product object with the given _attributes_.
+    #
+    # _attributes_ must contain the following keys:
+    # <tt>:name</tt>:: The name of the product.
+    # <tt>:vendor</tt>:: The vendor of the product. Will default to the
+    #                    product name, if not given.
+    #
+    # _attributes_ may contain the following keys:
+    # <tt>:version</tt>:: The version of the product.
+    #
+    def initialize(attributes={})
+      attributes[:vendor] ||= attributes[:name]
+
+      super(attributes)
+    end
+
     #
     # Returns the String form of the product.
     #
     def to_s
-      unless @vendor==@name
-        return "#{@vendor} #{@name} #{@version}"
+      unless self.vendor == self.name
+        return "#{self.vendor} #{self.name} #{self.version}"
       else
-        return "#{@name} #{@version}"
+        return "#{self.name} #{self.version}"
       end
     end
 

data/lib/ronin/ronin.rb

@@ -21,24 +21,9 @@
 #++
 #
 
-require 'ronin/objectify'
 require 'ronin/ui/console'
 
 module Ronin
-  #
-  # See Objectify.load_objects.
-  #
-  def Ronin.load_objects(path)
-    Objectify.load_objects(path)
-  end
-
-  #
-  # See Objectify.load_object.
-  #
-  def Ronin.load_object(type,path)
-    Objectify.load_object(type,path)
-  end
-
   #
   # Starts Ronin's console with the given _script_. If a _block_ is given
   # it will be ran within the console.