metasploit_data_models 0.24.0 → 0.24.1.pre.rspec.pre.3.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 697a5985907797cb0b1f5fd889d58589b4fe98b2
-  data.tar.gz: 0572ecb56f59c51be7cfed129576031de086dd8a
+  metadata.gz: 9575cbf901167b12a5b4241d3e30bef7388a66c4
+  data.tar.gz: c478549cfaeb0b0172ffd8dd2fffd786a82c82cc
 SHA512:
-  metadata.gz: ca63f729423fd054ff525b52ee8b6b2786405e15e4a77ede724d26544089ffe22238865918a9e75a6240ac2fcda174b5a66192607fad404cbb0a7fe720943b15
-  data.tar.gz: aa08a8f0ed97860cb5aee467c90816891c5dd282dcfda3ab9ef166f6767afec54ab4cc68d4a83531bfeedb37dd04eb2632534bae1fe9a9fd07457099ca327d43
+  metadata.gz: eded8aa0e65dad8d9a6fa8d60cb34e572f3551312f8756a500d9990a919dd0e5c7af58738a66bd42115c95777b25db9b667451b38db3958ab984ff15569ae5ac
+  data.tar.gz: 32c790f07c256a251dd94ec34d2a614dc9f0741ae16c3d51febdfd88a4bf2d9050102380fcd0d9303e08f19ebd64f4b5dea770c3a0c61ad83f9c544f5b0a6873

data/.rspec

@@ -1,3 +1,3 @@
---format nested
---colour
---drb
+--color
+--format documentation
+--require spec_helper

data/Gemfile

@@ -32,11 +32,9 @@ group :test do
   gem 'shoulda-matchers'
   # code coverage of tests
   gem 'simplecov', :require => false
-  # @todo Update specs for rspec 3.0.0 compatibility and remove this gem in favor of just rspec-rails
-  gem 'rspec-core', '< 3.0.0'
   # need rspec-rails >= 2.12.0 as 2.12.0 adds support for redefining named subject in nested context that uses the
   # named subject from the outer context without causing a stack overflow.
-  gem 'rspec-rails', '>= 2.12.0'
+  gem 'rspec-rails', '~> 3.2'
   # used for building markup for webpage factories
   gem 'builder'
 end

data/app/models/metasploit_data_models/ip_address/v4/segmented.rb

@@ -67,7 +67,7 @@ class MetasploitDataModels::IPAddress::V4::Segmented < Metasploit::Model::Base
   #
   # @return [Regexp]
   def self.regexp
-    unless @regexp
+    unless instance_variable_defined? :@regexp
       separated_segment_count = SEGMENT_COUNT - 1
 
       @regexp = %r{

data/app/models/metasploit_data_models/search/visitor/where.rb

@@ -32,7 +32,7 @@ class MetasploitDataModels::Search::Visitor::Where
     }
   end
 
-  visit *EQUALITY_OPERATION_CLASS_NAMES do |operation|
+  visit(*EQUALITY_OPERATION_CLASS_NAMES) do |operation|
     attribute = attribute_visitor.visit operation.operator
 
     attribute.eq(operation.value)

data/app/validators/password_is_strong_validator.rb

@@ -34,7 +34,7 @@ class PasswordIsStrongValidator < ActiveModel::EachValidator
   end
 
   def contains_username?(username, password)
-    password =~ /#{username}/i
+    !!(password =~ /#{username}/i)
   end
 
   def is_common_password?(password)

data/lib/mdm/host/operating_system_normalization.rb

@@ -185,15 +185,6 @@ module Mdm::Host::OperatingSystemNormalization
     # Merge and normalize the best match to the host object
     apply_match_to_host(match) if match
 
-    # Handle cases where the flavor contains the base name (legacy parsing, etc)
-    # TODO: Remove this once we are sure it is no longer needed
-    if host.os_name && host.os_flavor && host.os_flavor.index(host.os_name)
-      dlog("Host #{host.address} has os_flavor that contains os_name")
-      dlog("os_flavor: #{host.os_flavor}")
-      dlog("os_name: #{host.os_name}")
-      host.os_flavor = host.os_flavor.gsub(host.os_name, '').strip
-    end
-
     # Set some sane defaults if needed
     host.os_name ||= 'Unknown'
     host.purpose ||= 'device'
@@ -302,7 +293,6 @@ module Mdm::Host::OperatingSystemNormalization
       # name collision seems silly.
       return false
     else
-      dlog("Could not validate fingerprint data: #{fp.inspect}")
       return false
     end
   end

data/lib/metasploit_data_models/version.rb

@@ -6,9 +6,9 @@ module MetasploitDataModels
     # The minor version number, scoped to the {MAJOR} version number.
     MINOR = 24
     # The patch number, scoped to the {MAJOR} and {MINOR} version numbers.
-    PATCH = 0
+    PATCH = 1
     # The prerelease version, scoped to the {MAJOR}, {MINOR}, and {PATCH} version numbers.
-    # PRERELEASE =
+    PRERELEASE = 'rspec-3-1'
 
     # The full version string, including the {MAJOR}, {MINOR}, {PATCH}, and optionally, the `PRERELEASE` in the
     # {http://semver.org/spec/v2.0.0.html semantic versioning v2.0.0} format.

data/metasploit_data_models.gemspec

@@ -45,7 +45,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'recog', '~> 1.0'
 
   s.add_runtime_dependency 'metasploit-concern', '0.4.0'
-  s.add_runtime_dependency 'metasploit-model', '~> 0.29.0'
+  s.add_runtime_dependency 'metasploit-model', '~> 0.30.1'
   s.add_runtime_dependency 'railties', '< 4.0.0'
 
   # arel-helpers: Useful tools to help construct database queries with ActiveRecord and Arel.

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

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
-describe Mdm::ApiKey do
+RSpec.describe Mdm::ApiKey, type: :model do
   it_should_behave_like 'Metasploit::Concern.run'
 end

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

@@ -1,11 +1,9 @@
-require 'spec_helper'
-
-describe Mdm::Client do
+RSpec.describe Mdm::Client, type: :model do
 
   it_should_behave_like 'Metasploit::Concern.run'
 
   context 'associations' do
-    it { should belong_to(:host).class_name('Mdm::Host') }
+    it { is_expected.to belong_to(:host).class_name('Mdm::Host') }
   end
 
   context '#destroy' do
@@ -23,21 +21,21 @@ describe Mdm::Client do
   context 'factory' do
     it 'should be valid' do
       client = FactoryGirl.build(:mdm_client)
-      client.should be_valid
+      expect(client).to be_valid
     end
   end
 
   context 'database' do
     context 'columns' do
-      it { should have_db_column(:host_id).of_type(:integer)}
-      it { should have_db_column(:ua_string).of_type(:string).with_options(:null => false) }
-      it { should have_db_column(:ua_name).of_type(:string) }
-      it { should have_db_column(:ua_ver).of_type(:string) }
+      it { is_expected.to have_db_column(:host_id).of_type(:integer)}
+      it { is_expected.to have_db_column(:ua_string).of_type(:string).with_options(:null => false) }
+      it { is_expected.to have_db_column(:ua_name).of_type(:string) }
+      it { is_expected.to have_db_column(:ua_ver).of_type(:string) }
     end
 
     context 'timestamps' do
-      it { should have_db_column(:created_at).of_type(:datetime) }
-      it { should have_db_column(:updated_at).of_type(:datetime) }
+      it { is_expected.to have_db_column(:created_at).of_type(:datetime) }
+      it { is_expected.to have_db_column(:updated_at).of_type(:datetime) }
     end
 
   end

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

@@ -1,29 +1,27 @@
-require 'spec_helper'
-
-describe Mdm::Cred do
+RSpec.describe Mdm::Cred, type: :model do
   it_should_behave_like 'Metasploit::Concern.run'
 
   context "Associations" do
-    it { should have_many(:task_creds).class_name('Mdm::TaskCred').dependent(:destroy) }
-    it { should have_many(:tasks).class_name('Mdm::Task').through(:task_creds) }
-    it { should belong_to(:service).class_name('Mdm::Service') }
+    it { is_expected.to have_many(:task_creds).class_name('Mdm::TaskCred').dependent(:destroy) }
+    it { is_expected.to have_many(:tasks).class_name('Mdm::Task').through(:task_creds) }
+    it { is_expected.to belong_to(:service).class_name('Mdm::Service') }
   end
 
   context 'database' do
     context 'timestamps' do
-      it { should have_db_column(:created_at).of_type(:datetime) }
-      it { should have_db_column(:updated_at).of_type(:datetime) }
+      it { is_expected.to have_db_column(:created_at).of_type(:datetime) }
+      it { is_expected.to have_db_column(:updated_at).of_type(:datetime) }
     end
 
     context 'columns' do
-      it { should have_db_column(:service_id).of_type(:integer).with_options(:null => false) }
-      it { should have_db_column(:user).of_type(:string) }
-      it { should have_db_column(:pass).of_type(:string) }
-      it { should have_db_column(:active).of_type(:boolean).with_options(:default => true) }
-      it { should have_db_column(:proof).of_type(:string) }
-      it { should have_db_column(:ptype).of_type(:string) }
-      it { should have_db_column(:source_id).of_type(:integer) }
-      it { should have_db_column(:source_type).of_type(:string) }
+      it { is_expected.to have_db_column(:service_id).of_type(:integer).with_options(:null => false) }
+      it { is_expected.to have_db_column(:user).of_type(:string) }
+      it { is_expected.to have_db_column(:pass).of_type(:string) }
+      it { is_expected.to have_db_column(:active).of_type(:boolean).with_options(:default => true) }
+      it { is_expected.to have_db_column(:proof).of_type(:string) }
+      it { is_expected.to have_db_column(:ptype).of_type(:string) }
+      it { is_expected.to have_db_column(:source_id).of_type(:integer) }
+      it { is_expected.to have_db_column(:source_type).of_type(:string) }
     end
   end
 
@@ -68,25 +66,23 @@ describe Mdm::Cred do
 
   context 'constants' do
     it 'should define the key_id regex' do
-      described_class::KEY_ID_REGEX.should == /([0-9a-fA-F:]{47})/
+      expect(described_class::KEY_ID_REGEX).to eq(/([0-9a-fA-F:]{47})/)
     end
 
     it 'should define ptypes to humanize' do
-      described_class::PTYPES.should == {
-          'read/write password' => 'password_rw',
-          'read-only password' => 'password_ro',
-          'SMB hash' => 'smb_hash',
-          'SSH private key' => 'ssh_key',
-          'SSH public key' => 'ssh_pubkey'
-      }
+      expect(described_class::PTYPES).to eq(
+                                             {
+                                                 'read/write password' => 'password_rw',
+                                                 'read-only password' => 'password_ro',
+                                                 'SMB hash' => 'smb_hash',
+                                                 'SSH private key' => 'ssh_key',
+                                                 'SSH public key' => 'ssh_pubkey'
+                                             }
+                                         )
     end
   end
 
   context 'methods' do
-    #
-    # lets
-    #
-
     let(:host) {
       FactoryGirl.create(
           :mdm_host,
@@ -134,55 +130,47 @@ describe Mdm::Cred do
       FactoryGirl.create(:mdm_workspace)
     }
 
-    #
-    # Callbacks
-    #
-
-    before(:all) do
-      Mdm::Workspace.any_instance.stub(:valid_ip_or_range? => true)
-    end
-
     context '#ptype_human' do
       it "should return 'read/write password' for 'password_rw'" do
         cred = FactoryGirl.build(:mdm_cred, :user => 'msfadmin', :pass => 'msfadmin', :ptype => 'password_rw')
-        cred.ptype_human.should == 'read/write password'
+        expect(cred.ptype_human).to eq('read/write password')
       end
 
       it "should return 'read-only password' for 'password_ro'" do
         cred = FactoryGirl.build(:mdm_cred, :user => 'msfadmin', :pass => 'msfadmin', :ptype => 'password_ro')
-        cred.ptype_human.should == 'read-only password'
+        expect(cred.ptype_human).to eq('read-only password')
       end
 
       it "should return 'SMB Hash' for 'smb_hash'" do
         cred = FactoryGirl.build(:mdm_cred, :user => 'msfadmin', :pass => 'msfadmin', :ptype => 'smb_hash')
-        cred.ptype_human.should == 'SMB hash'
+        expect(cred.ptype_human).to eq('SMB hash')
       end
 
       it "should return 'SSH private key' for 'ssh_key'" do
         cred = FactoryGirl.build(:mdm_cred, :user => 'msfadmin', :pass => 'msfadmin', :ptype => 'ssh_key')
-        cred.ptype_human.should == 'SSH private key'
+        expect(cred.ptype_human).to eq('SSH private key')
       end
 
       it "should return 'SSH public key' for 'ssh_pubkey'" do
         cred = FactoryGirl.build(:mdm_cred, :user => 'msfadmin', :pass => 'msfadmin', :ptype => 'ssh_pubkey')
-        cred.ptype_human.should == 'SSH public key'
+        expect(cred.ptype_human).to eq('SSH public key')
       end
     end
 
     context '#ssh_key_id' do
       it 'should return nil if not an ssh_key' do
         cred = FactoryGirl.build(:mdm_cred, :user => 'msfadmin', :pass => 'msfadmin', :ptype => 'password_rw')
-        cred.ssh_key_id.should == nil
+        expect(cred.ssh_key_id).to eq(nil)
       end
 
       it 'should return nil if proof does not contain the key id' do
         cred = FactoryGirl.build(:mdm_cred, :user => 'msfadmin', :pass => '/path/to/keyfile', :ptype => 'ssh_key', :proof => "no key here")
-        cred.ssh_key_id.should == nil
+        expect(cred.ssh_key_id).to eq(nil)
       end
 
       it 'should return the key id for an ssh_key' do
         cred = FactoryGirl.build(:mdm_cred, :user => 'msfadmin', :pass => '/path/to/keyfile', :ptype => 'ssh_key', :proof => "KEY=57:c3:11:5d:77:c5:63:90:33:2d:c5:c4:99:78:62:7a")
-        cred.ssh_key_id.should == '57:c3:11:5d:77:c5:63:90:33:2d:c5:c4:99:78:62:7a'
+        expect(cred.ssh_key_id).to eq('57:c3:11:5d:77:c5:63:90:33:2d:c5:c4:99:78:62:7a')
       end
 
     end
@@ -234,14 +222,14 @@ describe Mdm::Cred do
       it 'should behave the same for public keys as private keys' do
         pubkey2 = FactoryGirl.create(:mdm_cred, :service => service, :user => 'msfadmin', :pass => '/path/to/keyfile', :ptype => 'ssh_pubkey', :proof => "KEY=57:c3:11:5d:77:c5:63:90:33:2d:c5:c4:99:78:62:7a")
         pubkey3 = FactoryGirl.create(:mdm_cred, :service => service, :user => 'msfadmin', :pass => '/path/to/keyfile', :ptype => 'ssh_pubkey', :proof => "KEY=66:d4:22:6e:88:d6:74:A1:44:3e:d6:d5:AA:89:73:8b")
-        pubkey2.ssh_key_matches?(ssh_pubkey).should == true
-        pubkey2.ssh_key_matches?(pubkey3).should == false
+        expect(pubkey2.ssh_key_matches?(ssh_pubkey)).to eq(true)
+        expect(pubkey2.ssh_key_matches?(pubkey3)).to eq(false)
       end
 
       it 'should always return false for non ssh key creds' do
         cred2 = FactoryGirl.create(:mdm_cred, :service => other_service, :ptype => 'password', :user => 'msfadmin', :pass => 'msfadmin' )
         cred3 = FactoryGirl.create(:mdm_cred, :service => other_service, :ptype => 'password', :user => 'msfadmin', :pass => 'msfadmin' )
-        cred2.ssh_key_matches?(cred3).should == false
+        expect(cred2.ssh_key_matches?(cred3)).to eq(false)
       end
     end
 
@@ -271,11 +259,11 @@ describe Mdm::Cred do
       end
 
       it 'should return all ssh private keys with a matching id' do
-        other_ssh_key.ssh_keys.should include(ssh_key)
+        expect(other_ssh_key.ssh_keys).to include(ssh_key)
       end
 
       it 'should return all ssh public keys with a matching id' do
-        other_ssh_key.ssh_keys.should include(ssh_pubkey)
+        expect(other_ssh_key.ssh_keys).to include(ssh_pubkey)
       end
     end
 
@@ -305,11 +293,11 @@ describe Mdm::Cred do
       end
 
       it 'should return ssh private keys with matching ids' do
-        other_ssh_key.ssh_private_keys.should include(ssh_key)
+        expect(other_ssh_key.ssh_private_keys).to include(ssh_key)
       end
 
       it 'should not return ssh public keys with matching ids' do
-        other_ssh_key.ssh_private_keys.should_not include(ssh_pubkey)
+        expect(other_ssh_key.ssh_private_keys).not_to include(ssh_pubkey)
       end
     end
 
@@ -339,11 +327,11 @@ describe Mdm::Cred do
       end
 
       it 'should not return ssh private keys with matching ids' do
-        other_ssh_key.ssh_public_keys.should_not include(ssh_key)
+        expect(other_ssh_key.ssh_public_keys).not_to include(ssh_key)
       end
 
       it 'should return ssh public keys with matching ids' do
-        other_ssh_key.ssh_public_keys.should include(ssh_pubkey)
+        expect(other_ssh_key.ssh_public_keys).to include(ssh_pubkey)
       end
     end
   end
@@ -351,7 +339,7 @@ describe Mdm::Cred do
   context 'factory' do
     it 'should be valid' do
       cred = FactoryGirl.build(:mdm_cred)
-      cred.should be_valid
+      expect(cred).to be_valid
     end
   end
 

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

@@ -1,27 +1,25 @@
-require 'spec_helper'
-
-describe Mdm::Event do
+RSpec.describe Mdm::Event, type: :model do
   it_should_behave_like 'Metasploit::Concern.run'
 
   context 'associations' do
-    it { should belong_to(:host).class_name('Mdm::Host') }
-    it { should belong_to(:workspace).class_name('Mdm::Workspace') }
+    it { is_expected.to belong_to(:host).class_name('Mdm::Host') }
+    it { is_expected.to belong_to(:workspace).class_name('Mdm::Workspace') }
   end
 
   context 'database' do
     context 'timestamps' do
-      it { should have_db_column(:created_at).of_type(:datetime) }
-      it { should have_db_column(:updated_at).of_type(:datetime) }
+      it { is_expected.to have_db_column(:created_at).of_type(:datetime) }
+      it { is_expected.to have_db_column(:updated_at).of_type(:datetime) }
     end
 
     context 'columns' do
-      it { should have_db_column(:workspace_id).of_type(:integer) }
-      it { should have_db_column(:host_id).of_type(:integer) }
-      it { should have_db_column(:name).of_type(:string) }
-      it { should have_db_column(:critical).of_type(:boolean) }
-      it { should have_db_column(:seen).of_type(:boolean) }
-      it { should have_db_column(:username).of_type(:string) }
-      it { should have_db_column(:info).of_type(:text) }
+      it { is_expected.to have_db_column(:workspace_id).of_type(:integer) }
+      it { is_expected.to have_db_column(:host_id).of_type(:integer) }
+      it { is_expected.to have_db_column(:name).of_type(:string) }
+      it { is_expected.to have_db_column(:critical).of_type(:boolean) }
+      it { is_expected.to have_db_column(:seen).of_type(:boolean) }
+      it { is_expected.to have_db_column(:username).of_type(:string) }
+      it { is_expected.to have_db_column(:info).of_type(:text) }
     end
   end
 
@@ -44,16 +42,16 @@ describe Mdm::Event do
         flagged_event = FactoryGirl.create(:mdm_event, :name => 'flagme', :critical => true, :seen => false)
         non_critical_event = FactoryGirl.create(:mdm_event, :name => 'dontflagmebro', :critical => false, :seen => false)
         flagged_set = Mdm::Event.flagged
-        flagged_set.should include(flagged_event)
-        flagged_set.should_not include(non_critical_event)
+        expect(flagged_set).to include(flagged_event)
+        expect(flagged_set).not_to include(non_critical_event)
       end
 
       it 'should exclude seen events' do
         flagged_event = FactoryGirl.create(:mdm_event, :name => 'flagme', :critical => true, :seen => false)
         non_critical_event = FactoryGirl.create(:mdm_event, :name => 'dontflagmebro', :critical => false, :seen => true)
         flagged_set = Mdm::Event.flagged
-        flagged_set.should include(flagged_event)
-        flagged_set.should_not include(non_critical_event)
+        expect(flagged_set).to include(flagged_event)
+        expect(flagged_set).not_to include(non_critical_event)
       end
     end
 
@@ -62,8 +60,8 @@ describe Mdm::Event do
         flagged_event = FactoryGirl.create(:mdm_event, :name => 'module_run')
         non_critical_event = FactoryGirl.create(:mdm_event, :name => 'dontflagmebro')
         flagged_set = Mdm::Event.module_run
-        flagged_set.should include(flagged_event)
-        flagged_set.should_not include(non_critical_event)
+        expect(flagged_set).to include(flagged_event)
+        expect(flagged_set).not_to include(non_critical_event)
       end
     end
   end
@@ -71,15 +69,15 @@ describe Mdm::Event do
   context 'validations' do
     it 'should require name' do
       unnamed_event = FactoryGirl.build(:mdm_event, :name => nil)
-      unnamed_event.should_not be_valid
-      unnamed_event.errors[:name].should include("can't be blank")
+      expect(unnamed_event).not_to be_valid
+      expect(unnamed_event.errors[:name]).to include("can't be blank")
     end
   end
 
   context 'factory' do
     it 'should be valid' do
       event = FactoryGirl.build(:mdm_event)
-      event.should be_valid
+      expect(event).to be_valid
     end
   end