metasploit_data_models 0.16.1-java → 0.16.3-java

data/Gemfile

@@ -11,7 +11,9 @@ group :development, :test do
   # auto-load factories from spec/factories
   gem 'factory_girl_rails'
   # rails is only used for the dummy application in spec/dummy
-  gem 'rails'
+  # restrict from rails 4.0 as it requires protected_attributes gem and other changes for compatibility
+  # @see https://www.pivotaltracker.com/story/show/52309083
+  gem 'rails', '>= 3.2', '< 4.0.0'
 end
 
 group :test do

data/app/models/mdm/nexpose_console.rb

@@ -9,7 +9,7 @@ class Mdm::NexposeConsole < ActiveRecord::Base
   # Validations
   #
 
-  validates :address, :ip_format => true, :presence => true
+  validates :address, :presence => true
   validates :name, :presence => true
   validates :password, :presence => true
   validates :port, :numericality => { :only_integer => true }, :inclusion => {:in => 1..65535}

data/db/migrate/20130619160512_drop_attachments_email_templates.rb

@@ -0,0 +1,30 @@
+# Drops obsolete attachments_email_templates join table.
+class DropAttachmentsEmailTemplates < ActiveRecord::Migration
+  #
+  # CONSTANTS
+  #
+
+  # Table being dropped.
+  TABLE_NAME = :attachments_email_templates
+
+  #
+  # Methods
+  #
+
+  # Recreates attachments_email_templates table
+  #
+  # @return [void]
+  def down
+    create_table TABLE_NAME, :id => false do |t|
+      t.references :attachment
+      t.references :email_template
+    end
+  end
+
+  # Drops attachmetns_email_templates table
+  #
+  # @return [void]
+  def up
+    drop_table TABLE_NAME
+  end
+end

data/db/migrate/20130619162051_drop_attachments.rb

@@ -0,0 +1,46 @@
+# Drops obsolete attachments table.
+class DropAttachments < ActiveRecord::Migration
+  #
+  # CONSTANTS
+  #
+
+  # Table name
+  TABLE_NAME = :attachments
+
+
+  # Recreates attachments, but without data.
+  #
+  # @return [void]
+  def down
+    create_table TABLE_NAME do |t|
+      #
+      # Columns
+      #
+
+      t.binary :data
+      t.string :content_type,
+               :limit => 512
+      t.boolean :inline,
+                :default => true,
+                :null => false
+      t.string :name,
+               :limit => 512
+      t.boolean :zip,
+                :default => false,
+                :null => false
+
+      #
+      # Foreign Keys
+      #
+
+      t.references :campaign
+    end
+  end
+
+  # Drops attachments
+  #
+  # @return [void]
+  def up
+    drop_table TABLE_NAME
+  end
+end

data/db/migrate/20130619185710_drop_email_addresses.rb

@@ -0,0 +1,49 @@
+# Drops obsolete email_addresses.
+class DropEmailAddresses < ActiveRecord::Migration
+  #
+  # CONSTANTS
+  #
+
+  # Table being dropped.
+  TABLE_NAME = :email_addresses
+
+  #
+  # Methods
+  #
+
+  # Recreates email_addresses, but does not restore data.
+  #
+  # @return [void]
+  def down
+    create_table TABLE_NAME do |t|
+      #
+      # Columns
+      #
+
+      t.string :address,
+               :limit => 512
+      t.datetime :clicked_at
+      t.string :first_name,
+               :limit => 512
+      t.string :last_name,
+               :limit => 512
+      t.boolean :sent,
+                :default => false,
+                :null => false
+
+      #
+      # Foreign Keys
+      #
+
+      t.references :campaign,
+                   :null => false
+    end
+  end
+
+  # Drops email_addresses
+  #
+  # @return [void]
+  def up
+    drop_table TABLE_NAME
+  end
+end

data/db/migrate/20130619190652_drop_email_templates.rb

@@ -0,0 +1,41 @@
+# Drops email_templates table that used to back obsolete Mdm::EmailTemplate module for old-style campaigns.
+class DropEmailTemplates < ActiveRecord::Migration
+  #
+  # CONSTANTS
+  #
+
+  # Table being dropped.
+  TABLE_NAME = :email_templates
+
+  # Recreates email_templates, but does not restore data.
+  #
+  # @return [void]
+  def down
+    create_table TABLE_NAME do |t|
+      #
+      # Columns
+      #
+
+      t.text :body
+      t.string :name,
+               :limit => 512
+      t.text :prefs
+      t.string :subject,
+               :limit => 1024
+
+      #
+      # Foreign Keys
+      #
+
+      t.references :parent
+      t.references :campaign
+    end
+  end
+
+  # Drops email_templates
+  #
+  # @return [void]
+  def up
+    drop_table TABLE_NAME
+  end
+end

data/db/migrate/20130619191802_drop_web_templates.rb

@@ -0,0 +1,41 @@
+# Drops web_teamplates that was used with obsolete Mdm::WebTemplates model for old-style campaigns.
+class DropWebTemplates < ActiveRecord::Migration
+  #
+  # CONSTANTS
+  #
+
+  # Table being dropped.
+  TABLE_NAME = :web_templates
+
+  # Recreates web_templates, but does not restore data.
+  #
+  # @return [void]
+  def down
+    create_table TABLE_NAME do |t|
+      #
+      # Columns
+      #
+
+      t.string :body,
+               :limit => 524288
+      t.string :name,
+               :limit => 512
+      t.text :prefs
+      t.string :title,
+               :limit => 512
+
+      #
+      # Foreign Keys
+      #
+
+      t.references :campaign
+    end
+  end
+
+  # Drops web_templates
+  #
+  # @return [void]
+  def up
+    drop_table TABLE_NAME
+  end
+end

data/db/migrate/20130619192506_drop_campaigns.rb

@@ -0,0 +1,45 @@
+# Drop campaigns table for old-style campaigns
+class DropCampaigns < ActiveRecord::Migration
+  #
+  # CONSTANTS
+  #
+
+  # Table being dropped
+  TABLE_NAME = :campaigns
+
+  # Recreates campaigns, but does not restore data.
+  #
+  # @return [void]
+  def down
+    create_table TABLE_NAME do |t|
+      #
+      # Columns
+      #
+
+      t.datetime :created_at,
+                 :null => false
+      t.string :name,
+               :limit => 512
+      t.text :prefs
+      t.datetime :started_at
+      t.integer :status,
+                :default => 0
+      t.datetime :updated_at,
+                 :null => false
+
+      #
+      # Foreign Keys
+      #
+
+      t.references :workspace,
+                   :null => false
+    end
+  end
+
+  # Drop campaigns
+  #
+  # @return [void]
+  def up
+    drop_table TABLE_NAME
+  end
+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.16.1'
+  VERSION = '0.16.3'
 end

data/spec/app/models/mdm/nexpose_console_spec.rb

@@ -60,11 +60,6 @@ describe Mdm::NexposeConsole do
         ipv6_nexpose_console = FactoryGirl.build(:mdm_nexpose_console, :address => '2001:0db8:85a3:0000:0000:8a2e:0370:7334')
         ipv6_nexpose_console.should be_valid
       end
-
-      it 'should not be valid for strings not conforming to IPv4 or IPv6' do
-        invalid_nexpose_console = FactoryGirl.build(:mdm_nexpose_console, :address => '1234-fark')
-        invalid_nexpose_console.should_not be_valid
-      end
     end
 
     context 'port' do

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 => 20130604145732) do
+ActiveRecord::Schema.define(:version => 20130619192506) do
 
   create_table "api_keys", :force => true do |t|
     t.text     "token"
@@ -19,30 +19,6 @@ ActiveRecord::Schema.define(:version => 20130604145732) do
     t.datetime "updated_at", :null => false
   end
 
-  create_table "attachments", :force => true do |t|
-    t.string  "name",         :limit => 512
-    t.binary  "data"
-    t.string  "content_type", :limit => 512
-    t.boolean "inline",                      :default => true,  :null => false
-    t.boolean "zip",                         :default => false, :null => false
-    t.integer "campaign_id"
-  end
-
-  create_table "attachments_email_templates", :id => false, :force => true do |t|
-    t.integer "attachment_id"
-    t.integer "email_template_id"
-  end
-
-  create_table "campaigns", :force => true do |t|
-    t.integer  "workspace_id",                               :null => false
-    t.string   "name",         :limit => 512
-    t.text     "prefs"
-    t.integer  "status",                      :default => 0
-    t.datetime "started_at"
-    t.datetime "created_at",                                 :null => false
-    t.datetime "updated_at",                                 :null => false
-  end
-
   create_table "clients", :force => true do |t|
     t.integer  "host_id"
     t.datetime "created_at"
@@ -65,24 +41,6 @@ ActiveRecord::Schema.define(:version => 20130604145732) do
     t.string   "source_type"
   end
 
-  create_table "email_addresses", :force => true do |t|
-    t.integer  "campaign_id",                                   :null => false
-    t.string   "first_name",  :limit => 512
-    t.string   "last_name",   :limit => 512
-    t.string   "address",     :limit => 512
-    t.boolean  "sent",                       :default => false, :null => false
-    t.datetime "clicked_at"
-  end
-
-  create_table "email_templates", :force => true do |t|
-    t.string  "name",        :limit => 512
-    t.string  "subject",     :limit => 1024
-    t.text    "body"
-    t.integer "parent_id"
-    t.integer "campaign_id"
-    t.text    "prefs"
-  end
-
   create_table "events", :force => true do |t|
     t.integer  "workspace_id"
     t.integer  "host_id"
@@ -581,14 +539,6 @@ ActiveRecord::Schema.define(:version => 20130604145732) do
   add_index "web_sites", ["options"], :name => "index_web_sites_on_options"
   add_index "web_sites", ["vhost"], :name => "index_web_sites_on_vhost"
 
-  create_table "web_templates", :force => true do |t|
-    t.string  "name",        :limit => 512
-    t.string  "title",       :limit => 512
-    t.string  "body",        :limit => 524288
-    t.integer "campaign_id"
-    t.text    "prefs"
-  end
-
   create_table "web_vulns", :force => true do |t|
     t.integer  "web_site_id",                 :null => false
     t.datetime "created_at",                  :null => false

metadata

@@ -2,7 +2,7 @@
 name: metasploit_data_models
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.16.1
+  version: 0.16.3
 platform: java
 authors:
 - Samuel Huckins
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-06-04 00:00:00.000000000 Z
+date: 2013-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -335,6 +335,12 @@ files:
 - db/migrate/20130525212420_drop_table_imported_creds.rb
 - db/migrate/20130531144949_making_host_tags_a_real_ar_model.rb
 - db/migrate/20130604145732_create_task_sessions.rb
+- db/migrate/20130619160512_drop_attachments_email_templates.rb
+- db/migrate/20130619162051_drop_attachments.rb
+- db/migrate/20130619185710_drop_email_addresses.rb
+- db/migrate/20130619190652_drop_email_templates.rb
+- db/migrate/20130619191802_drop_web_templates.rb
+- db/migrate/20130619192506_drop_campaigns.rb
 - lib/mdm.rb
 - lib/mdm/host/operating_system_normalization.rb
 - lib/mdm/module.rb