ronin 1.1.0.rc3 → 1.1.0

data/lib/ronin/database/migrations/1.1.0.rb

@@ -0,0 +1,125 @@
+#
+# Copyright (c) 2006-2011 Hal Brodigan (postmodern.mod3 at gmail.com)
+#
+# This file is part of Ronin.
+#
+# Ronin is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Ronin is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Ronin.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+require 'ronin/database/migrations/1.0.0'
+require 'ronin/campaign'
+require 'ronin/target'
+
+module Ronin
+  module Database
+    module Migrations
+      migration :add_updated_at_column_to_campaigns_table,
+                :needs => :create_campaigns_table do
+        up do
+          modify_table :ronin_campaigns do
+            add_column :updated_at, Time
+          end
+
+          # set the updated_at column to created_at
+          Campaign.each do |campaign|
+            campaign.update(:updated_at => campaign.created_at)
+          end
+        end
+      end
+
+      migration :add_created_at_column_to_targets_table,
+                :needs => :create_targets_table do
+        up do
+          modify_table :ronin_targets do
+            add_column :created_at, Time
+          end
+
+          # set the updated_at column to the created_at of the Campaign
+          Target.each do |target|
+            target.update(:created_at => target.campaign.created_at)
+          end
+        end
+      end
+
+      migration :create_url_query_param_names_table,
+                :needs => :create_url_query_params_table do
+        up do
+          create_table :ronin_url_query_param_names do
+            column :id, Integer, :serial => true
+            column :name, String, :length => 256, :not_null => true
+          end
+
+          create_index :ronin_url_query_param_names, :name, :unique => true
+
+          # select any previous URLQueryParam entries before recreating the table
+          query_params = adapter.select('SELECT id,name,value,url_id FROM ronin_url_query_params')
+
+          # recreate the `ronin_url_query_params` table
+          drop_table :ronin_url_query_params
+          create_table :ronin_url_query_params do
+            column :id, Integer, :serial => true
+            column :name_id, Integer, :not_null => true
+            column :value, Text
+            column :url_id, Integer, :not_null => true
+          end
+
+          name_ids = {}
+
+          query_params.each do |row|
+            unless name_ids.has_key?(row.name)
+              result = adapter.execute(
+                'INSERT INTO ronin_url_query_param_names (name) VALUES (?)',
+                row.name
+              )
+
+              name_ids[row.name] = result.insert_id
+            end
+
+            adapter.execute(
+              'INSERT INTO ronin_url_query_params (id,name_id,value,url_id) VALUES (?,?,?,?)',
+              row.id, name_ids[row.name], row.value, row.url_id
+            )
+          end
+        end
+
+        down do
+          id_names = {}
+
+          adapter.select('SELECT id,name FROM ronin_url_query_param_names').each do |row|
+            id_names[row.id] = row.name
+          end
+
+          query_params = adapter.select('SELECT id,name_id,value,url_id FROM ronin_url_query_params')
+
+          drop_table :ronin_url_query_params
+          create_table :ronin_url_query_params do
+            column :id, Integer, :serial => true
+            column :name, String, :length => 256, :not_null => true
+            column :value, Text
+            column :url_id, Integer, :not_null => true
+          end
+
+          query_params.each do |row|
+            adapter.execute(
+              'INSERT INTO ronin_url_query_params (id,name,value,url_id) VALUES (?,?,?,?)',
+              row.id, id_names[row.name_id], row.value, row.url_id
+            )
+          end
+
+          drop_table :ronin_url_query_param_names
+        end
+      end
+    end
+  end
+end

data/lib/ronin/spec/database.rb

@@ -25,10 +25,7 @@ require 'tempfile'
 RSpec.configure do |spec|
   spec.before(:suite) do
     database_file = Tempfile.new('ronin_database').path
-    database_uri = Addressable::URI.new(
-      :scheme => 'sqlite3',
-      :path => database_file
-    )
+    database_uri = {:adapter => 'sqlite3', :database => database_file}
 
     Ronin::Database.repositories[:default] = database_uri
 

data/lib/ronin/target.rb

@@ -51,25 +51,6 @@ module Ronin
     # Validates the uniqueness of the address and the campaign.
     validates_uniqueness_of :address, :scope => [:campaign]
 
-    #
-    # The directory to store files related to the target.
-    #
-    # @return [String]
-    #   The path to the directory.
-    #
-    # @since 1.0.0
-    #
-    # @api semipublic
-    #
-    def directory
-      if self.campaign
-        path = File.join(self.campaign.directory,self.address.address)
-
-        FileUtils.mkdir(path) unless File.directory?(path)
-        return path
-      end
-    end
-
     #
     # Converts the target to a String.
     #

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

@@ -136,7 +136,7 @@ module Ronin
         begin
           CLI.command(name).start(argv)
         rescue UnknownCommand => e
-          STDERR.puts e
+          $stderr.puts e.message
           exit -1
         end
 

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

@@ -20,6 +20,8 @@
 require 'ronin/ui/cli/command'
 require 'ronin/database'
 
+require 'addressable/uri'
+
 module Ronin
   module UI
     module CLI
@@ -68,10 +70,8 @@ module Ronin
             elsif options[:delete]
               delete_repository
             else
-              indent do
-                Ronin::Database.repositories.each do |name,uri|
-                  puts "#{name}: #{uri}"
-                end
+              Ronin::Database.repositories.each do |name,uri|
+                print_hash uri, :title => name
               end
             end
           end
@@ -85,25 +85,18 @@ module Ronin
           #   The repository URI.
           #
           def repository_uri
-            uri = if options[:uri]
-                    Addressable::URI.parse(options[:uri])
-                  else
-                    Addressable::URI.new()
-                  end
-
-            uri.scheme = options[:adapter] if options[:adapter]
-            uri.host = options[:host] if options[:host]
-            uri.port = options[:port] if options[:port]
-            uri.user = options[:user] if options[:user]
-            uri.password = options[:password] if options[:password]
-
-            if options[:database]
-              uri.path = options[:database]
-            elsif options[:path]
-              uri.path = options[:path]
+            if options[:uri]
+              Addressable::URI.parse(options[:uri]).to_hash
+            else
+              {
+                :adapter => options[:adapter],
+                :host => options[:host],
+                :port => options[:port],
+                :user => options[:user],
+                :password => options[:password],
+                :database => (options[:database] || options[:path])
+              }
             end
-
-            return uri
           end
 
           #

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

@@ -26,7 +26,7 @@ module Ronin
     # Controls {Output} from Ronin.
     #
     module Output
-      @mode = if ENV['VERBOSE']
+      @mode = if ($VERBOSE || $DEBUG || ENV['VERBOSE'])
                 :verbose
               else
                 :quiet

data/lib/ronin/url.rb

@@ -186,7 +186,7 @@ module Ronin
     # @api public
     #
     def self.query_param(name)
-      all('query_params.name' => name)
+      all('query_params.name.name' => name)
     end
 
     #
@@ -223,31 +223,27 @@ module Ronin
       return super(url) if url.kind_of?(Integer)
 
       # optionally parse the URL
-      unless url.kind_of?(::URI)
-        url = ::URI.parse(url.to_s)
-      end
-
-      port = if url.port
-               {:number => url.port}
-             end
-
-      path = normalized_path(url)
-      fragment = url.fragment
+      url = ::URI.parse(url.to_s) unless url.kind_of?(::URI)
 
       # create the initial query
       query = all(
-        :scheme => {:name => url.scheme},
-        :host_name => {:address => url.host},
-        :port => port,
-        :path => path,
-        :fragment => fragment
+        'scheme.name' => url.scheme,
+        'host_name.address' => url.host,
+        :path => normalized_path(url),
+        :fragment => url.fragment
       )
 
+      if url.port
+        # query the port
+        query = query.all('port.number' => url.port)
+      end
+
       if url.query
         # add the query params to the query
         URI::QueryParams.parse(url.query).each do |name,value|
           query = query.all(
-            :query_params => {:name => name, :value => value}
+            'query_params.name.name' => name,
+            'query_params.value' => value 
           )
         end
       end
@@ -270,10 +266,10 @@ module Ronin
     #
     def self.from(uri)
       # find or create the URL scheme, host_name and port
-      scheme = self.scheme.model.first_or_new(:name => uri.scheme)
-      host_name = self.host_name.model.first_or_new(:address => uri.host)
+      scheme = URLScheme.first_or_new(:name => uri.scheme)
+      host_name = HostName.first_or_new(:address => uri.host)
       port = if uri.port
-               self.port.model.first_or_new(:number => uri.port)
+               TCPPort.first_or_new(:number => uri.port)
              end
 
       path = normalized_path(uri)
@@ -284,10 +280,10 @@ module Ronin
       if uri.respond_to?(:query_params)
         # find or create the URL query params
         uri.query_params.each do |name,value|
-          query_params << self.query_params.model.first_or_new(
-            :name => name,
+          query_params << {
+            :name => URLQueryParamName.first_or_new(:name => name),
             :value => value
-          )
+          }
         end
       end
 
@@ -386,7 +382,10 @@ module Ronin
       self.query_params.clear
 
       URI::QueryParams.parse(query).each do |name,value|
-        self.query_params.new(:name => name, :value => value)
+        self.query_params.new(
+          :name => URLQueryParamName.first_or_new(:name => name),
+          :value => value
+        )
       end
 
       return query

data/lib/ronin/url_query_param.rb

@@ -17,7 +17,7 @@
 # along with Ronin.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-require 'ronin/model/has_name'
+require 'ronin/url_query_param_name'
 require 'ronin/model'
 
 require 'uri/query_params'
@@ -29,14 +29,12 @@ module Ronin
   class URLQueryParam
 
     include Model
-    include Model::HasName
 
     # The primary-key of the URL query param
     property :id, Serial
 
-    property :name, String, :length => 256,
-                            :required => true,
-                            :index => true
+    # The name of the URL query param
+    belongs_to :name, :model => 'URLQueryParamName'
 
     # The value of the URL query param
     property :value, Text
@@ -55,7 +53,7 @@ module Ronin
     # @api public
     #
     def to_s
-      URI::QueryParams.dump(self.name => self.value)
+      URI::QueryParams.dump(self.name.to_s => self.value)
     end
 
     #

data/lib/ronin/url_query_param_name.rb

@@ -0,0 +1,89 @@
+#
+# Copyright (c) 2006-2011 Hal Brodigan (postmodern.mod3 at gmail.com)
+#
+# This file is part of Ronin.
+#
+# Ronin is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Ronin is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Ronin.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+require 'ronin/model/has_unique_name'
+require 'ronin/model'
+
+module Ronin
+  #
+  # Represents the name of a {URLQueryParam}.
+  #
+  class URLQueryParamName
+
+    include Model
+    include Model::HasUniqueName
+
+    # The primary-key of the URL query param
+    property :id, Serial
+
+    # The name of the URL query param
+    property :name, String, :length => 256,
+                            :required => true,
+                            :unique => true
+
+    # The URL query params
+    has 0..n, :query_params, :model => 'URLQueryParam',
+                             :child_key => [:name_id]
+
+    #
+    # Specifies when the URL query param name was first seen.
+    #
+    # @return [Time]
+    #   The timestamp that the query param name was first seen.
+    #
+    # @since 1.1.0
+    #
+    # @api public
+    #
+    def created_at
+      if (url = self.query_params.urls.first(:fields => [:created_at]))
+        url.created_at
+      end
+    end
+
+    #
+    # Converts the URL query param name to a String.
+    #
+    # @return [String]
+    #   The name of the URL query param
+    #
+    # @since 1.1.0
+    #
+    # @api public
+    #
+    def to_s
+      self.name.to_s
+    end
+
+    #
+    # Inspects the URL query param name.
+    #
+    # @return [String]
+    #   The inspected URL query param name.
+    #
+    # @since 1.1.0
+    #
+    # @api public
+    #
+    def inspect
+      "#<#{self.class}: #{self}>"
+    end
+
+  end
+end