metasploit_data_models 0.22.8-java → 0.23.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3971ad37e6363b3cfbbae51e6d31662d6f806a6e
-  data.tar.gz: 75691a38b072d49ed8afdbcce841427429910fdf
+  metadata.gz: 40af8814f893342a2de8b24726c1b715ec48417b
+  data.tar.gz: 01def61e27759816405723a389ec4dd46add19cc
 SHA512:
-  metadata.gz: 21c4b74eab36b7cedf5cfe60fdb0d9e8bc62026d99581d8004af2f9891f98b2848c27c67c042a77e77577ea32a56f772632221af6fbfafb68238d31b484592fb
-  data.tar.gz: 7afd33ce92de7128a8f31b8fcf81fdf310a9b6564b81d89f29ec511743ecae4545bbba7dadd1898d9052f5c9140f2c51f1f5f59a6703ecc064bfd599e2809b5e
+  metadata.gz: f6140d7a31e8c68ebcf2623de48e4f43f5ba159a0152f96e2969adfa7bcb78222fa6254708067ef721eb8ee9a25740a940ed6f5693906c1b1f9754dc2e41c609
+  data.tar.gz: 8a67027055c22b9516335714e1d43985af3079c2c4f2cedb02dbd59bd67c77d4339aedc41198117e7eb64a931c8b452eff2ba77d9ea1e9e87d83117d8275dc2a

data/.travis.yml

@@ -4,8 +4,6 @@ before_script:
 cache: bundler
 language: ruby
 rvm:
-  - 1.9.3
-  - 2.0
   - 2.1
   - jruby-1.7.17
 sudo: false

data/CONTRIBUTING.md

@@ -148,7 +148,7 @@ If your changes are incompatible with the previous branch's API, then increment
 - [ ] `rake release`
 
 ## MRI Ruby
-- [ ] `rvm use ruby-1.9.3@metasploit_data_models`
+- [ ] `rvm use ruby-2.1@metasploit_data_models`
 - [ ] `rm Gemfile.lock`
 - [ ] `bundle install`
 - [ ] `rake release`

data/app/models/mdm/service.rb

@@ -217,6 +217,14 @@ class Mdm::Service < ActiveRecord::Base
             numericality: {
                 only_integer: true
             }
+  validates :port,
+            uniqueness: {
+              message: 'already exists on this host and protocol',
+              scope: [
+                :host_id,
+                :proto
+              ]
+            }
   validates :proto,
             inclusion: {
                 in: PROTOS

data/db/migrate/20150212214222_remove_duplicate_services2.rb

@@ -0,0 +1,12 @@
+class RemoveDuplicateServices2 < 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 = 22
+    MINOR = 23
     # The patch number, scoped to the {MINOR} version number.
-    PATCH = 8
+    PATCH = 0
 
     # 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

@@ -26,6 +26,8 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ['lib']
 
+  s.required_ruby_version = '>= 2.1'
+
   # ---- Dependencies ----
   s.add_development_dependency 'rake'
 

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

@@ -154,5 +154,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/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: 
 --
@@ -2991,6 +2998,8 @@ INSERT INTO schema_migrations (version) VALUES ('20150112203945');
 
 INSERT INTO schema_migrations (version) VALUES ('20150205192745');
 
+INSERT INTO schema_migrations (version) VALUES ('20150212214222');
+
 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.8
+  version: 0.23.0
 platform: java
 authors:
 - Samuel Huckins
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-02-09 00:00:00.000000000 Z
+date: 2015-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -408,6 +408,7 @@ files:
 - db/migrate/20140905031549_add_detected_arch_to_host.rb
 - db/migrate/20150112203945_remove_duplicate_services.rb
 - db/migrate/20150205192745_drop_service_uniqueness_index.rb
+- db/migrate/20150212214222_remove_duplicate_services2.rb
 - lib/mdm.rb
 - lib/mdm/host/operating_system_normalization.rb
 - lib/mdm/module.rb
@@ -608,7 +609,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='