ronin 1.2.0 → 1.3.0

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

@@ -65,11 +65,9 @@ module Ronin
           # @since 1.0.0
           #
           def execute
-            if options[:import]
-              import options[:import]
-            elsif options[:lookup]
+            if options[:lookup]
               lookup options[:lookup]
-            elsif options.list?
+            else
               super
             end
           end
@@ -94,30 +92,6 @@ module Ronin
             print_info "Looked up #{host}"
           end
 
-          #
-          # Extracts and saves IP Addresses from a file.
-          #
-          # @param [String] path
-          #   The path of the file.
-          #
-          # @since 1.0.0
-          #
-          def import(path)
-            File.open(options[:import]) do |file|
-              file.each_line do |line|
-                IPAddr.extract(line) do |match|
-                  ip = IPAddress.new(:address => match)
-
-                  if ip.save
-                    print_info "Imported #{ip}"
-                  else
-                    print_error "Unable to import #{match.dump}."
-                  end
-                end
-              end
-            end
-          end
-
           #
           # Prints an IP Address.
           #
@@ -133,11 +107,11 @@ module Ronin
 
             indent do
               if (org = ip.organization)
-                print_hash('Organization' => org)
+                print_hash 'Organization' => org
               end
 
               if (last_scanned_at = ip.last_scanned_at)
-                print_hash('Last Scanned' => last_scanned_at)
+                print_hash 'Last Scanned' => last_scanned_at
               end
 
               unless ip.mac_addresses.empty?

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

@@ -62,46 +62,8 @@ module Ronin
                                 :aliases => '-i',
                                 :banner => 'FILE'
 
-          #
-          # Queries the {Ronin::URL} model.
-          #
-          # @since 1.0.0
-          #
-          def execute
-            if options[:import]
-              import options[:import]
-            elsif options.list?
-              super
-            end
-          end
-
           protected
 
-          #
-          # Imports URLs from a file.
-          #
-          # @param [String] path
-          #   The path to the file.
-          #
-          # @since 1.0.0
-          #
-          def import(path)
-            File.open(path) do |file|
-              file.each_line do |line|
-                line.strip!
-                next if line.empty?
-
-                url = URL.parse(line)
-
-                if url.save
-                  print_info "Imported #{url}"
-                else
-                  print_error "Could not import #{line.dump}."
-                end
-              end
-            end
-          end
-
           #
           # Prints a URL.
           #
@@ -116,13 +78,11 @@ module Ronin
             print_title url
 
             indent do
-              print_hash(
-                'Host' => url.host_name,
-                'Port' => url.port.number,
-                'Path' => url.path,
-                'Fragment' => url.fragment,
-                'Last Scanned' => url.last_scanned_at
-              )
+              print_hash 'Host' => url.host_name,
+                         'Port' => url.port.number,
+                         'Path' => url.path,
+                         'Fragment' => url.fragment,
+                         'Last Scanned' => url.last_scanned_at
 
               unless url.query_params.empty?
                 params = {}

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

@@ -31,22 +31,6 @@ module Ronin
         class_option :database, :type => :string,
                                 :aliases => '-D'
 
-        #
-        # The model to query.
-        #
-        # @return [DataMapper::Resource]
-        #   The model that will be queried.
-        #
-        # @since 1.1.0
-        #
-        # @api semipublic
-        #
-        def self.query_model
-          @query_model ||= if self.superclass < ModelCommand
-                       self.superclass.query_model
-                     end
-        end
-
         #
         # The query options for the command.
         #
@@ -88,9 +72,9 @@ module Ronin
         protected
 
         #
-        # Sets the model to query.
+        # Sets or gets the model to query.
         #
-        # @param [DataMapper::Resource] model
+        # @param [DataMapper::Resource, nil] model
         #   The model class.
         #
         # @return [DataMapper::Resource]
@@ -100,8 +84,14 @@ module Ronin
         #
         # @api semipublic
         #
-        def self.model(model)
-          @query_model = model
+        def self.model(model=nil)
+          if model
+            @model = model
+          else
+            @model ||= if superclass < ModelCommand
+                         superclass.model
+                       end
+          end
         end
 
         #
@@ -119,7 +109,7 @@ module Ronin
         #
         def self.query_option(name,options={})
           query_options << name
-          class_option(name,options)
+          class_option name, options
         end
 
         #
@@ -154,11 +144,11 @@ module Ronin
         # @api semipublic
         #
         def query
-          unless self.class.query_model
+          unless self.class.model
             raise("query model not defined for #{self.class}")
           end
 
-          query = self.class.query_model.all
+          query = self.class.model.all
 
           self.class.each_query_option do |name|
             value = options[name]
@@ -166,10 +156,10 @@ module Ronin
             # skip unset options
             next if value.nil?
 
-            if query_model.properties.named?(name)
+            if model.properties.named?(name)
               query = query.all(name => value)
-            elsif query_model.respond_to?(name)
-              query_method = query_model.method(name)
+            elsif model.respond_to?(name)
+              query_method = model.method(name)
 
               query = case query_method.arity
                       when 0
@@ -180,7 +170,7 @@ module Ronin
                         query.send(name,*value)
                       end
             else
-              raise("unknown query method or property #{name} for #{query_model}")
+              raise("unknown query method or property #{name} for #{model}")
             end
           end
 

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

@@ -18,6 +18,7 @@
 #
 
 require 'ronin/ui/cli/model_command'
+require 'ronin/model/importable'
 
 module Ronin
   module UI
@@ -40,11 +41,34 @@ module Ronin
         # @api semipublic
         #
         def execute
-          print_resources(query)
+          if options[:import]
+            self.class.model.import(options[:import]) do |resource|
+              print_info "Imported #{resource}"
+            end
+          else
+            print_resources(query)
+          end
         end
 
         protected
 
+        #
+        # Sets the model used by the command.
+        #
+        # @see ModelCommand.model
+        #
+        # @since 1.3.0
+        #
+        def self.model(model=nil)
+          if (model && model < Model::Importable)
+            class_option :import, :type => :string,
+                                  :aliases => '-i',
+                                  :banner => 'FILE'
+          end
+
+          return super(model)
+        end
+
         #
         # Default method which will print every queried resource.
         #

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

@@ -103,7 +103,7 @@ module Ronin
         #
         def load_script
           if options[:file]
-            self.class.query_model.load_from(options[:file])
+            self.class.model.load_from(options[:file])
           else
             query.load_first
           end

data/lib/ronin/ui/console/context.rb

@@ -60,7 +60,7 @@ module Ronin
           # Populates the instance variables.
           #
           # @param [Hash] variables
-          #   The variable naems and values.
+          #   The variable names and values.
           #
           def instance_variables=(variables)
             variables.each do |name,value|

data/lib/ronin/url.rb

@@ -18,6 +18,7 @@
 #
 
 require 'ronin/model'
+require 'ronin/model/importable'
 require 'ronin/url_scheme'
 require 'ronin/url_query_param'
 require 'ronin/host_name'
@@ -25,6 +26,7 @@ require 'ronin/tcp_port'
 require 'ronin/web_credential'
 
 require 'dm-timestamps'
+require 'uri/generic'
 require 'uri/http'
 require 'uri/https'
 require 'uri/ftp'
@@ -37,6 +39,7 @@ module Ronin
   class URL
 
     include Model
+    include Model::Importable
     include DataMapper::Timestamps
 
     # Mapping of URL Schemes and URI classes
@@ -76,6 +79,45 @@ module Ronin
     # Defines the created_at timestamp
     timestamps :created_at
 
+    #
+    # Extracts URLs from the given text.
+    #
+    # @param [String] text
+    #   The text to parse.
+    #
+    # @yield [url]
+    #   The given block will be passed each extracted URL.
+    #
+    # @yieldparam [URL] url
+    #   An extracted URL from the text.
+    #
+    # @return [Array<URL>]
+    #   If no block is given, an Array of the extracted URLs is returned.
+    #
+    # @see http://rubydoc.info/stdlib/uri/URI#extract-class_method
+    # @see URL.parse
+    #
+    # @since 1.3.0
+    #
+    # @api public
+    #
+    def self.extract(text)
+      return enum_for(:extract,text).to_a unless block_given?
+
+      ::URI.extract(text) do |uri|
+        uri = begin
+                ::URI.parse(uri)
+              rescue URI::InvalidURIError
+                # URI.extract can parse URIs that URI.parse cannot handle
+                next
+              end
+
+        yield from(uri)
+      end
+
+      return nil
+    end
+
     #
     # Searches for all URLs using HTTP.
     #
@@ -403,7 +445,7 @@ module Ronin
     #
     def to_uri
       # map the URL scheme to a URI class
-      url_class = (SCHEMES[self.scheme.name] || ::URI::Generic)
+      url_class = SCHEMES.fetch(self.scheme.name,::URI::Generic)
 
       host = if self.host_name
                self.host_name.address

data/lib/ronin/version.rb

@@ -19,5 +19,5 @@
 
 module Ronin
   # Ronin version 
-  VERSION = '1.2.0'
+  VERSION = '1.3.0'
 end

data/ronin.gemspec

@@ -99,7 +99,7 @@ Gem::Specification.new do |gemspec|
   end
 
   if gemspec.respond_to?(:required_rubygems_version=)
-    gemspec.required_rubygems_version = metadata['required_ruby_version']
+    gemspec.required_rubygems_version = metadata['required_rubygems_version']
   end
 
   parse_versions = lambda { |versions|

data/spec/email_address_spec.rb

@@ -13,6 +13,26 @@ describe EmailAddress do
     )
   }
 
+  describe "extract" do
+    subject { described_class }
+
+    let(:email1) { subject.parse('foo@bar.com') }
+    let(:email2) { subject.parse('foo!bar@baz.com') }
+    let(:text)  { "To: #{email1}, #{email2}." }
+
+    it "should extract multiple email addresses from text" do
+      subject.extract(text).should == [email1, email2]
+    end
+
+    it "should yield the extracted email addresses if a block is given" do
+      emails = []
+
+      subject.extract(text) { |email| emails << email }
+
+      emails.should == [email1, email2]
+    end
+  end
+
   describe "parse" do
     it "should parse email addresses" do
       email_address = EmailAddress.parse(email)

data/spec/host_name_spec.rb

@@ -17,6 +17,26 @@ describe HostName do
     subject.name.should == subject.address
   end
 
+  describe "extract" do
+    subject { described_class }
+
+    let(:host1) { subject.parse('www.example.com') }
+    let(:host2) { subject.parse('1.2.3.4.in-addr.arpa') }
+    let(:text)  { "Hosts: #{host1}, #{host2}." }
+
+    it "should extract multiple host-names from text" do
+      subject.extract(text).should == [host1, host2]
+    end
+
+    it "should yield the extracted host-names if a block is given" do
+      hosts = []
+
+      subject.extract(text) { |host| hosts << host }
+
+      hosts.should == [host1, host2]
+    end
+  end
+
   describe "lookup" do
     subject { HostName }
 

data/spec/ip_address_spec.rb

@@ -0,0 +1,104 @@
+require 'spec_helper'
+require 'ronin/ip_address'
+
+describe IPAddress do
+  let(:example_domain) { 'localhost' }
+  let(:example_ip) { '127.0.0.1' }
+
+  subject { IPAddress.new(:address => example_ip) }
+
+  it "should require an address" do
+    ip_address = IPAddress.new
+
+    ip_address.should_not be_valid
+  end
+
+  describe "extract" do
+    subject { IPAddress }
+
+    let(:ip1)  { subject.parse('127.0.0.1') }
+    let(:ip2)  { subject.parse('10.1.1.1') }
+    let(:text) { "Hosts: #{ip1}, #{ip2}" }
+
+    it "should extract multiple IP Addresses from text" do
+      subject.extract(text).should == [ip1, ip2]
+    end
+
+    it "should yield the extracted IPs if a block is given" do
+      ip_addresses = []
+
+      subject.extract(text) { |ip| ip_addresses << ip }
+
+      ip_addresses.should == [ip1, ip2]
+    end
+  end
+
+  describe "lookup" do
+    subject { IPAddress }
+
+    let(:bad_domain) { '.bad.domain.com.' }
+
+    it "should lookup host-names to IP Addresses" do
+      ip_addresses = subject.lookup(example_domain)
+      addresses    = ip_addresses.map { |ip| ip.address }
+      
+      addresses.should include(example_ip)
+    end
+
+    it "should associate the IP addresses with the original host name" do
+      ip_addresses = subject.lookup(example_domain)
+      host_names   = ip_addresses.map { |ip| ip.host_names[0].address }
+      
+      host_names.should include(example_domain)
+    end
+
+    it "should return an empty Array for unknown domain names" do
+      ip_addresses = subject.lookup(bad_domain)
+      
+      ip_addresses.should be_empty
+    end
+  end
+
+  describe "#lookup!" do
+    let(:bad_ip) { '0.0.0.0' }
+
+    it "should reverse lookup the host-name for an IP Address" do
+      host_names = subject.lookup!
+      addresses  = host_names.map { |host_name| host_name.address }
+      
+      addresses.should include(example_domain)
+    end
+
+    it "should associate the host names with the original IP address" do
+      host_names   = subject.lookup!
+      ip_addresses = host_names.map do |host_name|
+        host_name.ip_addresses[0].address
+      end
+
+      ip_addresses.should include(subject)
+    end
+
+    it "should return an empty Array for unknown domain names" do
+      ip_address = IPAddress.new(:address => bad_ip)
+      host_names = ip_address.lookup!
+
+      host_names.should be_empty
+    end
+  end
+
+  describe "#version" do
+    let(:ipv4) { IPAddress.new(:address => '127.0.0.1') }
+    let(:ipv6) { IPAddress.new(:address => '::1') }
+
+    it "should only accept 4 or 6" do
+      ip_address = IPAddress.new(:address => '1.1.1.1', :version => 7)
+
+      ip_address.should_not be_valid
+    end
+
+    it "should default to the version of the address" do
+      ipv4.version.should == 4
+      ipv6.version.should == 6
+    end
+  end
+end