metasploit_data_models 0.22.1 → 0.22.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c10785a13c01bc2f665452025f6e3760c2ae461
-  data.tar.gz: c2347bc23c46c2220837dbed38dcfafd667da197
+  metadata.gz: beb915aba1fb4d85ab017f76f7d31ff538913a5a
+  data.tar.gz: b0e62635cdfdec070b670a6f9647e490ee7d6346
 SHA512:
-  metadata.gz: 88988f1f7348f8e3472265becac4ddd3f3fecc00eb6ba696e4f6ca9e03ae95b427f91a16e8e91f4d1cf53e88fa6a474e96d3832e65eb1aa3bec9ded553d4ae85
-  data.tar.gz: c1461576f9e91b6f70bb0029b6673d07aaf03877bc4e011030b989e651adc478cedf5c54c69c69aac96f0338af3204fa382c47770dad29a8c526607d966ee518
+  metadata.gz: 02815fdbe61b9a55a542f66eb4a7abd9cd0ee756b4c2d2dce9dbefd70acc8e87bcaa9038ddc9191a4cc33c30cb59bc0bd60e1c8489f497fb579ed9638c570331
+  data.tar.gz: 5bc91a434e144eb058d6fe31c2950d6b6c77ea6cee52583d436f96c065b672a7c2cfdb31847b76cb3d3b0dd7c05b5b932afa5ceb503487e2c8aa33e28ab5eca7

data/app/models/mdm/service.rb

@@ -222,14 +222,19 @@ class Mdm::Service < ActiveRecord::Base
                 in: PROTOS
             }
 
-  validates :host_id,
-            uniqueness: {
-              message: 'already has a service with this port and proto',
-              scope: [
-                :port,
-                :proto
-              ]
-            }
+  validate :uniq_port_proto_per_host
+
+  # Custom validation to ensure that the combination of port and protocol
+  # for a service doesn't already exist for the same host.
+  def uniq_port_proto_per_host
+    no_dupes = Mdm::Service.where(host_id: host.id, port: port, proto: proto).blank?
+    error_msg = 'This host already has a service with this port and protocol.'
+
+    unless no_dupes
+      errors.add(:port, error_msg)
+      errors.add(:proto, error_msg)
+    end
+  end
 
   #
   # Class Methods

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 = 1
+    PATCH = 2
 
     # 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.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metasploit_data_models
 version: !ruby/object:Gem::Version
-  version: 0.22.1
+  version: 0.22.2
 platform: ruby
 authors:
 - Samuel Huckins
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-16 00:00:00.000000000 Z
+date: 2015-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake