metasploit_data_models 0.16.9-java → 0.17.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b731ba1f43bb6169b05a20a13fddfb8586e62d6b
-  data.tar.gz: d13f90eb96eafeabf6f126d179fa4ab26c1b7e6f
+  metadata.gz: 4f4621672c11b8b3879c2e357d8cb6d58bbed881
+  data.tar.gz: 98cfa49f629de2306a3fcb0ff56418f20cbf0905
 SHA512:
-  metadata.gz: 8389ece1faa0ad00529d58f59128fcffbb61bff3abef409dc83151bd23dcbe93db068ba406e1aff43bc8cbfe5eb86fda147968be87bf05f3d65710df0b9db674
-  data.tar.gz: ad0da45acc8baa77cb1a89497bef350ca78301211a4685cdc1be9de709d2676523d77c432ffb9336eff4f1db1375488bfaa8c935ff0fa54bc743cc465e6ce323
+  metadata.gz: bc546d304ea93aca26a4bcd8a4d4f66d4c4089f5ed5699e32a39988a4e90e29c186e46774d3cea29f1f5ab3470fe4a935fa1797f2347b5c3ed9f191122bd0d5c
+  data.tar.gz: ac654d836d39728947e6a4fb02fe6914e8f404a58b9070db06eeb55369ddcfb9436ab9d9e9942df43b7744a9556a6e434b31ce8186b5ff22ca9b6939d89f86f8

data/.coveralls.yml

@@ -0,0 +1 @@
+service_name: travis-ci

data/.travis.yml

@@ -4,4 +4,7 @@ before_script:
 language: ruby
 rvm:
   - '1.9.3'
+  - '2.0'
+  - '2.1'
   - 'jruby-19mode'
+  - 'rbx-2.2'

data/Gemfile

@@ -19,6 +19,8 @@ group :development, :test do
 end
 
 group :test do
+  # Upload coverage reports to coveralls.io
+  gem 'coveralls', require: false
   # In a full rails project, factory_girl_rails would be in both the :development, and :test group, but since we only
   # want rails in :test, factory_girl_rails must also only be in :test.
   # add matchers from shoulda, such as validates_presence_of, which are useful for testing validations

data/README.md

@@ -1,4 +1,4 @@
-#MetasploitDataModels [![Build Status](https://travis-ci.org/rapid7/metasploit_data_models.png)](https://travis-ci.org/rapid7/metasploit_data_models)
+#MetasploitDataModels [![Build Status](https://travis-ci.org/rapid7/metasploit_data_models.png)](https://travis-ci.org/rapid7/metasploit_data_models)[![Code Climate](https://codeclimate.com/github/rapid7/metasploit_data_models.png)](https://codeclimate.com/github/rapid7/metasploit_data_models)[![Coverage Status](https://coveralls.io/repos/rapid7/metasploit_data_models/badge.png)](https://coveralls.io/r/rapid7/metasploit_data_models)[![Dependency Status](https://gemnasium.com/rapid7/metasploit_data_models.png)](https://gemnasium.com/rapid7/metasploit_data_models)[![Gem Version](https://badge.fury.io/rb/metasploit_data_models.png)](http://badge.fury.io/rb/metasploit_data_models)
 
 The database layer for Metasploit
 

data/app/models/mdm/task.rb

@@ -64,8 +64,6 @@ class Mdm::Task < ActiveRecord::Base
   has_many :sessions, :through => :task_sessions, :class_name => 'Mdm::Session'
 
 
-  has_many :reports, :class_name => 'Mdm::Report'
-
   #
   # Scopes
   #

data/app/models/mdm/workspace.rb

@@ -21,8 +21,6 @@ class Mdm::Workspace < ActiveRecord::Base
   has_many :listeners, :dependent => :destroy, :class_name => 'Mdm::Listener'
   has_many :notes, :class_name => 'Mdm::Note'
   belongs_to :owner, :class_name => 'Mdm::User', :foreign_key => 'owner_id'
-  has_many :report_templates, :dependent => :destroy, :class_name => 'Mdm::ReportTemplate'
-  has_many :reports, :dependent => :destroy, :class_name => 'Mdm::Report'
   has_many :tasks, :dependent => :destroy, :class_name => 'Mdm::Task', :order => 'created_at DESC'
   has_and_belongs_to_many :users, :join_table => 'workspace_members', :uniq => true, :class_name => 'Mdm::User'
 

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.9'
+  VERSION = '0.17.0'
 end

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

@@ -55,7 +55,6 @@ describe Mdm::Task do
     it { should have_many(:task_services).class_name('Mdm::TaskService').dependent(:destroy) }
     it { should have_many(:services).class_name('Mdm::Service').through(:task_services) }
     it { should belong_to(:workspace).class_name('Mdm::Workspace') }
-    it { should have_many(:reports).class_name('Mdm::Report')}
 
   end
 

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

@@ -20,8 +20,6 @@ describe Mdm::Workspace do
     it 'should successfully destroy the object and dependent objects' do
       workspace = FactoryGirl.create(:mdm_workspace)
       listener = FactoryGirl.create(:mdm_listener, :workspace => workspace)
-      report_template = FactoryGirl.create(:mdm_report_template, :workspace => workspace)
-      report = FactoryGirl.create(:mdm_report, :workspace => workspace)
       task = FactoryGirl.create(:mdm_task, :workspace => workspace)
 
       expect {
@@ -33,12 +31,6 @@ describe Mdm::Workspace do
       expect {
         listener.reload
       }.to raise_error(ActiveRecord::RecordNotFound)
-      expect {
-        report_template.reload
-      }.to raise_error(ActiveRecord::RecordNotFound)
-      expect {
-        report.reload
-      }.to raise_error(ActiveRecord::RecordNotFound)
       expect {
         task.reload
       }.to raise_error(ActiveRecord::RecordNotFound)
@@ -55,8 +47,6 @@ describe Mdm::Workspace do
     it { should have_many(:loots).class_name('Mdm::Loot').through(:hosts) }
     it { should have_many(:notes).class_name('Mdm::Note') }
     it { should belong_to(:owner).class_name('Mdm::User').with_foreign_key('owner_id') }
-    it { should have_many(:report_templates).class_name('Mdm::ReportTemplate').dependent(:destroy) }
-    it { should have_many(:reports).class_name('Mdm::Report').dependent(:destroy) }
     it { should have_many(:services).class_name('Mdm::Service').through(:hosts).with_foreign_key('service_id') }
     it { should have_many(:sessions).class_name('Mdm::Session').through(:hosts) }
     it { should have_many(:tasks).class_name('Mdm::Task').dependent(:destroy).order('created_at DESC') }

data/spec/spec_helper.rb

@@ -8,6 +8,17 @@ Bundler.setup(:default, :test)
 # Require simplecov before loading ..dummy/config/environment.rb because it will cause metasploit_data_models/lib to
 # be loaded, which would result in Coverage not recording hits for any of the files.
 require 'simplecov'
+require 'coveralls'
+
+if ENV['TRAVIS'] == 'true'
+  # don't generate local report as it is inaccessible on travis-ci, which is why coveralls is being used.
+  SimpleCov.formatter = Coveralls::SimpleCov::Formatter
+else
+  SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+      # either generate the local report
+      SimpleCov::Formatter::HTMLFormatter
+  ]
+end
 
 require File.expand_path('../dummy/config/environment.rb',  __FILE__)
 require 'rspec/rails'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metasploit_data_models
 version: !ruby/object:Gem::Version
-  version: 0.16.9
+  version: 0.17.0
 platform: java
 authors:
 - Samuel Huckins
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-12-23 00:00:00.000000000 Z
+date: 2014-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -136,6 +136,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- .coveralls.yml
 - .gitignore
 - .rspec
 - .simplecov
@@ -170,8 +171,6 @@ files:
 - app/models/mdm/note.rb
 - app/models/mdm/profile.rb
 - app/models/mdm/ref.rb
-- app/models/mdm/report.rb
-- app/models/mdm/report_template.rb
 - app/models/mdm/route.rb
 - app/models/mdm/service.rb
 - app/models/mdm/session.rb
@@ -341,8 +340,6 @@ files:
 - spec/app/models/mdm/nexpose_console_spec.rb
 - spec/app/models/mdm/note_spec.rb
 - spec/app/models/mdm/ref_spec.rb
-- spec/app/models/mdm/report_spec.rb
-- spec/app/models/mdm/report_template_spec.rb
 - spec/app/models/mdm/route_spec.rb
 - spec/app/models/mdm/service_spec.rb
 - spec/app/models/mdm/session_event_spec.rb
@@ -424,8 +421,6 @@ files:
 - spec/factories/mdm/nexpose_consoles.rb
 - spec/factories/mdm/notes.rb
 - spec/factories/mdm/refs.rb
-- spec/factories/mdm/report_templates.rb
-- spec/factories/mdm/reports.rb
 - spec/factories/mdm/routes.rb
 - spec/factories/mdm/services.rb
 - spec/factories/mdm/session_events.rb
@@ -495,8 +490,6 @@ test_files:
 - spec/app/models/mdm/nexpose_console_spec.rb
 - spec/app/models/mdm/note_spec.rb
 - spec/app/models/mdm/ref_spec.rb
-- spec/app/models/mdm/report_spec.rb
-- spec/app/models/mdm/report_template_spec.rb
 - spec/app/models/mdm/route_spec.rb
 - spec/app/models/mdm/service_spec.rb
 - spec/app/models/mdm/session_event_spec.rb
@@ -578,8 +571,6 @@ test_files:
 - spec/factories/mdm/nexpose_consoles.rb
 - spec/factories/mdm/notes.rb
 - spec/factories/mdm/refs.rb
-- spec/factories/mdm/report_templates.rb
-- spec/factories/mdm/reports.rb
 - spec/factories/mdm/routes.rb
 - spec/factories/mdm/services.rb
 - spec/factories/mdm/session_events.rb

data/app/models/mdm/report.rb

@@ -1,50 +0,0 @@
-class Mdm::Report < ActiveRecord::Base
-  #
-  # Callbacks
-  #
-
-  before_destroy :delete_file
-
-  #
-  # Relations
-  #
-
-  belongs_to :workspace, :class_name => 'Mdm::Workspace'
-  belongs_to :task, :class_name => 'Mdm::Task'
-  #
-  # Scopes
-  #
-
-  scope :flagged, where('reports.downloaded_at is NULL')
-
-  #
-  # Serializations
-  #
-
-  serialize :options, MetasploitDataModels::Base64Serializer.new
-
-  #
-  # Validations
-  #
-
-  validates :name,
-            :format => {
-                :allow_blank => true,
-                :message => "name must consist of A-Z, 0-9, space, dot, underscore, or dash",
-                :with => /^[A-Za-z0-9\x20\x2e\x2d\x5f\x5c]+$/
-            }
-
-  private
-
-  def delete_file
-    c = Pro::Client.get rescue nil
-    if c
-      c.report_delete_file(self[:id])
-    else
-      ::File.unlink(self.path) rescue nil
-    end
-  end
-
-  ActiveSupport.run_load_hooks(:mdm_report, self)
-end
-

data/app/models/mdm/report_template.rb

@@ -1,27 +0,0 @@
-class Mdm::ReportTemplate < ActiveRecord::Base
-  #
-  # Callbacks
-  #
-
-  before_destroy :delete_file
-
-  #
-  # Relations
-  #
-
-  belongs_to :workspace, :class_name => 'Mdm::Workspace'
-
-  private
-
-  def delete_file
-    c = Pro::Client.get rescue nil
-    if c
-      c.report_template_delete_file(self[:id])
-    else
-      ::File.unlink(self.path) rescue nil
-    end
-  end
-
-  ActiveSupport.run_load_hooks(:mdm_report_template, self)
-end
-

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

@@ -1,104 +0,0 @@
-require 'spec_helper'
-
-describe Mdm::Report do
-
-  context 'associations' do
-    it { should belong_to(:workspace).class_name('Mdm::Workspace') }
-    it { should belong_to(:task).class_name('Mdm::Task') }
-  end
-
-  context 'validations' do
-    context 'name' do
-      it 'may be blank' do
-        blank_name = FactoryGirl.build(:mdm_report, :name => '')
-        blank_name.should be_valid
-      end
-
-      it 'may contain A-Z, 0-9, space, dot, underscore, or dash' do
-        named_report = FactoryGirl.build(:mdm_report, :name => 'A1 B2.C_3-D')
-        named_report.should be_valid
-      end
-
-      it 'may not contain other characters' do
-        invalid_name = FactoryGirl.build(:mdm_report, :name => 'A/1')
-        invalid_name.should_not be_valid
-        invalid_name.errors[:name].should include('name must consist of A-Z, 0-9, space, dot, underscore, or dash')
-        invalid_name = FactoryGirl.build(:mdm_report, :name => '#A1')
-        invalid_name.should_not be_valid
-        invalid_name.errors[:name].should include('name must consist of A-Z, 0-9, space, dot, underscore, or dash')
-        invalid_name = FactoryGirl.build(:mdm_report, :name => 'A,1')
-        invalid_name.should_not be_valid
-        invalid_name.errors[:name].should include('name must consist of A-Z, 0-9, space, dot, underscore, or dash')
-        invalid_name = FactoryGirl.build(:mdm_report, :name => 'A;1')
-        invalid_name.should_not be_valid
-        invalid_name.errors[:name].should include('name must consist of A-Z, 0-9, space, dot, underscore, or dash')
-        invalid_name = FactoryGirl.build(:mdm_report, :name => "A' or '1'='1'")
-        invalid_name.should_not be_valid
-        invalid_name.errors[:name].should include('name must consist of A-Z, 0-9, space, dot, underscore, or dash')
-      end
-    end
-  end
-
-  context 'scopes' do
-    context 'flagged'  do
-      it 'should return un-downlaoded reports' do
-        flagged_report = FactoryGirl.create(:mdm_report)
-        Mdm::Report.flagged.should include(flagged_report)
-      end
-
-      it 'should not return reports that have been downloaded' do
-        downlaoded_report = FactoryGirl.create(:mdm_report, :downloaded_at => Time.now)
-        Mdm::Report.flagged.should_not include(downlaoded_report)
-      end
-    end
-  end
-
-  context 'callbacks' do
-    context 'before_destroy' do
-      it 'should call #delete_file' do
-        myreport =  FactoryGirl.create(:mdm_report)
-        myreport.should_receive(:delete_file)
-        myreport.destroy
-      end
-    end
-  end
-
-  context 'factory' do
-    it 'should be valid' do
-      report = FactoryGirl.build(:mdm_report)
-      report.should be_valid
-    end
-  end
-
-  context '#destroy' do
-    it 'should successfully destroy the object' do
-      report = FactoryGirl.create(:mdm_report)
-      expect {
-        report.destroy
-      }.to_not raise_error
-      expect {
-        report.reload
-      }.to raise_error(ActiveRecord::RecordNotFound)
-    end
-  end
-
-  context 'database' do
-
-    context 'timestamps'do
-      it { should have_db_column(:created_at).of_type(:datetime).with_options(:null => false) }
-      it { should have_db_column(:updated_at).of_type(:datetime).with_options(:null => false) }
-      it { should have_db_column(:downloaded_at).of_type(:datetime) }
-    end
-
-    context 'columns' do
-      it { should have_db_column(:workspace_id).of_type(:integer).with_options(:null => false, :default =>1) }
-      it { should have_db_column(:created_by).of_type(:string) }
-      it { should have_db_column(:rtype).of_type(:string) }
-      it { should have_db_column(:path).of_type(:string) }
-      it { should have_db_column(:options).of_type(:text) }
-      it { should have_db_column(:name).of_type(:string) }
-
-    end
-  end
-
-end

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

@@ -1,52 +0,0 @@
-require 'spec_helper'
-
-describe Mdm::ReportTemplate do
-
-  context 'associations' do
-    it { should belong_to(:workspace).class_name('Mdm::Workspace') }
-  end
-
-  context 'callbacks' do
-    context 'before_destroy' do
-      it 'should call #delete_file' do
-        report_template = FactoryGirl.create(:mdm_report_template)
-        report_template.should_receive(:delete_file)
-        report_template.destroy
-      end
-    end
-  end
-
-  context 'factory' do
-    it 'should be valid' do
-      report_template = FactoryGirl.build(:mdm_report_template)
-      report_template.should be_valid
-    end
-  end
-
-  context '#destroy' do
-    it 'should successfully destroy the object' do
-      report_template = FactoryGirl.create(:mdm_report_template)
-      expect {
-        report_template.destroy
-      }.to_not raise_error
-      expect {
-        report_template.reload
-      }.to raise_error(ActiveRecord::RecordNotFound)
-    end
-  end
-
-  context 'database' do
-
-    context 'timestamps'do
-      it { should have_db_column(:created_at).of_type(:datetime).with_options(:null => false) }
-      it { should have_db_column(:updated_at).of_type(:datetime).with_options(:null => false) }
-    end
-
-    context 'columns' do
-      it { should have_db_column(:workspace_id).of_type(:integer).with_options(:null => false, :default =>1) }
-      it { should have_db_column(:created_by).of_type(:string) }
-      it { should have_db_column(:path).of_type(:string) }
-      it { should have_db_column(:name).of_type(:text) }
-    end
-  end
-end

data/spec/factories/mdm/report_templates.rb

@@ -1,8 +0,0 @@
-FactoryGirl.define do
-  factory :mdm_report_template, :aliases => [:report_template], :class => Mdm::ReportTemplate do
-    #
-    # Associations
-    #
-    association :workspace, :factory => :mdm_workspace
-  end
-end

data/spec/factories/mdm/reports.rb

@@ -1,13 +0,0 @@
-FactoryGirl.define do
-  factory :mdm_report, :aliases => [:report], :class => Mdm::Report do
-    #
-    # Associations
-    #
-    association :workspace, :factory => :mdm_workspace
-    name{generate :report_name}
-  end
-
-  sequence :report_name do |n|
-    "Some Report#{n}"
-  end
-end