metasploit_data_models 0.22.5 → 0.22.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 859e35cb4e65777beae4ee82aa2441a6e5fe735d
-  data.tar.gz: 1f874280a23afc1dfa4db4f757ebc4e7e9dd37fc
+  metadata.gz: cc2e8b1ff8ffd14664cefae910ad86700b70c8bd
+  data.tar.gz: ced0deab5f82315af5229df943eb32b7943d4ad3
 SHA512:
-  metadata.gz: f5689d9ca36fcdfe73a62b0ab6b37877e9fcd5198cbb5bea8ef56945ed22e706e9d5c14e23eb8543409c036378813443a8984c0678171874550f8bde9950a94f
-  data.tar.gz: b0a7331848d191634b1d20b19b16d7d68fcca1e2bbc9434ee3c2c3e0668cf87ab1750356efa6a9268a8d547450b1cdd0c63a773d9500cc2a3ee54db2f40e5407
+  metadata.gz: 2648c040cd1debecb2685a63a7f593b52b7b1c1e4cf798e904f9aef2ce2b420b01c1f9d4f410ddf0b0ff5834bd1adcdd1ba26d44080d8b04b28423c0c6246a31
+  data.tar.gz: 473af760fd318ef2c4707ad6ff0456110e6176b8860b808f8561c389ae358d6497e03f6b8761fe6ce797152adfec930ab5dc86479859672b99933e126fe28c22

data/app/models/mdm/service.rb

@@ -222,14 +222,6 @@ class Mdm::Service < ActiveRecord::Base
                 in: PROTOS
             }
 
-  validates :host_id,
-            uniqueness: {
-              message: 'already has a service with this port and proto',
-              scope: [
-                :port,
-                :proto
-              ]
-            }
 
   #
   # Class Methods

data/db/migrate/20150205192745_drop_service_uniqueness_index.rb

@@ -0,0 +1,5 @@
+class DropServiceUniquenessIndex < ActiveRecord::Migration
+  def change
+    remove_index(:services, :host_id_and_port_and_proto)
+  end
+end

data/lib/metasploit_data_models/version.rb

@@ -6,7 +6,7 @@ module MetasploitDataModels
     # The minor version number, scoped to the {MAJOR} version number.
     MINOR = 22
     # The patch number, scoped to the {MINOR} version number.
-    PATCH = 5
+    PATCH = 6
 
     # 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/spec/app/models/mdm/service_spec.rb

@@ -154,12 +154,5 @@ describe Mdm::Service do
     it { should validate_numericality_of(:port).only_integer }
     it { should ensure_inclusion_of(:proto).in_array(described_class::PROTOS) }
 
-    context 'when a duplicate service already exists' do
-      let(:service1) { FactoryGirl.create(:mdm_service)}
-      let(:service2) { FactoryGirl.build(:mdm_service, :host => service1.host, :port => service1.port, :proto => service1.proto )}
-      it 'is not valid' do
-        expect(service2).to_not be_valid
-      end
-    end
   end
 end

data/spec/dummy/db/structure.sql

@@ -2686,13 +2686,6 @@ CREATE INDEX index_notes_on_ntype ON notes USING btree (ntype);
 CREATE INDEX index_refs_on_name ON refs USING btree (name);
 
 
---
--- Name: index_services_on_host_id_and_port_and_proto; Type: INDEX; Schema: public; Owner: -; Tablespace: 
---
-
-CREATE UNIQUE INDEX index_services_on_host_id_and_port_and_proto ON services USING btree (host_id, port, proto);
-
-
 --
 -- Name: index_services_on_name; Type: INDEX; Schema: public; Owner: -; Tablespace: 
 --
@@ -2996,6 +2989,8 @@ INSERT INTO schema_migrations (version) VALUES ('20140905031549');
 
 INSERT INTO schema_migrations (version) VALUES ('20150112203945');
 
+INSERT INTO schema_migrations (version) VALUES ('20150205192745');
+
 INSERT INTO schema_migrations (version) VALUES ('21');
 
 INSERT INTO schema_migrations (version) VALUES ('22');

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metasploit_data_models
 version: !ruby/object:Gem::Version
-  version: 0.22.5
+  version: 0.22.6
 platform: ruby
 authors:
 - Samuel Huckins
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-01 00:00:00.000000000 Z
+date: 2015-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -394,6 +394,7 @@ files:
 - db/migrate/20130717150737_remove_pname_validation.rb
 - db/migrate/20140905031549_add_detected_arch_to_host.rb
 - db/migrate/20150112203945_remove_duplicate_services.rb
+- db/migrate/20150205192745_drop_service_uniqueness_index.rb
 - lib/mdm.rb
 - lib/mdm/host/operating_system_normalization.rb
 - lib/mdm/module.rb