scandb 0.1.2 → 0.1.3

data/History.txt

@@ -1,3 +1,8 @@
+=== 0.1.3 / 2009-01-09
+
+* Fixed a bug where 'dm-types' was being required multiple times, causing
+  conflicting class definitions.
+
 === 0.1.2 / 2008-10-19
 
 * Have ScanDB use it's own DataMapper Repository name-space to avoid

data/README.txt

@@ -1,7 +1,7 @@
 = ScanDB
 
 * http://scandb.rubyforge.org/
-* Postmodern Modulus III (postmodern.mod3 at gmail.com)
+* Postmodern (postmodern.mod3 at gmail.com)
 
 == DESCRIPTION:
 
@@ -15,9 +15,9 @@ various network scanning utilities.
 == REQUIREMENTS:
 
 * DataMapper:
-  * do_sqlite3 >= 0.9.2
-  * dm-core >= 0.9.2
-  * dm-types >= 0.9.2
+  * do_sqlite3 >= 0.9.9
+  * dm-core >= 0.9.9
+  * dm-types >= 0.9.9
 * libxml-ruby
 
 == INSTALL:
@@ -31,7 +31,7 @@ various network scanning utilities.
 ScanDB - A library for importing and analyzing information generated by
 various network scanning utilities.
 
-Copyright (c) 2008 Hal Brodigan (postmodern.mod3 at gmail.com)
+Copyright (c) 2008-2009 Hal Brodigan (postmodern.mod3 at gmail.com)
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

data/Rakefile

@@ -6,13 +6,13 @@ require './lib/scandb/version.rb'
 
 Hoe.new('scandb', ScanDB::VERSION) do |p|
   p.rubyforge_name = 'scandb'
-  p.developer('Postmodern Modulus III', 'postmodern.mod3@gmail.com')
+  p.developer('Postmodern', 'postmodern.mod3@gmail.com')
   p.remote_rdoc_dir = ''
   p.extra_deps = [
-    ['do_sqlite3', '>=0.9.3'],
-    ['dm-core', '>=0.9.3'],
-    ['dm-types', '>=0.9.3'],
-    ['dm-serializer','>=0.9.3'],
+    ['do_sqlite3', '>=0.9.9'],
+    ['dm-core', '>=0.9.9'],
+    ['dm-types', '>=0.9.9'],
+    ['dm-serializer','>=0.9.9'],
     'libxml-ruby'
   ]
 end

data/lib/scandb/database.rb

@@ -40,13 +40,16 @@ module ScanDB
     CONFIG_FILE = File.join(Config::PATH,'database.yml')
 
     # Default log path
-    DEFAULT_LOG_PATH = File.join(Config::PATH,'scandb.log')
+    DEFAULT_LOG_PATH = File.join(Config::PATH,'database.log')
 
     # Default log level
-    DEFAULT_LOG_LEVEL = :info
+    DEFAULT_LOG_LEVEL = :error
 
     # Default database configuration
-    DEFAULT_CONFIG = "sqlite3://" + File.join(Config::PATH,'scandb.db')
+    DEFAULT_CONFIG = {
+      :adapter => :sqlite3,
+      :database => File.join(Config::PATH,'scandb.db')
+    }
 
     #
     # Returns the Database configuration that is stored in the
@@ -78,6 +81,13 @@ module ScanDB
       @@scandb_database_config = configuration
     end
 
+    #
+    # Returns the current Database log.
+    #
+    def Database.log
+      @@scandb_database_log ||= nil
+    end
+
     #
     # Setup the Database log with the given _options_.
     #
@@ -92,8 +102,7 @@ module ScanDB
       stream = (options[:stream] || File.new(path,'w+'))
       level = (options[:level] || DEFAULT_LOG_LEVEL)
 
-      DataMapper::Logger.new(stream,level)
-      return nil
+      return @@scandb_database_log = DataMapper::Logger.new(stream,level)
     end
 
     #
@@ -102,7 +111,10 @@ module ScanDB
     # the Database.
     #
     def Database.setup(configuration=Database.config,&block)
-      Database.setup_log
+      # setup the logging
+      Database.setup_log unless Database.log
+
+      # setup the repository
       DataMapper.setup(Model::REPOSITORY_NAME, configuration)
 
       block.call if block

data/lib/scandb/host.rb

@@ -33,16 +33,25 @@ module ScanDB
     include Model
 
     # The IP address of the Host
-    property :ip, String
+    property :ip, String, :index => true
+
+    # The Date and Time at which the host was first scanned
+    property :scanned_at, DateTime
 
     # The host-names of the host
-    has n, :names, :class_name => 'HostName'
+    has n, :names,
+           :order => [:scanned_at.desc],
+           :class_name => 'HostName'
 
     # The OS Class guesses of the host
-    has n, :os_class_guesses, :class_name => 'OSClassGuess'
+    has n, :os_class_guesses,
+           :order => [:scanned_at.desc],
+           :class_name => 'OSClassGuess'
 
     # The OS Match guesses of the host
-    has n, :os_match_guesses, :class_name => 'OSMatchGuess'
+    has n, :os_match_guesses,
+           :order => [:scanned_at.desc],
+           :class_name => 'OSMatchGuess'
 
     # The scanned ports of the host
     has n, :scanned_ports

data/lib/scandb/host_name.rb

@@ -28,7 +28,11 @@ module ScanDB
 
     include Model
 
-    property :name, Text
+    # The host name
+    property :name, String, :index => true
+
+    # The Date and Time at which the host-name was first scanned
+    property :scanned_at, DateTime
 
     belongs_to :host
 

data/lib/scandb/model.rb

@@ -24,6 +24,7 @@
 require 'scandb/database'
 
 require 'dm-core'
+require 'dm-types'
 require 'dm-serializer'
 
 module ScanDB
@@ -38,11 +39,11 @@ module ScanDB
         include DataMapper::Resource
         include DataMapper::AutoMigrations
 
+        property :id, Serial
+
         def self.default_repository_name
           Model::REPOSITORY_NAME
         end
-
-        property :id, Serial
       end
     end
   end

data/lib/scandb/nmap.rb

@@ -32,11 +32,16 @@ module ScanDB
 
     #
     # Imports scan information from a Nmap XML scan file, specified by
-    # the _path_. Returns an Array of Host objects. If a _block_ is given
-    # it will be passed the newly created Host object.
+    # the _path_. Returns the total number of Host objects that were
+    # imported. If a _block_ is given it will be passed the newly created
+    # Host object.
     #
     #   Nmap.import_xml('path/to/scan.xml')
-    #   # => [...]
+    #   # => 124
+    #
+    #   Nmap.import_xml('path/to/scan.xml') do |host|
+    #     puts host.ip
+    #   end
     #
     def Nmap.import_xml(path,&block)
       doc = XML::Document.file(path)

data/lib/scandb/os_class_guess.rb

@@ -32,6 +32,9 @@ module ScanDB
     # The accuracy of the guess
     property :accuracy, Integer
 
+    # The Date and Time when the OSClass was first guessed
+    property :scanned_at, DateTime
+
     # The OS Class
     belongs_to :os_class, :class_name => 'OSClass'
 

data/lib/scandb/os_match.rb

@@ -29,7 +29,7 @@ module ScanDB
     include Model
 
     # The name of the OS match
-    property :name, String
+    property :name, String, :index => true
 
     # The guesses for this OS match
     has n, :guesses, :class_name => 'OSMatchGuess'

data/lib/scandb/os_match_guess.rb

@@ -32,6 +32,9 @@ module ScanDB
     # The accuracy of the guess
     property :accuracy, Integer
 
+    # The Date and Time when the OSMatch was first guessed
+    property :scanned_at, DateTime
+
     # The OS Match for the guess
     belongs_to :os_match, :class_name => 'OSMatch'
 

data/lib/scandb/port.rb

@@ -25,8 +25,6 @@ require 'scandb/model'
 require 'scandb/host'
 require 'scandb/service'
 
-require 'dm-types/enum'
-
 module ScanDB
   class Port
 
@@ -37,7 +35,7 @@ module ScanDB
     property :protocol, Enum[:tcp, :udp]
 
     # The port number
-    property :number, Integer
+    property :number, Integer, :index => true
 
     # The scanned ports related to this port
     has n, :scanned, :class_name => 'ScannedPort'

data/lib/scandb/runner.rb

@@ -34,11 +34,28 @@ module ScanDB
     #
     def Runner.command_line(args)
       options = OpenStruct.new
+      options.log = {}
 
       opts = OptionParser.new do |opts|
-        opts.banner = 'usage: scandb [-v] [-d URI] [--import-nmap FILE | -L | -p PORT | -s NAME]'
+        opts.banner = 'usage: scandb [-v] [-l FILE] [-d URI] [--import-nmap FILE | -L | -p PORT | -s NAME]'
 
-        opts.on('-d','--database URI','The URI for the Database.','Defaults to ~/.scandb/scandb.db') do |uri|
+        opts.on('-l','--log FILE','The FILE to use for logging Database activity.','Defaults to ~/.scandb/database.log') do |file|
+          options.log[:path] = file
+        end
+
+        opts.on('--log-level LEVEL','Specifies the log-level.','Defaults to info') do |level|
+          options.log[:level] = level.to_sym
+        end
+
+        opts.on('--log-stdout','Send log messages to stdout') do
+          options.log[:stream] = STDOUT
+        end
+
+        opts.on('--disable-log','Alias for --log-level off') do
+          options.log[:level] = :off
+        end
+
+        opts.on('-d','--database URI','The URI for the Database.') do |uri|
           options.database = uri
         end
 
@@ -98,6 +115,10 @@ module ScanDB
 
       opts.parse!(args)
 
+      unless options.log.empty?
+        Database.setup_log(options.log)
+      end
+
       Database.setup(options.database || Database.config)
 
       if options.import

data/lib/scandb/scanned_port.rb

@@ -26,8 +26,6 @@ require 'scandb/service'
 require 'scandb/port'
 require 'scandb/host'
 
-require 'dm-types/enum'
-
 module ScanDB
   class ScannedPort
 
@@ -37,6 +35,9 @@ module ScanDB
     # <tt>:closed</tt>)
     property :status, Enum[:open, :filtered, :closed]
 
+    # The Date and Time at which the port was first scanned
+    property :scanned_at, DateTime
+
     # The Service that is running on the scanned port
     belongs_to :service
 

data/lib/scandb/service.rb

@@ -23,15 +23,13 @@
 
 require 'scandb/model'
 
-require 'dm-types/enum'
-
 module ScanDB
   class Service
 
     include Model
 
     # Name of the service
-    property :name, String
+    property :name, String, :index => true
 
     # Scanned ports that were found to be running the service
     has n, :scanned, :class_name => 'ScannedPort'

data/lib/scandb/version.rb

@@ -23,5 +23,5 @@
 
 module ScanDB
   # ScanDB version
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: scandb
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
-- Postmodern Modulus III
+- Postmodern
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2008-10-19 00:00:00 -07:00
+date: 2009-01-09 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.3
+        version: 0.9.9
     version: 
 - !ruby/object:Gem::Dependency 
   name: dm-core
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.3
+        version: 0.9.9
     version: 
 - !ruby/object:Gem::Dependency 
   name: dm-types
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.3
+        version: 0.9.9
     version: 
 - !ruby/object:Gem::Dependency 
   name: dm-serializer
@@ -50,7 +50,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.3
+        version: 0.9.9
     version: 
 - !ruby/object:Gem::Dependency 
   name: libxml-ruby
@@ -70,7 +70,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.8.0
+        version: 1.8.2
     version: 
 description: ScanDB is a library for importing and analyzing information generated by various network scanning utilities.
 email: 
@@ -132,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: scandb
-rubygems_version: 1.3.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: ScanDB is a library for importing and analyzing information generated by various network scanning utilities.