metasploit_data_models 0.6.16 → 0.7.0

data/.travis.yml

@@ -0,0 +1,6 @@
+before_script:
+  - cp spec/dummy/config/database.yml.travis spec/dummy/config/database.yml
+  - rake db:setup
+language: ruby
+rvm:
+  - '1.9.3'

data/README.md

@@ -1,4 +1,4 @@
-#MetasploitDataModels
+#MetasploitDataModels [![Build Status](https://travis-ci.org/rapid7/metasploit_data_models.png)](https://travis-ci.org/rapid7/metasploit_data_models)
 
 The database layer for Metasploit
 

data/db/migrate/20110422000000_convert_binary.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 class ConvertBinary < ActiveRecord::Migration
 
 

data/db/migrate/20130423211152_add_creds_counter_cache.rb

@@ -7,7 +7,12 @@ class AddCredsCounterCache < ActiveRecord::Migration
     Mdm::Cred.all.each {|c| cred_service_ids << c.service_id}
     cred_service_ids.each do |service_id|
       #Mdm::Host.reset_counters(Mdm::Service.find(service_id).host.id, :creds)
-      host = Mdm::Service.find(service_id).host
+      begin
+        host = Mdm::Service.find(service_id).host
+      rescue
+        next
+      end
+      next if host.nil? # This can happen with orphan creds/services
       host.cred_count = host.creds.count
       host.save
     end

data/lib/metasploit_data_models/version.rb

@@ -4,5 +4,5 @@ module MetasploitDataModels
   # metasploit-framework/data/sql/migrate to db/migrate in this project, not all models have specs that verify the
   # migrations (with have_db_column and have_db_index) and certain models may not be shared between metasploit-framework
   # and pro, so models may be removed in the future.  Because of the unstable API the version should remain below 1.0.0
-  VERSION = '0.6.16'
+  VERSION = '0.7.0'
 end

data/metasploit_data_models.gemspec

@@ -6,10 +6,12 @@ Gem::Specification.new do |s|
   s.name        = 'metasploit_data_models'
   s.version     = MetasploitDataModels::VERSION
   s.authors     = [
-	  'Luke Imhoff',
-	  'Trevor Rosen'
+      'Samuel Huckins',
+      'Luke Imhoff',
+      'Trevor Rosen'
   ]
   s.email       = [
+      'shuckins@rapid7.com',
       'luke_imhoff@rapid7.com',
       'trevor_rosen@rapid7.com'
   ]
@@ -24,8 +26,7 @@ Gem::Specification.new do |s|
 
   # ---- Dependencies ----
   s.add_development_dependency 'rake'
-  # markdown formatting for yard
-  s.add_development_dependency 'redcarpet'
+
   # documentation
   s.add_development_dependency 'yard'
   # debugging
@@ -33,5 +34,21 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency 'activerecord', '>= 3.2.13'
   s.add_runtime_dependency 'activesupport'
-  s.add_runtime_dependency 'pg'
+  
+  if RUBY_PLATFORM =~ /java/
+    # markdown formatting for yard
+    s.add_development_dependency 'kramdown'
+
+    s.add_runtime_dependency 'jdbc-postgres'
+    s.add_runtime_dependency 'activerecord-jdbcpostgresql-adapter'
+    
+    s.platform = Gem::Platform::JAVA
+  else
+    # markdown formatting for yard
+    s.add_development_dependency 'redcarpet'
+
+    s.add_runtime_dependency 'pg'
+    
+    s.platform = Gem::Platform::RUBY
+  end
 end

data/spec/dummy/config/database.yml.travis

@@ -0,0 +1,22 @@
+# @note This file is only for use in travis-ci.  If you need to make a `spec/dummy/config/database.yml` for running
+# rake, rake spec, or rspec locally, please customize `spec/dummy/config/database.yml.example`.
+#
+# @example Customizing config/database.yml.example
+#   cp spec/dummy/config/database.yml.example spec/dummy/config/database.yml
+#   # update password fields for each environment's user
+
+# Using the postgres user locally without a host and port is the supported configuration from Travis-CI
+#
+# @see http://about.travis-ci.org/docs/user/database-setup/#PostgreSQL
+development: &pgsql
+  adapter: postgresql
+  database: metasploit_data_models_development
+  username: postgres
+  pool: 5
+  timeout: 5
+
+# Warning: The database defined as "test" will be erased and re-generated from your development database when you run
+# `rake`.  Do not set this db to the same as development or production.
+test:
+  <<: *pgsql
+  database: metasploit_data_models_test

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20130228214900) do
+ActiveRecord::Schema.define(:version => 20130423211152) do
 
   create_table "api_keys", :force => true do |t|
     t.text     "token"
@@ -135,7 +135,7 @@ ActiveRecord::Schema.define(:version => 20130228214900) do
 
   create_table "hosts", :force => true do |t|
     t.datetime "created_at"
-    t.string   "address",               :limit => nil
+    t.string   "address"
     t.string   "mac"
     t.string   "comm"
     t.string   "name"
@@ -157,6 +157,7 @@ ActiveRecord::Schema.define(:version => 20130228214900) do
     t.integer  "service_count",                          :default => 0
     t.integer  "host_detail_count",                      :default => 0
     t.integer  "exploit_attempt_count",                  :default => 0
+    t.integer  "cred_count",                             :default => 0
   end
 
   add_index "hosts", ["address"], :name => "index_hosts_on_address"
@@ -595,7 +596,7 @@ ActiveRecord::Schema.define(:version => 20130228214900) do
 
   create_table "wmap_requests", :force => true do |t|
     t.string   "host"
-    t.string   "address",    :limit => nil
+    t.string   "address"
     t.integer  "port"
     t.integer  "ssl"
     t.string   "meth",       :limit => 32
@@ -612,7 +613,7 @@ ActiveRecord::Schema.define(:version => 20130228214900) do
 
   create_table "wmap_targets", :force => true do |t|
     t.string   "host"
-    t.string   "address",    :limit => nil
+    t.string   "address"
     t.integer  "port"
     t.integer  "ssl"
     t.integer  "selected"

metadata

@@ -1,19 +1,22 @@
 --- !ruby/object:Gem::Specification
 name: metasploit_data_models
 version: !ruby/object:Gem::Version
-  version: 0.6.16
+  version: 0.7.0
+  prerelease: 
 platform: ruby
 authors:
+- Samuel Huckins
 - Luke Imhoff
 - Trevor Rosen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-26 00:00:00.000000000 Z
+date: 2013-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -21,13 +24,15 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: redcarpet
+  name: yard
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -35,13 +40,15 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: pry
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -49,48 +56,55 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 3.2.13
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.13
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.2.13
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.2.13
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: redcarpet
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -98,6 +112,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -105,6 +120,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -112,6 +128,7 @@ dependencies:
 description: Implements minimal ActiveRecord models and database helper code used
   in both the Metasploit Framework (MSF) and Metasploit commercial editions.
 email:
+- shuckins@rapid7.com
 - luke_imhoff@rapid7.com
 - trevor_rosen@rapid7.com
 executables:
@@ -122,6 +139,7 @@ files:
 - .gitignore
 - .rspec
 - .simplecov
+- .travis.yml
 - .yardopts
 - Gemfile
 - LICENSE
@@ -294,6 +312,7 @@ files:
 - spec/dummy/config/application.rb
 - spec/dummy/config/boot.rb
 - spec/dummy/config/database.yml.example
+- spec/dummy/config/database.yml.travis
 - spec/dummy/config/environment.rb
 - spec/dummy/config/environments/development.rb
 - spec/dummy/config/environments/production.rb
@@ -332,26 +351,33 @@ files:
 - spec/spec_helper.rb
 homepage: ''
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1381775602727200262
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1381775602727200262
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.24
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Database code for MSF and Metasploit Pro
 test_files:
 - spec/app/models/mdm/module_action_spec.rb
@@ -375,6 +401,7 @@ test_files:
 - spec/dummy/config/application.rb
 - spec/dummy/config/boot.rb
 - spec/dummy/config/database.yml.example
+- spec/dummy/config/database.yml.travis
 - spec/dummy/config/environment.rb
 - spec/dummy/config/environments/development.rb
 - spec/dummy/config/environments/production.rb

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NzJhNmVjNmY1YjY0YzFjMjYzZmUwN2QyZDFhYjI2YWFlODE4YTZkMQ==
-  data.tar.gz: !binary |-
-    ZWQ0MGQ2OGUwODEyNDE0NzU3NGJiZDMxOTVhMjlmM2NkNzNjOWVlYw==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    ODY2YzljMzI4N2RhZjg2M2FhMDBlMWNkZjY0ZjBjMjkxMzUxNTVmMDkyNzdi
-    NzE1Y2MzNjAzNGM4OTA3YjNlY2ExZmYzYWY4ODZkNWU2YzU5ZTJhMTYyNzg5
-    NjhiMjRhZDlhMjc3OGFhMGZhYjNiYjViOGE0NjljMmFjOTJmZTI=
-  data.tar.gz: !binary |-
-    MDUwZmZhY2NhZGVlMzk2NTRmM2MyOTgxZGJmNTJlN2Q4NDc0MWQ0MWYwZGZm
-    MGFkZjY4ZmUxNTE5NmQ0N2Q2Y2JlOGQ2NjdmZDk0Y2FiYzAxOGZmYmFlODUz
-    MWVlZDdmMzhlOTczNGEzNDE2MzI2ZGY5MjUzZGI0ZTg1ODYxMGE=