ronin 1.0.0.pre2 → 1.0.0.pre3

data/ChangeLog.md

@@ -1,3 +1,82 @@
+### 1.0.0 / 2011-02-01
+
+* Require Ruby >= 1.8.7.
+* Require i18n ~> 0.4.1.
+* Require tzinfo ~> 0.3.22.
+* Require activesupport ~> 3.0.0.
+* Require dm-do-adapter ~> 1.0.2.
+* Require dm-sqlite-adapter ~> 1.0.2.
+* Require dm-core ~> 1.0.2.
+* Require dm-types ~> 1.0.2.
+* Require dm-constraints ~> 1.0.2.
+* Require dm-migrations ~> 1.0.2.
+* Require dm-validations ~> 1.0.2.
+* Require dm-serializer ~> 1.0.2.
+* Require dm-aggregates ~> 1.0.2.
+* Require dm-timestamps ~> 1.0.2.
+* Require dm-tags ~> 1.0.2.
+* Require dm-is-predefined ~> 0.3.0.
+* Require uri-query_params ~> 0.5.2.
+* Require open_namespace ~> 0.3.0.
+* Require parameters ~> 0.2.3.
+* Require data_paths ~> 0.2.1.
+* Require contextify ~> 0.2.0.
+* Require pullr ~> 0.1.2.
+* Require thor ~> 0.14.3.
+* Require ripl ~> 0.2.0.
+* Require ripl-multi_line ~> 0.2.0.
+* Require ripl-auto_indent ~> 0.1.0.
+* Require ripl-short_errors ~> 0.1.0.
+* Require ripl-color_result ~> 0.2.0.
+* Require ronin-support ~> 0.1.0.
+* Require bundler ~> 1.0.0.
+* Require rspec ~> 2.0.0.
+* Require yard ~> 0.6.4.
+* Added `ronin/bootstrap` which only loads configuration and the Database.
+* Added {Ronin::Database::Migrations}.
+* Added {Ronin::Address}:
+  * Added {Ronin::MACAddress}.
+  * Added {Ronin::IPAddress}.
+  * Added {Ronin::HostName}.
+* Added {Ronin::Port}:
+  * Added {Ronin::TCPPort}.
+  * Added {Ronin::UDPPort}.
+* Added {Ronin::Service}.
+* Added {Ronin::OpenPort}.
+* Added {Ronin::OSGuess}.
+* Added {Ronin::UserName}.
+* Added {Ronin::URL}:
+  * Added {Ronin::URLScheme}.
+  * Added {Ronin::URLQueryParam}.
+* Added {Ronin::EmailAddress}.
+* Added {Ronin::Credential}.
+* Added {Ronin::ServiceCredential}.
+* Added {Ronin::WebCredential}.
+* Added {Ronin::Organization}.
+* Added {Ronin::Campaign}.
+* Added {Ronin::Target}.
+* Added {Ronin::Engine}.
+* Added {Ronin::UI::Output::Terminal::Raw}.
+* Added {Ronin::UI::Output::Terminal::Color}.
+* Renamed `Ronin::Product` to {Ronin::Software}.
+* Renamed `Ronin::UI::CommandLine` to {Ronin::UI::CLI}.
+* Renamed `Ronin::Platform::Overlay` to {Ronin::Repository}.
+* Renamed `Ronin::Platform::CachedFile` to {Ronin::CachedFile}.
+* Renamed `Ronin::Platform::Cacheable` to {Ronin::Model::Cacheable}.
+* Removed `Ronin::Platform::Extension`.
+* Removed `Ronin::Platform`.
+* Switched from [Jeweler](https://github.com/technicalpickles/jeweler)
+  to [Ore](http://github.com/ruby-ore/ore) and [Bundler](http://gembundler.com).
+* Use [OpenNamespace](http://github.com/postmodern/open_namespace) to auto-load
+  everything in the {Ronin} namespace.
+* Switched from DataMapper auto-migrations to explicit-migrations.
+* Switched {Ronin::UI::Console} from IRB to
+  [Ripl](https://github.com/cldwalker/ripl):
+  * Enabled result coloring with
+    [ripl-color_result](https://github.com/janlelis/ripl-color_result).
+  * Enabled short errors with
+    [ripl-short_error](https://github.com/janlelis/ripl-misc/blob/master/lib/ripl/short_errors.rb).
+
 ### 0.3.0 / 2009-09-24
 
 * Require yard >= 0.2.3.5.

data/Gemfile

@@ -13,7 +13,7 @@ group :development do
   gem 'rake',         '~> 0.8.7'
 
   platforms :jruby do
-    gem 'maruku',     '~> 0.6.0'
+    gem 'BlueCloth'
   end
 
   platforms :ruby do
@@ -24,7 +24,7 @@ group :development do
   gem 'dm-visualizer',		      '~> 0.1.0'
 
   gem 'ore-core',     '~> 0.1.0'
-  gem 'ore-tasks',    '~> 0.2.0'
+  gem 'ore-tasks',    '~> 0.3.0'
   gem 'rspec',        '~> 2.0.0'
 end
 

data/gemspec.yml

@@ -11,22 +11,28 @@ email: postmodern.mod3@gmail.com
 homepage: http://github.com/ronin-ruby/ronin
 has_yard: true
 post_install_message: |
-  Thank you for installing Ronin, a Ruby platform for exploit development
-  and security research. To list the available commands:
+  *************************************************************************
 
-      $ ronin help
+    Thank you for installing Ronin, a Ruby platform for exploit development
+    and security research. To list the available commands:
 
-  To jump into the Ronin Ruby Console:
+        $ ronin help
 
-      $ ronin
+    To jump into the Ronin Ruby Console:
 
-  Additional functionality can be added to Ronin by installing additional
-  libraries:
+        $ ronin
 
-      * ronin-asm                   * ronin-php
-      * ronin-dorks                 * ronin-scanners
-      * ronin-exploits              * ronin-sql
-      * ronin-gen                   * ronin-web
+    Additional functionality can be added to Ronin by installing additional
+    libraries:
+
+        * ronin-asm             * ronin-php
+        * ronin-dorks           * ronin-scanners
+        * ronin-exploits        * ronin-sql
+        * ronin-gen             * ronin-web
+
+  *************************************************************************
+
+required_ruby_version: >= 1.8.7
 
 dependencies:
   i18n: ~> 0.4.1
@@ -61,11 +67,11 @@ dependencies:
   ripl-short_errors: ~> 0.1.0
   ripl-color_result: ~> 0.2.0
   # Ronin dependencies:
-  ronin-support: ~> 0.1.0.pre
+  ronin-support: ~> 0.1.0.pre2
 
 development_dependencies:
   bundler: ~> 1.0.0
-  yard: ~> 0.6.1
+  yard: ~> 0.6.4
   yard-contextify: ~> 0.1.0
   yard-parameters: ~> 0.1.0
   yard-dm: ~> 0.1.1

data/lib/ronin/campaign.rb

@@ -60,6 +60,21 @@ module Ronin
       all('addresses.address' => addr)
     end
 
+    #
+    # Searches for all campaigns targeting an {Organization}.
+    #
+    # @param [Array<String>, String] names
+    #   The organization name(s) to search for.
+    #
+    # @return [Array<Campaign>]
+    #   The campaigns that target the specified organizations.
+    #
+    # @since 1.0.0
+    #
+    def self.targeting_orgs(names)
+      all('organizations.name' => names)
+    end
+
     #
     # Determines if an address is targeted by the campaign.
     #

data/lib/ronin/email_address.rb

@@ -29,18 +29,66 @@ module Ronin
 
     include Model
 
-    # The primary key of the email address
+    # The primary key of the email address.
     property :id, Serial
 
-    # The user-name component of the email address
+    # The user-name component of the email address.
     belongs_to :user_name, :unique => :user_host
 
-    # The host-name component of the email address
+    # The host-name component of the email address.
     belongs_to :host_name, :unique => :user_host
 
+    # Any IP addresses associated with the host name.
+    has 0..n, :ip_addresses, :through => :host_name
+
     # Tracks when the email address was created at.
     timestamps :created_at
 
+    #
+    # Searches for email addresses associated with the given host names.
+    #
+    # @param [Array<String>, String] names
+    #   The host name(s) to search for.
+    #
+    # @return [Array<EmailAddress>]
+    #   The matching email addresses.
+    #
+    # @since 1.0.0
+    #
+    def self.with_hosts(names)
+      all('host_name.address' => names)
+    end
+
+    #
+    # Searches for email addresses associated with the given IP address(es).
+    #
+    # @param [Array<String>, String] ips
+    #   The IP address(es) to search for.
+    #
+    # @return [Array<EmailAddress>]
+    #   The matching email addresses.
+    #
+    # @since 1.0.0
+    #
+    def self.with_ips(ips)
+      all('ip_addresses.address' => ips)
+    end
+
+    #
+    # Searches for email addresses associated with the given user names.
+    #
+    # @param [Array<String>, String] names
+    #   The user name(s) to search for.
+    #
+    # @return [Array<EmailAddress>]
+    #   The matching email addresses.
+    #
+    # @since 1.0.0
+    #
+    def self.with_users(names)
+      all('user_name.name' => names)
+    end
+
     #
     # Parses an email address.
     #

data/lib/ronin/ui/cli/command.rb

@@ -91,7 +91,7 @@ module Ronin
       #
       # To ensure that your sub-command is accessible to the `ronin`
       # command, make sure that the ruby file the sub-command is defined
-      # within is in the `ronin/ui/command_line/commands` directory of a
+      # within is in the `ronin/ui/cli/commands` directory of a
       # Ronin library. If the sub-command class is named 'MyCommand'
       # it's ruby file must also be named 'my_command.rb'.
       #
@@ -174,11 +174,7 @@ module Ronin
         # @since 1.0.0
         #
         def self.banner
-          if $0 == 'ronin'
-            super
-          else
-            self.basename
-          end
+          "ronin #{self_task.formatted_usage(self,false,true)}"
         end
 
         #

data/lib/ronin/ui/cli/commands/campaigns.rb

@@ -32,17 +32,18 @@ module Ronin
 
           self.model = Campaign 
 
-          query_option :name, :type => :string,
-                              :aliases => '-n',
-                              :method => :named
+          query_option :named, :type => :string,
+                               :aliases => '-n'
 
-          query_option :description, :type => :string, :aliases => '-d'
+          query_option :describing, :type => :string, :aliases => '-d'
 
-          query_option :targeting, :type => :array, :aliases => '-T'
+          query_option :targeting, :type => :array,
+                                   :aliases => '-T',
+                                   :banner => 'ADDR [...]'
 
-          query_option :organizations, :type => :array, :aliases => '-O' do |campaigns,orgs|
-            campaigns.all('organizations.name' => orgs)
-          end
+          query_option :targeting_orgs, :type => :array,
+                                        :aliases => '-O',
+                                        :banner => 'NAME [...]'
 
           class_option :list, :type => :boolean,
                               :default => true,

data/lib/ronin/ui/cli/commands/creds.rb

@@ -34,15 +34,13 @@ module Ronin
 
           self.model = Credential
 
-          query_option :user, :type => :string,
-                              :aliases => '-u',
-                              :banner => 'USER',
-                              :method => :for_user
+          query_option :for_user, :type => :string,
+                                  :aliases => '-u',
+                                  :banner => 'USER'
 
-          query_option :password, :type => :string,
-                                  :aliases => '-p',
-                                  :banner => 'PASS',
-                                  :method => :with_password
+          query_option :with_password, :type => :string,
+                                       :aliases => '-p',
+                                       :banner => 'PASS'
 
           class_option :list, :type => :boolean,
                               :default => true,

data/lib/ronin/ui/cli/commands/emails.rb

@@ -32,21 +32,17 @@ module Ronin
 
           self.model = EmailAddress
 
-          query_option :hosts, :type => :array, :aliases => '-H' do |emails,hosts|
-            emails.all('host_name.address' => hosts)
-          end
+          query_option :with_hosts, :type => :array,
+                                    :aliases => '-H',
+                                    :banner => 'HOST [...]'
 
-          query_option :ip, :type => :array, :aliases => '-I' do |emails,ips|
-            hosts.all('host_name.ip_addresses.address' => ips)
-          end
+          query_option :with_ips, :type => :array,
+                                  :aliases => '-I',
+                                  :banner => 'IP [...]'
 
-          query_option :ports, :type => :array, :aliases => '-p' do |emails,ports|
-            emails.all('host_name.ports.number' => ports)
-          end
-
-          query_option :users, :type => :array, :aliases => '-u' do |emails,users|
-            emails.all('user_name.name' => users)
-          end
+          query_option :with_users, :type => :array,
+                                    :aliases => '-u',
+                                    :banner => 'NAME [...]'
 
           class_option :list, :type => :boolean,
                               :default => true,

data/lib/ronin/ui/cli/commands/help.rb

@@ -19,7 +19,7 @@
 #
 
 require 'ronin/ui/cli/command'
-require 'ronin/ui/cli/command_line'
+require 'ronin/ui/cli/cli'
 
 module Ronin
   module UI
@@ -39,12 +39,12 @@ module Ronin
           def execute
             if self.command
               begin
-                CommandLine.command(self.command).start(['--help'])
+                CLI.command(self.command).start(['--help'])
               rescue UnknownCommand
                 print_error "unknown command #{command.dump}"
               end
             else
-              print_array CommandLine.commands.keys.sort,
+              print_array CLI.commands.keys.sort,
                           :title => 'Available commands'
             end
           end

data/lib/ronin/ui/cli/model_command.rb

@@ -21,6 +21,8 @@
 require 'ronin/ui/cli/command'
 require 'ronin/database'
 
+require 'set'
+
 module Ronin
   module UI
     module CLI
@@ -46,13 +48,13 @@ module Ronin
         #
         # The query options for the command.
         #
-        # @return [Hash]
+        # @return [Set]
         #   The query options and their query method names.
         #
         # @since 1.0.0
         #
         def self.query_options
-          @@query_options ||= {}
+          @query_options ||= Set[]
         end
 
         #
@@ -63,7 +65,7 @@ module Ronin
         def execute
           Database.setup
 
-          print_query(new_query)
+          print_resources(query)
         end
 
         protected
@@ -92,53 +94,13 @@ module Ronin
         # @param [Hash] options
         #   Additional options.
         #
-        # @option options [Symbol] :method (name)
-        #   Custom query method name.
-        #
         # @since 1.0.0
         #
-        def self.query_option(name,options={},&block)
-          self.query_options[name] = if block
-                                       block
-                                     elsif options[:method]
-                                       options.delete(:method)
-                                     else
-                                       name
-                                     end
-
+        def self.query_option(name,options={})
+          query_options << name
           class_option(name,options)
         end
 
-        #
-        # Performs a custom query.
-        #
-        # @param [DataMapper::Collection] query
-        #   The current query.
-        #
-        # @yield [query,*arguments]
-        #   The given block will be passed the current query to modify.
-        #
-        # @yieldparam [DataMapper::Collection] query
-        #   The current query.
-        #
-        # @yieldparam [Array] arguments
-        #   Optional arguments that will be passed to the block.
-        #
-        # @return [DataMapper::Collection]
-        #   The modified query.
-        #
-        # @since 1.0.0
-        #
-        def custom_query(query,arguments=[],&block)
-          if block.arity == 1
-            block.call(query)
-          elsif block.arity == 2
-            block.call(query,arguments)
-          else
-            block.call(query,*arguments)
-          end
-        end
-
         #
         # Invokes a query method on a query.
         #
@@ -158,7 +120,7 @@ module Ronin
         #
         def query_method(query,name,arguments=[])
           query_method = begin
-                           query.model.instance_method(name)
+                           query.model.method(name)
                          rescue NameError
                            raise("Undefined query method #{query.model}.#{name}")
                          end
@@ -187,24 +149,21 @@ module Ronin
         #
         # @since 1.0.0
         #
-        def new_query(&block)
-          query = self.class.model.all
+        def query
+          new_query = self.class.model.all
 
-          self.class.query_options.each do |name,value|
-            unless options[name].nil?
-              query = if value.kind_of?(Proc)
-                        custom_query(query,options[name],&value)
-                      else
-                        query_method(query,name,options[name])
-                      end
+          self.class.ancestors.each do |ancestor|
+            if ancestor < ModelCommand
+              ancestor.query_options.each do |name|
+                unless options[name].nil?
+                  new_query = query_method(new_query,name,options[name])
+                end
+              end
             end
           end
 
-          if block
-            query = custom_query(query,&block)
-          end
-
-          return query
+          new_query = yield(new_query) if block_given?
+          return new_query
         end
 
         #
@@ -220,24 +179,24 @@ module Ronin
         end
 
         #
-        # Prints the resources in the query.
+        # Prints multiple resources.
         #
-        # @param [DataMapper::Collection] query
+        # @param [DataMapper::Collection, Array<DataMapper::Resource>] resources
         #   The query to print.
         #
         # @since 1.0.0
         #
-        def print_query(query)
+        def print_resources(resources)
           if options.csv?
-            print query.to_csv
+            print resources.to_csv
           elsif options.xml?
-            print query.to_xml
+            print resources.to_xml
           elsif options.yaml?
-            print query.to_yaml
+            print resources.to_yaml
           elsif options.json?
-            print query.to_json
+            print resources.to_json
           else
-            query.each { |resource| print_resource(resource) }
+            resources.each { |resource| print_resource(resource) }
           end
         end
 

data/lib/ronin/version.rb

@@ -20,5 +20,5 @@
 
 module Ronin
   # Ronin version 
-  VERSION = '1.0.0.pre2'
+  VERSION = '1.0.0.pre3'
 end

data/spec/installation_spec.rb

@@ -33,7 +33,7 @@ describe Installation do
     }
 
     it "should enumerate over the files within a certain directory" do
-      subject.each_file(directory).to_a.should == expected
+      subject.each_file(directory).to_a.should =~ expected
     end
 
     it "should return an Enumerator when no block is given" do

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 1
   - 0
   - 0
-  - pre2
-  version: 1.0.0.pre2
+  - pre3
+  version: 1.0.0.pre3
 platform: ruby
 authors: 
 - Postmodern
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-30 00:00:00 -08:00
+date: 2010-12-31 00:00:00 -08:00
 default_executable: ronin
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -434,8 +434,8 @@ dependencies:
         - 0
         - 1
         - 0
-        - pre
-        version: 0.1.0.pre
+        - pre2
+        version: 0.1.0.pre2
   type: :runtime
   prerelease: false
   version_requirements: *id028
@@ -464,8 +464,8 @@ dependencies:
         segments: 
         - 0
         - 6
-        - 1
-        version: 0.6.1
+        - 4
+        version: 0.6.4
   type: :development
   prerelease: false
   version_requirements: *id030
@@ -812,22 +812,26 @@ homepage: http://github.com/ronin-ruby/ronin
 licenses: 
 - GPL-2
 post_install_message: |
-  Thank you for installing Ronin, a Ruby platform for exploit development
-  and security research. To list the available commands:
+  *************************************************************************
+  
+    Thank you for installing Ronin, a Ruby platform for exploit development
+    and security research. To list the available commands:
   
-      $ ronin help
+        $ ronin help
   
-  To jump into the Ronin Ruby Console:
+    To jump into the Ronin Ruby Console:
   
-      $ ronin
+        $ ronin
   
-  Additional functionality can be added to Ronin by installing additional
-  libraries:
+    Additional functionality can be added to Ronin by installing additional
+    libraries:
   
-      * ronin-asm                   * ronin-php
-      * ronin-dorks                 * ronin-scanners
-      * ronin-exploits              * ronin-sql
-      * ronin-gen                   * ronin-web
+        * ronin-asm             * ronin-php
+        * ronin-dorks           * ronin-scanners
+        * ronin-exploits        * ronin-sql
+        * ronin-gen             * ronin-web
+  
+  *************************************************************************
 
 rdoc_options: []
 
@@ -839,8 +843,10 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ">="
     - !ruby/object:Gem::Version 
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 8
+      - 7
+      version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: