metasploit_data_models 0.24.5 → 1.0.0.pre.rails.pre.4.0a

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

@@ -40,20 +40,26 @@ describe Mdm::Event do
 
   context 'scopes' do
     context 'flagged' do
+      let(:workspace) {FactoryGirl.create(:mdm_workspace)}
+      let(:flagged_event) { FactoryGirl.create(:mdm_event, :workspace => workspace, :name => 'flagme', :critical => true, :seen => false) }
+      let(:non_critical_event) { FactoryGirl.create(:mdm_event, :workspace => workspace, :name => 'dontflagmebro', :critical => false, :seen => false) }
+ 
+      before(:each) do
+        flagged_event
+        non_critical_event
+      end
+ 
+      it 'should included critical unseen events' do
+        Mdm::Event.flagged.should eq [flagged_event]
+      end
       it 'should exclude non-critical 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 => false)
-        flagged_set = Mdm::Event.flagged
-        flagged_set.should include(flagged_event)
-        flagged_set.should_not include(non_critical_event)
+        Mdm::Event.flagged.should_not 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)
+      it 'should exclude critical seen events' do
+        flagged_event.seen = true
+        flagged_event.save
+        Mdm::Event.flagged.should_not include(flagged_event)
       end
     end
 

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

@@ -319,7 +319,7 @@ describe Mdm::Host do
 
   context 'database' do
     context 'columns' do
-      it { should have_db_column(:address).of_type(:string).with_options(:null => false) }
+      it { should have_db_column(:address).of_type(:inet).with_options(:null => false) }
       it { should have_db_column(:arch).of_type(:string) }
       it { should have_db_column(:comm).of_type(:string) }
       it { should have_db_column(:comments).of_type(:text) }
@@ -416,7 +416,7 @@ describe Mdm::Host do
         end
       end
     end
-    it { should ensure_inclusion_of(:state).in_array(states).allow_nil }
+    it { should validate_inclusion_of(:state).in_array(states).allow_nil }
     it { should validate_presence_of(:workspace) }
   end
 

data/spec/app/models/mdm/module/action_spec.rb

@@ -29,11 +29,6 @@ describe Mdm::Module::Action do
     end
   end
 
-  context 'mass assignment security' do
-    it { should_not allow_mass_assignment_of(:detail_id) }
-    it { should allow_mass_assignment_of(:name) }
-  end
-
   context 'validations' do
     it { should validate_presence_of(:detail) }
     it { should validate_presence_of(:name) }

data/spec/app/models/mdm/module/arch_spec.rb

@@ -29,11 +29,6 @@ describe Mdm::Module::Arch do
     end
   end
 
-  context 'mass assignment security' do
-    it { should_not allow_mass_assignment_of(:detail_id) }
-    it { should allow_mass_assignment_of(:name) }
-  end
-
   context 'validations' do
     it { should validate_presence_of(:detail) }
     it { should validate_presence_of(:name) }

data/spec/app/models/mdm/module/author_spec.rb

@@ -39,12 +39,6 @@ describe Mdm::Module::Author do
     end
   end
 
-  context 'mass assignment security' do
-    it { should_not allow_mass_assignment_of(:detail_id) }
-    it { should allow_mass_assignment_of(:email) }
-    it { should allow_mass_assignment_of(:name) }
-  end
-
   context 'validations' do
     it { should validate_presence_of(:detail) }
     it { should_not validate_presence_of(:email) }

data/spec/app/models/mdm/module/detail_spec.rb

@@ -173,14 +173,14 @@ describe Mdm::Module::Detail do
   end
 
   context 'validations' do
-    it { should ensure_inclusion_of(:mtype).in_array(types) }
+    it { should validate_inclusion_of(:mtype).in_array(types) }
 
     # Because the boolean field will cast most strings to false,
-    # ensure_inclusion_of(:privileged).in_array([true, false]) will fail on the disallowed values check.
+    # validate_inclusion_of(:privileged).in_array([true, false]) will fail on the disallowed values check.
 
     context 'rank' do
       it { should validate_numericality_of(:rank).only_integer }
-      it { should ensure_inclusion_of(:rank).in_array(ranks) }
+      it { should validate_inclusion_of(:rank).in_array(ranks) }
     end
 
     it { should validate_presence_of(:refname) }

data/spec/app/models/mdm/module/mixin_spec.rb

@@ -29,11 +29,6 @@ describe Mdm::Module::Mixin do
     end
   end
 
-  context 'mass assignment security' do
-    it { should_not allow_mass_assignment_of(:detail_id) }
-    it { should allow_mass_assignment_of(:name) }
-  end
-
   context 'validations' do
     it { should validate_presence_of(:detail) }
     it { should validate_presence_of(:name) }

data/spec/app/models/mdm/module/platform_spec.rb

@@ -29,11 +29,6 @@ describe Mdm::Module::Platform do
     end
   end
 
-  context 'mass assignment security' do
-    it { should_not allow_mass_assignment_of(:detail_id) }
-    it { should allow_mass_assignment_of(:name) }
-  end
-
   context 'validations' do
     it { should validate_presence_of :detail }
     it { should validate_presence_of :name }

data/spec/app/models/mdm/module/ref_spec.rb

@@ -53,11 +53,6 @@ describe Mdm::Module::Ref do
     end
   end
 
-  context 'mass assignment security' do
-    it { should_not allow_mass_assignment_of(:detail_id) }
-    it { should allow_mass_assignment_of(:name) }
-  end
-
   context 'validations' do
     it { should validate_presence_of(:detail) }
     it { should validate_presence_of(:name) }

data/spec/app/models/mdm/module/target_spec.rb

@@ -30,12 +30,6 @@ describe Mdm::Module::Target do
     end
   end
 
-  context 'mass assignment security' do
-    it { should_not allow_mass_assignment_of(:detail_id) }
-    it { should allow_mass_assignment_of(:index) }
-    it { should allow_mass_assignment_of(:name) }
-  end
-
   context 'validations' do
     it { should validate_presence_of(:detail) }
     it { should validate_presence_of(:index) }

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

@@ -71,7 +71,4 @@ describe Mdm::Ref do
     end
   end
 
-  context 'mass assignment security' do
-    it { should allow_mass_assignment_of(:name) }
-  end
 end

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

@@ -152,7 +152,7 @@ describe Mdm::Service do
     }
 
     it { should validate_numericality_of(:port).only_integer }
-    it { should ensure_inclusion_of(:proto).in_array(described_class::PROTOS) }
+    it { should validate_inclusion_of(:proto).in_array(described_class::PROTOS) }
 
     context 'when a duplicate service already exists' do
       let(:service1) { FactoryGirl.create(:mdm_service)}

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

@@ -111,8 +111,8 @@ describe Mdm::WebVuln do
 
   context 'validations' do
     it { should validate_presence_of :category }
-    it { should ensure_inclusion_of(:confidence).in_range(confidence_range) }
-    it { should ensure_inclusion_of(:method).in_array(methods) }
+    it { should validate_inclusion_of(:confidence).in_range(confidence_range) }
+    it { should validate_inclusion_of(:method).in_array(methods) }
     it { should validate_presence_of :name }
     it { should validate_presence_of :path }
 
@@ -281,7 +281,7 @@ describe Mdm::WebVuln do
     end
 
     it { should validate_presence_of :proof }
-    it { should ensure_inclusion_of(:risk).in_range(risk_range) }
+    it { should validate_inclusion_of(:risk).in_range(risk_range) }
     it { should validate_presence_of :web_site }
   end
 

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

@@ -2,4 +2,6 @@ require 'spec_helper'
 
 describe Mdm::WmapRequest do
   it_should_behave_like 'Metasploit::Concern.run'
+
+  it_should_behave_like 'coerces inet column type to string', :address
 end

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

@@ -2,4 +2,6 @@ require 'spec_helper'
 
 describe Mdm::WmapTarget do
   it_should_behave_like 'Metasploit::Concern.run'
+
+  it_should_behave_like 'coerces inet column type to string', :address
 end

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

@@ -61,7 +61,7 @@ describe Mdm::Workspace do
       context '#normalize' do
         it 'should be called' do
           workspace.should_receive(:normalize)
-          workspace.run_callbacks(:save, false)
+          workspace.run_callbacks(:save)
         end
       end
     end
@@ -550,7 +550,7 @@ describe Mdm::Workspace do
         web_forms = workspace.web_unique_forms([selected_address])
 
         web_forms.all? { |web_form|
-          web_form.web_site.service.host.address.should == selected_address
+          web_form.web_site.service.host.address.to_s.should == selected_address
         }.should be_true
       end
     end

data/spec/app/models/metasploit_data_models/search/operation/port/number_spec.rb

@@ -36,6 +36,6 @@ describe MetasploitDataModels::Search::Operation::Port::Number do
   end
 
   context 'validations' do
-    it { should ensure_inclusion_of(:value).in_range(described_class::RANGE) }
+    it { should validate_inclusion_of(:value).in_range(described_class::RANGE) }
   end
 end

data/spec/dummy/config/application.rb

@@ -48,14 +48,8 @@ module Dummy
     # like if you have constraints or database-specific column types
     config.active_record.schema_format = :sql
 
-    # Enforce whitelist mode for mass assignment.
-    # This will create an empty whitelist of attributes available for mass-assignment for all models
-    # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
-    # parameters by using an attr_accessible or attr_protected declaration.
-    config.active_record.whitelist_attributes = true
-
     # Enable the asset pipeline
-    config.assets.enabled = true
+    config.assets.enabled = false
 
     # Version of your assets, change this if you want to expire all your assets
     config.assets.version = '1.0'

data/spec/dummy/config/environments/development.rb

@@ -6,9 +6,6 @@ Dummy::Application.configure do
   # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
 
-  # Log error messages when you accidentally call methods on nil.
-  config.whiny_nils = true
-
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
@@ -19,19 +16,11 @@ Dummy::Application.configure do
   # Print deprecation notices to the Rails logger
   config.active_support.deprecation = :log
 
-  # Only use best-standards-support built into browsers
-  config.action_dispatch.best_standards_support = :builtin
-
-  # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
-
-  # Log the query plan for queries taking more than this (works
-  # with SQLite, MySQL, and PostgreSQL)
-  config.active_record.auto_explain_threshold_in_seconds = 0.5
-
   # Do not compress assets
   config.assets.compress = false
 
   # Expands the lines which load the assets
   config.assets.debug = true
+
+  config.eager_load = false
 end

data/spec/dummy/config/environments/production.rb

@@ -64,4 +64,6 @@ Dummy::Application.configure do
   # Log the query plan for queries taking more than this (works
   # with SQLite, MySQL, and PostgreSQL)
   # config.active_record.auto_explain_threshold_in_seconds = 0.5
+  
+  config.eager_load = true
 end

data/spec/dummy/config/environments/test.rb

@@ -11,9 +11,6 @@ Dummy::Application.configure do
   config.serve_static_assets = true
   config.static_cache_control = "public, max-age=3600"
 
-  # Log error messages when you accidentally call methods on nil
-  config.whiny_nils = true
-
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
@@ -29,9 +26,8 @@ Dummy::Application.configure do
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
 
-  # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
-
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
+
+  config.eager_load = false
 end

data/spec/dummy/db/structure.sql

@@ -3,6 +3,7 @@
 --
 
 SET statement_timeout = 0;
+SET lock_timeout = 0;
 SET client_encoding = 'UTF8';
 SET standard_conforming_strings = on;
 SET check_function_bodies = false;
@@ -2829,17 +2830,17 @@ CREATE INDEX index_automatic_exploitation_match_sets_on_workspace_id ON automati
 
 
 --
--- Name: index_automatic_exploitation_matches_on_module_fullname; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+-- Name: index_automatic_exploitation_matches_on_module_detail_id; Type: INDEX; Schema: public; Owner: -; Tablespace: 
 --
 
-CREATE INDEX index_automatic_exploitation_matches_on_module_fullname ON automatic_exploitation_matches USING btree (module_fullname);
+CREATE INDEX index_automatic_exploitation_matches_on_module_detail_id ON automatic_exploitation_matches USING btree (module_detail_id);
 
 
 --
--- Name: index_automatic_exploitation_matches_on_ref_id; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+-- Name: index_automatic_exploitation_matches_on_module_fullname; Type: INDEX; Schema: public; Owner: -; Tablespace: 
 --
 
-CREATE INDEX index_automatic_exploitation_matches_on_ref_id ON automatic_exploitation_matches USING btree (module_detail_id);
+CREATE INDEX index_automatic_exploitation_matches_on_module_fullname ON automatic_exploitation_matches USING btree (module_fullname);
 
 
 --
@@ -2913,24 +2914,24 @@ CREATE INDEX index_loots_on_module_run_id ON loots USING btree (module_run_id);
 
 
 --
--- Name: index_module_actions_on_module_detail_id; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+-- Name: index_module_actions_on_detail_id; Type: INDEX; Schema: public; Owner: -; Tablespace: 
 --
 
-CREATE INDEX index_module_actions_on_module_detail_id ON module_actions USING btree (detail_id);
+CREATE INDEX index_module_actions_on_detail_id ON module_actions USING btree (detail_id);
 
 
 --
--- Name: index_module_archs_on_module_detail_id; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+-- Name: index_module_archs_on_detail_id; Type: INDEX; Schema: public; Owner: -; Tablespace: 
 --
 
-CREATE INDEX index_module_archs_on_module_detail_id ON module_archs USING btree (detail_id);
+CREATE INDEX index_module_archs_on_detail_id ON module_archs USING btree (detail_id);
 
 
 --
--- Name: index_module_authors_on_module_detail_id; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+-- Name: index_module_authors_on_detail_id; Type: INDEX; Schema: public; Owner: -; Tablespace: 
 --
 
-CREATE INDEX index_module_authors_on_module_detail_id ON module_authors USING btree (detail_id);
+CREATE INDEX index_module_authors_on_detail_id ON module_authors USING btree (detail_id);
 
 
 --
@@ -2962,24 +2963,24 @@ CREATE INDEX index_module_details_on_refname ON module_details USING btree (refn
 
 
 --
--- Name: index_module_mixins_on_module_detail_id; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+-- Name: index_module_mixins_on_detail_id; Type: INDEX; Schema: public; Owner: -; Tablespace: 
 --
 
-CREATE INDEX index_module_mixins_on_module_detail_id ON module_mixins USING btree (detail_id);
+CREATE INDEX index_module_mixins_on_detail_id ON module_mixins USING btree (detail_id);
 
 
 --
--- Name: index_module_platforms_on_module_detail_id; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+-- Name: index_module_platforms_on_detail_id; Type: INDEX; Schema: public; Owner: -; Tablespace: 
 --
 
-CREATE INDEX index_module_platforms_on_module_detail_id ON module_platforms USING btree (detail_id);
+CREATE INDEX index_module_platforms_on_detail_id ON module_platforms USING btree (detail_id);
 
 
 --
--- Name: index_module_refs_on_module_detail_id; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+-- Name: index_module_refs_on_detail_id; Type: INDEX; Schema: public; Owner: -; Tablespace: 
 --
 
-CREATE INDEX index_module_refs_on_module_detail_id ON module_refs USING btree (detail_id);
+CREATE INDEX index_module_refs_on_detail_id ON module_refs USING btree (detail_id);
 
 
 --
@@ -3004,10 +3005,10 @@ CREATE INDEX index_module_runs_on_user_id ON module_runs USING btree (user_id);
 
 
 --
--- Name: index_module_targets_on_module_detail_id; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+-- Name: index_module_targets_on_detail_id; Type: INDEX; Schema: public; Owner: -; Tablespace: 
 --
 
-CREATE INDEX index_module_targets_on_module_detail_id ON module_targets USING btree (detail_id);
+CREATE INDEX index_module_targets_on_detail_id ON module_targets USING btree (detail_id);
 
 
 --
@@ -3374,8 +3375,12 @@ INSERT INTO schema_migrations (version) VALUES ('20150226151459');
 
 INSERT INTO schema_migrations (version) VALUES ('20150312155312');
 
+INSERT INTO schema_migrations (version) VALUES ('20150317145455');
+
 INSERT INTO schema_migrations (version) VALUES ('20150326183742');
 
+INSERT INTO schema_migrations (version) VALUES ('20150421211719');
+
 INSERT INTO schema_migrations (version) VALUES ('21');
 
 INSERT INTO schema_migrations (version) VALUES ('22');
@@ -3400,4 +3405,4 @@ INSERT INTO schema_migrations (version) VALUES ('7');
 
 INSERT INTO schema_migrations (version) VALUES ('8');
 
-INSERT INTO schema_migrations (version) VALUES ('9');
+INSERT INTO schema_migrations (version) VALUES ('9');