ronin 1.2.0 → 1.3.0

data/lib/ronin/ip_address.rb

@@ -17,6 +17,9 @@
 # along with Ronin.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+require 'ronin/extensions/ip_addr'
+require 'ronin/extensions/resolv'
+require 'ronin/model/importable'
 require 'ronin/address'
 require 'ronin/ip_address_mac_address'
 require 'ronin/host_name_ip_address'
@@ -24,7 +27,6 @@ require 'ronin/os'
 require 'ronin/open_port'
 
 require 'ipaddr'
-require 'resolv'
 
 module Ronin
   #
@@ -32,6 +34,8 @@ module Ronin
   #
   class IPAddress < Address
 
+    include Model::Importable
+
     # The IP Address
     property :address, Property::IPAddress, :required => true,
                                             :unique => true
@@ -75,6 +79,37 @@ module Ronin
                      :model => 'OS',
                      :via => :os
 
+    #
+    # Extracts and parses IP addresses from text.
+    #
+    # @param [String] text
+    #   The text to parse.
+    #
+    # @param [Symbol, Integer] version
+    #   Specifies whether to parse IPv4 or IPv6 addresses.
+    #
+    # @yield [ip]
+    #   The given block will be passed each extracted IP address.
+    #
+    # @yieldparam [IPAddress] ip
+    #   An extracted IP Address from the text.
+    #
+    # @see http://ronin-ruby.github.com/docs/ronin-support/IPAddr.html#extract-class_method
+    #
+    # @since 1.3.0
+    #
+    # @api public
+    #
+    def self.extract(text,version=nil)
+      return enum_for(:extract,text,version).to_a unless block_given?
+
+      IPAddr.extract(text,version) do |ip|
+        yield parse(ip)
+      end
+
+      return nil
+    end
+
     #
     # Searches for all IPv4 addresses.
     #
@@ -160,6 +195,9 @@ module Ronin
     # @param [String] name
     #   The host name to look up.
     #
+    # @param [String] nameserver
+    #   Optional nameserver to query.
+    #
     # @return [Array<IPAddress>]
     #   The new or previously saved IP Addresses for the host name.
     #
@@ -167,10 +205,12 @@ module Ronin
     #
     # @api public
     #
-    def self.lookup(name)
+    def self.lookup(name,nameserver=nil)
       host = HostName.first_or_new(:address => name)
+      resolver = Resolv.resolver(nameserver)
+
       ips = begin
-              Resolv.getaddresses(name)
+              resolver.getaddresses(name)
             rescue
               []
             end
@@ -188,6 +228,9 @@ module Ronin
     #
     # Performs a reverse lookup on the IP address.
     #
+    # @param [String] nameserver
+    #   Optional nameserver to query.
+    #
     # @return [Array<HostName>]
     #   The host-names associated with the IP Address.
     #
@@ -195,9 +238,10 @@ module Ronin
     #
     # @api public
     #
-    def lookup!
+    def lookup!(nameserver=nil)
+      resolver = Resolv.resolver(nameserver)
       hosts = begin
-                Resolv.getnames(self.address.to_s)
+                resolver.getnames(self.address.to_s)
               rescue
                 []
               end

data/lib/ronin/license.rb

@@ -42,7 +42,7 @@ module Ronin
     property :description, Text, :required => true
 
     # URL of the License document
-    property :url, String, :length => 256
+    property :url, URI, :length => 256
 
     # Berkeley Software Distribution License
     predefine :bsd,

data/lib/ronin/mac_address.rb

@@ -17,10 +17,13 @@
 # along with Ronin.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+require 'ronin/extensions/regexp'
 require 'ronin/address'
 require 'ronin/ip_address'
 require 'ronin/ip_address_mac_address'
 
+require 'strscan'
+
 module Ronin
   #
   # Represents MAC addresses that can be stored in the {Database}.
@@ -30,7 +33,11 @@ module Ronin
     # The MAC address
     property :address, String, :length => 17..17,
                                :required => true,
-                               :unique => true
+                               :unique => true,
+                               :format => /^#{Regexp::MAC}$/,
+                               :messages => {
+                                 :format => 'Must be a valid MAC address'
+                               }
 
     # The IP Addresses the MAC Address hosts
     has 0..n, :ip_address_mac_addresses, :model => 'IPAddressMACAddress'
@@ -39,6 +46,37 @@ module Ronin
     has 0..n, :ip_addresses, :through => :ip_address_mac_addresses,
                              :model => 'IPAddress'
 
+    #
+    # Extracts MAC addresses from the given text.
+    #
+    # @param [String] text
+    #   The text to parse.
+    #
+    # @yield [mac]
+    #   The given block will be passed each extracted MAC address.
+    #
+    # @yieldparam [MACAddress] mac
+    #   An extracted MAC Address
+    #
+    # @return [Array<MACAddress>]
+    #   If no block is given, an Array of MACAddress will be returned.
+    #
+    # @see 1.3.0
+    #
+    # @api public
+    #
+    def self.extract(text)
+      return enum_for(:extract,text).to_a unless block_given?
+
+      scanner = StringScanner.new(text)
+
+      while scanner.skip_until(Regexp::MAC)
+        yield parse(scanner.matched)
+      end
+
+      return nil
+    end
+
     #
     # The IP Address that most recently used the MAC Address.
     #

data/lib/ronin/model/has_license.rb

@@ -105,15 +105,24 @@ module Ronin
         #   The new license of the model.
         #
         # @example
-        #   license! :mit
+        #   licensed_under :mit
         #
-        # @since 1.0.0
+        # @since 1.3.0
         #
         # @api public
         #
-        def license!(name)
+        def licensed_under(name)
           self.license = Ronin::License.predefined_resource(name)
         end
+
+        #
+        # @deprecated `license!` was deprecated in favor of {#licensed_under}.
+        #
+        # @since 1.0.0
+        #
+        def license!(name)
+          licensed_under(name)
+        end
       end
     end
   end

data/lib/ronin/model/importable.rb

@@ -0,0 +1,65 @@
+#
+# 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/>.
+#
+
+module Ronin
+  module Model
+    #
+    # Uses the `extract` method to extract and save resources from the
+    # contents of text-files.
+    #
+    # @since 1.3.0
+    #
+    module Importable
+      def self.included(base)
+        base.extend ClassMethods
+      end
+
+      module ClassMethods
+        #
+        # Extracts and imports resources from the given file.
+        #
+        # @param [String] path
+        #   The path of the file.
+        #
+        # @yield [resource]
+        #   The given block will be passed every imported resource.
+        #
+        # @yieldparam [Model] resource
+        #   A successfully imported resource.
+        #
+        # @return [Array<Model>]
+        #   If no block is given, an Array of imported resources is returned.
+        #
+        # @api public
+        #
+        def import(path)
+          return enum_for(:import,path).to_a unless block_given?
+
+          File.open(path) do |file|
+            file.each_line do |line|
+              extract(line) do |resource|
+                yield(resource) if resource.save
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ronin/repository.rb

@@ -125,8 +125,12 @@ module Ronin
     #   The path to the repository.
     #
     # @param [Symbol] scm
-    #   The SCM used by the repository. Can be either `:git`, `:mercurial`,
-    #   `:sub_version` or `:rsync`.
+    #   The SCM used by the repository. Can be either:
+    #
+    #   * `:git`
+    #   * `:mercurial` / `:hg`
+    #   * `:sub_version` / `:svn`
+    #   * `:rsync`
     #
     # @param [String, URI::HTTP, URI::HTTPS] uri
     #   The URI the repository resides at.
@@ -259,8 +263,12 @@ module Ronin
     #   The URI to the repository.
     #
     # @option options [Symbol] :scm
-    #   The SCM used by the repository. May be either `:git`, `:mercurial`,
-    #   `:sub_version` or `:rsync`.
+    #   The SCM used by the repository. May be either:
+    #
+    #   * `:git`
+    #   * `:mercurial` / `:hg`
+    #   * `:sub_version` / `:svn`
+    #   * `:rsync`
     #
     # @return [Repository]
     #   The newly installed repository.

data/lib/ronin/spec/database.rb

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

data/lib/ronin/tcp_port.rb

@@ -26,21 +26,12 @@ module Ronin
   #
   class TCPPort < Port
 
+    # The protocol used for the port
+    property :protocol, String, :default => 'tcp'
+
     # The URLs that use the port
     has 0..n, :urls, :model => 'URL',
                      :child_key => [:port_id]
 
-    #
-    # Creates a new {TCPPort} resource.
-    #
-    # @param [Hash] attributes
-    #   The attribute names and values to initialize the TCP port with.
-    #
-    # @api public
-    #
-    def initialize(attributes={})
-      super(attributes.merge(:protocol => 'tcp'))
-    end
-
   end
 end

data/lib/ronin/udp_port.rb

@@ -25,17 +25,8 @@ module Ronin
   #
   class UDPPort < Port
 
-    #
-    # Creates a new {UDPPort} resource.
-    #
-    # @param [Hash] attributes
-    #   The attribute names and values to initialize the UDP port with.
-    #
-    # @api public
-    #
-    def initialize(attributes={})
-      super(attributes.merge(:protocol => 'udp'))
-    end
+    # The protocol used for the port
+    property :protocol, String, :default => 'tcp'
 
   end
 end

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

@@ -51,51 +51,6 @@ module Ronin
                                 :aliases => '-i',
                                 :banner => 'FILE'
 
-          #
-          # Queries the {EmailAddress} model.
-          #
-          # @since 1.0.0
-          #
-          def execute
-            if options[:import]
-              import options[:import]
-            elsif options.list?
-              super
-            end
-          end
-
-          protected
-
-          #
-          # Imports email addresses 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?
-
-                email = begin
-                          EmailAddress.parse(line)
-                        rescue => e
-                          print_error e.message
-                          next
-                        end
-
-                if email.save
-                  print_info "Imported #{email}"
-                else
-                  print_error "Unable to import #{line.dump}."
-                end
-              end
-            end
-          end
-
         end
       end
     end

data/lib/ronin/ui/cli/commands/hosts.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,31 +92,6 @@ module Ronin
             print_info "Looked up #{ip}"
           end
 
-          #
-          # Imports host names 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?
-
-                host = HostName.new(:address => line)
-
-                if host.save
-                  print_info "Imported #{host}"
-                else
-                  print_error "Unable to import #{line.dump}."
-                end
-              end
-            end
-          end
-
           #
           # Prints a host name.
           #
@@ -134,11 +107,11 @@ module Ronin
 
             indent do
               if (org = host.organization)
-                print_hash('Organization' => org)
+                print_hash 'Organization' => org
               end
 
               if (last_scanned_at = host.last_scanned_at)
-                print_hash('Last Scanned' => last_scanned_at)
+                print_hash 'Last Scanned' => last_scanned_at
               end
 
               unless host.ip_addresses.empty?