metasploit_data_models 0.21.3-java → 0.22.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d11998218afd52a63a8d7805857fb8ec4ed0a675
-  data.tar.gz: cb54f6b261e068f2d98ffcf2021f3e2f762a022c
+  metadata.gz: ad658aa19508e799c82bf3ebd6fb07e31faa89ac
+  data.tar.gz: 3b2b424d52229202fbada93525a4e51c24a909ef
 SHA512:
-  metadata.gz: b422d4bddff84eff324abf564b2ef7aced4eaf33e2ba577afd3ac0da6032e53000bf6fe4a44d3d0a82ca141ce429206a83780ba6ad2406cd5487e618b8c5c51a
-  data.tar.gz: 66b99190854648ad22caf0ca9c84ce33a1da8f38d4633d202839925bd8d542f2bac442a35772c303d938b96270df8a9fc307a0d58e342d544c190c440d9e17fe
+  metadata.gz: 21888e5aaae09007d205ca7c872ab6d119b5bb17f07ca40e464daa589de1478ed73d74fd7a6c2d92049520204ea33f1786acbb6c0d394fe5d0f793cc9efe88c7
+  data.tar.gz: b996c42af0964622b11726314feec9ca39a0641723a19f7e097f02b0ad5c4ee72e998dc7cab4c79eab9d74561d4cb8c7cee619cfa6e91327ff4f02714c7ab891

data/app/models/mdm/service.rb

@@ -222,6 +222,15 @@ 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/app/models/mdm/task.rb

@@ -103,11 +103,7 @@ class Mdm::Task < ActiveRecord::Base
   has_many :sessions, :through => :task_sessions, :class_name => 'Mdm::Session'
 
 
-  #
-  # Scopes
-  #
 
-  scope :running, order( "created_at DESC" ).where("completed_at IS NULL")
 
   #
   # Serializations

data/db/migrate/20150112203945_remove_duplicate_services.rb

@@ -0,0 +1,12 @@
+class RemoveDuplicateServices < ActiveRecord::Migration
+  def change
+    duplicate_keys = Mdm::Service.count(group: [:host_id, :port, :proto]).select { |k,v| v >1 }.keys
+    duplicate_keys.each do |keys|
+      duplicate_services = Mdm::Service.where(host_id: keys[0], port: keys[1], proto: keys[2]).order(:created_at)
+      duplicate_services.pop
+      duplicate_services.each(&:destroy)
+    end
+
+    add_index :services, [:host_id, :port, :proto], unique: true
+  end
+end

data/lib/metasploit_data_models/version.rb

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

@@ -153,5 +153,13 @@ 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/app/models/mdm/task_spec.rb

@@ -59,15 +59,6 @@ describe Mdm::Task do
 
   end
 
-  context 'scopes' do
-    context "running" do
-      it "should exclude completed tasks" do
-        task = FactoryGirl.create(:mdm_task, :completed_at => Time.now)
-        Mdm::Task.running.should_not include(task)
-      end
-    end
-  end
-
   context 'callbacks' do
     context 'before_destroy' do
       it 'should call #delete_file' do
@@ -79,4 +70,4 @@ describe Mdm::Task do
   end
 
 
-end
+end

data/spec/dummy/db/structure.sql

@@ -2686,6 +2686,13 @@ 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: 
 --
@@ -2987,6 +2994,8 @@ INSERT INTO schema_migrations (version) VALUES ('20130717150737');
 
 INSERT INTO schema_migrations (version) VALUES ('20140905031549');
 
+INSERT INTO schema_migrations (version) VALUES ('20150112203945');
+
 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.21.3
+  version: 0.22.1
 platform: java
 authors:
 - Samuel Huckins
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-12-20 00:00:00.000000000 Z
+date: 2015-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -406,6 +406,7 @@ files:
 - db/migrate/20130604145732_create_task_sessions.rb
 - db/migrate/20130717150737_remove_pname_validation.rb
 - db/migrate/20140905031549_add_detected_arch_to_host.rb
+- db/migrate/20150112203945_remove_duplicate_services.rb
 - lib/mdm.rb
 - lib/mdm/host/operating_system_normalization.rb
 - lib/mdm/module.rb